From 731b073ed882ffa0461f5a432f1dd4f27906424b Mon Sep 17 00:00:00 2001 From: matlabbe Date: Tue, 19 Jan 2021 17:24:38 -0500 Subject: [PATCH] Cleanup ObjDeletionHandler not used. Zed: fixed assert "qual >= sl::DEPTH_MODE::NONE && qual < sl::DEPTH_MODE::LAST" with latest sdk. --- app/src/CMakeLists.txt | 13 ------ app/src/ObjDeletionHandler.h | 66 ------------------------------ app/src/main.cpp | 1 - guilib/src/ui/preferencesDialog.ui | 17 +++----- 4 files changed, 6 insertions(+), 91 deletions(-) delete mode 100644 app/src/ObjDeletionHandler.h diff --git a/app/src/CMakeLists.txt b/app/src/CMakeLists.txt index 6baf9476..f908ed53 100644 --- a/app/src/CMakeLists.txt +++ b/app/src/CMakeLists.txt @@ -1,19 +1,6 @@ -### Qt Gui stuff ### -SET(headers_ui - ./ObjDeletionHandler.h -) - -#This will generate moc_* for Qt -IF(QT4_FOUND) - QT4_WRAP_CPP(moc_srcs ${headers_ui}) -ELSE() - QT5_WRAP_CPP(moc_srcs ${headers_ui}) -ENDIF() - SET(SRC_FILES main.cpp - ${moc_srcs} ) SET(INCLUDE_DIRS diff --git a/app/src/ObjDeletionHandler.h b/app/src/ObjDeletionHandler.h deleted file mode 100644 index b051e7fc..00000000 --- a/app/src/ObjDeletionHandler.h +++ /dev/null @@ -1,66 +0,0 @@ -/* -Copyright (c) 2010-2016, Mathieu Labbe - IntRoLab - Universite de Sherbrooke -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of the Universite de Sherbrooke nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY -DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -#ifndef OBJDELETIONHANDLER_H_ -#define OBJDELETIONHANDLER_H_ - -#include "rtabmap/utilite/UEventsHandler.h" -#include "rtabmap/utilite/UEvent.h" -#include - -class ObjDeletionHandler : public QObject, public UEventsHandler -{ - Q_OBJECT - -public: - ObjDeletionHandler(int watchedId, QObject * receiver = 0, const char * member = 0) : _watchedId(watchedId) - { - if(receiver && member) - { - connect(this, SIGNAL(objDeletionEventReceived(int)), receiver, member); - } - } - virtual ~ObjDeletionHandler() {} - -Q_SIGNALS: - void objDeletionEventReceived(int); - -protected: - virtual bool handleEvent(UEvent * event) - { - if(event->getClassName().compare("UObjDeletedEvent") == 0 && - event->getCode() == _watchedId) - { - Q_EMIT objDeletionEventReceived(_watchedId); - } - return false; - } -private: - int _watchedId; -}; - -#endif /* OBJDELETIONHANDLER_H_ */ diff --git a/app/src/main.cpp b/app/src/main.cpp index f3b2aedf..490211da 100644 --- a/app/src/main.cpp +++ b/app/src/main.cpp @@ -35,7 +35,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "rtabmap/utilite/UObjDeletionThread.h" #include "rtabmap/utilite/UFile.h" #include "rtabmap/utilite/UConversion.h" -#include "ObjDeletionHandler.h" #ifdef RTABMAP_PYTHON #include "rtabmap/core/PythonInterface.h" diff --git a/guilib/src/ui/preferencesDialog.ui b/guilib/src/ui/preferencesDialog.ui index dc3d3daf..b905f2ae 100644 --- a/guilib/src/ui/preferencesDialog.ui +++ b/guilib/src/ui/preferencesDialog.ui @@ -63,7 +63,7 @@ 0 - 0 + -678 686 3357 @@ -95,7 +95,7 @@ QFrame::Raised - 37 + 5 @@ -3109,7 +3109,7 @@ when using the file type, logs are saved in LogRtabmap.txt (located in the worki - 0 + 1 @@ -4896,7 +4896,7 @@ when using the file type, logs are saved in LogRtabmap.txt (located in the worki - 8 + 4 @@ -5247,11 +5247,6 @@ when using the file type, logs are saved in LogRtabmap.txt (located in the worki PERFORMANCE - - - MEDIUM - - QUALITY @@ -5267,7 +5262,7 @@ when using the file type, logs are saved in LogRtabmap.txt (located in the worki - Filtering value for the disparity map (and by extension the depth map). A lower value means more confidence and precision (but less density), an upper value reduces the filtering (more density, less certainty). + Depth confidence. Filtering value for the disparity map (and by extension the depth map). A lower value means more confidence and precision (but less density), an upper value reduces the filtering (more density, less certainty). true @@ -5371,7 +5366,7 @@ when using the file type, logs are saved in LogRtabmap.txt (located in the worki - [SDK3] Threshold to reject depth values based on their textureness confidence. A lower value means more confidence and precision (but less density). An upper value reduces filtering (more density, less certainty.). + [SDK3] Texture confidence. Threshold to reject depth values based on their textureness confidence. A lower value means more confidence and precision (but less density). An upper value reduces filtering (more density, less certainty.). true