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

Included FLANN headers in rtabmap for convenience (to have commit 23051820b2)

Browse Source
This commit is contained in:
matlabbe
2015-09-11 23:23:01 -04:00
parent 5cc17704d3
commit cf0d781020
63 changed files with 22769 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
guilib/src/AboutDialog.cpp
View File

@@ -34,8 +34,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <opencv2/core/version.hpp>
#include <pcl/pcl_config.h>
#include <flann/config.h>
namespace rtabmap {
AboutDialog::AboutDialog(QWidget * parent) :
@@ -55,7 +53,6 @@ AboutDialog::AboutDialog(QWidget * parent) :
#endif
_ui->label_version->setText(version);
_ui->label_opencv_version->setText(cv_version);
_ui->label_flann_version->setText(FLANN_VERSION_);
_ui->label_pcl_version->setText(PCL_VERSION_PRETTY);
_ui->label_freenect->setText(CameraFreenect::available()?"Yes":"No");
_ui->label_openni2->setText(CameraOpenNI2::available()?"Yes":"No");

4
guilib/src/CMakeLists.txt
View File

@@ -121,10 +121,6 @@ INCLUDE_DIRECTORIES(${INCLUDE_DIRS})
add_definitions(${PCL_DEFINITIONS})
IF(FLANN18_FOUND)
ADD_DEFINITIONS("-DWITH_FLANN18")
ENDIF(FLANN18_FOUND)
# create a library from the source files
ADD_LIBRARY(rtabmap_gui ${SRC_FILES})
# Linking with Qt libraries

65
guilib/src/ui/aboutDialog.ui
View File

@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>831</width>
<height>615</height>
<height>681</height>
</rect>
</property>
<property name="sizePolicy">
@@ -82,6 +82,13 @@ p, li { white-space: pre-wrap; }
</item>
<item>
<layout class="QGridLayout" name="gridLayout" columnstretch="0,1">
<item row="9" column="0">
<widget class="QLabel" name="label_11">
<property name="text">
<string>PCL version :</string>
</property>
</widget>
</item>
<item row="9" column="1">
<widget class="QLabel" name="label_pcl_version">
<property name="text">
@@ -92,21 +99,21 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item row="11" column="0">
<item row="10" column="0">
<widget class="QLabel" name="label_12">
<property name="text">
<string>With Freenect :</string>
</property>
</widget>
</item>
<item row="12" column="0">
<item row="11" column="0">
<widget class="QLabel" name="label_13">
<property name="text">
<string>With OpenNI2 :</string>
</property>
</widget>
</item>
<item row="14" column="0">
<item row="13" column="0">
<widget class="QLabel" name="label_16">
<property name="text">
<string>With stereo dc1394 :</string>
@@ -205,21 +212,14 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item row="9" column="0">
<widget class="QLabel" name="label_11">
<property name="text">
<string>PCL version :</string>
</property>
</widget>
</item>
<item row="16" column="0">
<item row="15" column="0">
<widget class="QLabel" name="label_14">
<property name="text">
<string>With g2o :</string>
</property>
</widget>
</item>
<item row="11" column="1">
<item row="10" column="1">
<widget class="QLabel" name="label_freenect">
<property name="text">
<string/>
@@ -229,7 +229,7 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item row="12" column="1">
<item row="11" column="1">
<widget class="QLabel" name="label_openni2">
<property name="text">
<string/>
@@ -239,7 +239,7 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item row="16" column="1">
<item row="15" column="1">
<widget class="QLabel" name="label_g2o">
<property name="text">
<string/>
@@ -249,21 +249,21 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item row="13" column="0">
<item row="12" column="0">
<widget class="QLabel" name="label_15">
<property name="text">
<string>With Freenect2 :</string>
</property>
</widget>
</item>
<item row="15" column="0">
<item row="14" column="0">
<widget class="QLabel" name="label_17">
<property name="text">
<string>With stereo FlyCapture2 :</string>
</property>
</widget>
</item>
<item row="13" column="1">
<item row="12" column="1">
<widget class="QLabel" name="label_freenect2">
<property name="text">
<string/>
@@ -273,7 +273,7 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item row="14" column="1">
<item row="13" column="1">
<widget class="QLabel" name="label_dc1394">
<property name="text">
<string/>
@@ -283,7 +283,7 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item row="15" column="1">
<item row="14" column="1">
<widget class="QLabel" name="label_flycapture2">
<property name="text">
<string/>
@@ -293,14 +293,14 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item row="18" column="0">
<item row="17" column="0">
<widget class="QLabel" name="label_18">
<property name="text">
<string>With cvsba :</string>
</property>
</widget>
</item>
<item row="18" column="1">
<item row="17" column="1">
<widget class="QLabel" name="label_cvsba">
<property name="text">
<string/>
@@ -310,14 +310,14 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item row="17" column="0">
<item row="16" column="0">
<widget class="QLabel" name="label_19">
<property name="text">
<string>With GTSAM :</string>
</property>
</widget>
</item>
<item row="17" column="1">
<item row="16" column="1">
<widget class="QLabel" name="label_gtsam">
<property name="text">
<string/>
@@ -327,23 +327,6 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item row="10" column="0">
<widget class="QLabel" name="label_20">
<property name="text">
<string>FLANN version :</string>
</property>
</widget>
</item>
<item row="10" column="1">
<widget class="QLabel" name="label_flann_version">
<property name="text">
<string/>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
</layout>
</item>
<item>