i/rtabmap
1
0
Fork 0
mirror of https://github.com/introlab/rtabmap.git synced 2026-09-01 17:10:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

MERGE branch STM 325:449 into trunk

Browse Source 
git-svn-id: http://rtabmap.googlecode.com/svn/trunk/rtabmap@450 f169173b-cf89-36c8-b27e-44dbe73f0c83
This commit is contained in:
matlabbe
2012-03-03 01:46:30 +00:00
parent c4aff5f20a
commit a2eb8bcab6
100 changed files with 76652 additions and 5164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/CMakeLists.txt
View File

@@ -14,14 +14,14 @@ SET(SRC_FILES
SET(INCLUDE_DIRS
${CMAKE_CURRENT_SOURCE_DIR}
${UTILITE_INCLUDE_DIR}
${UTILITE_INCLUDE_DIRS}
${OpenCV_INCLUDE_DIRS}
)
INCLUDE(${QT_USE_FILE})
SET(LIBRARIES
${UTILITE_LIBRARY}
${UTILITE_LIBRARIES}
${QT_LIBRARIES}
${OpenCV_LIBS}
)

2
app/src/ObjDeletionHandler.h
View File

@@ -44,7 +44,7 @@ signals:
protected:
virtual void handleEvent(UEvent * event)
{
if(event->getClassName().compare("ObjDeletedEvent") == 0 &&
if(event->getClassName().compare("UObjDeletedEvent") == 0 &&
event->getCode() == _watchedId)
{
emit objDeletionEventReceived(_watchedId);

5
app/src/main.cpp
View File

@@ -44,6 +44,7 @@ int main(int argc, char* argv[])
/* Add handlers to the EventsManager */
UEventsManager::addHandler(mainWindow);
UEventsManager::removeHandler(rtabmap); // Force removing for rtabmap to be the last.. FIXME: Rtabmap object should not register to EventsManager in its constructor...
UEventsManager::addHandler(rtabmap); //thread
/* Start thread's task */
@@ -62,7 +63,7 @@ int main(int argc, char* argv[])
UEventsManager::removeHandler(rtabmap);
ULOGGER_INFO("Killing threads...");
rtabmap->kill();
rtabmap->join(true);
ULOGGER_INFO("Free memory...");
@@ -75,7 +76,7 @@ int main(int argc, char* argv[])
msg->setIconPixmap(QPixmap(":/images/RTAB-Map.ico"));
msg->setWindowIcon(QIcon(":/images/RTAB-Map.ico"));
msg->show();
ObjDeletionThread<Rtabmap> delThread(rtabmap);
UObjDeletionThread<Rtabmap> delThread(rtabmap);
ObjDeletionHandler handler(delThread.id(), app, SLOT(quit()));
UEventsManager::addHandler(&handler);
delThread.startDeletion(1); // make sure that app-exec() is called before the deletion of the object