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

Added CameraRGBD with openni from OpenCV, removed feature2D stuff from Camera

Browse Source 
git-svn-id: http://rtabmap.googlecode.com/svn/trunk/rtabmap@1358 f169173b-cf89-36c8-b27e-44dbe73f0c83
This commit is contained in:
matlabbe
2014-06-13 03:47:39 +00:00
parent f423b1b743
commit 0bba363f5f
11 changed files with 345 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
guilib/src/ui/mainWindow.ui
View File

@@ -27,7 +27,7 @@
<x>0</x>
<y>0</y>
<width>947</width>
<height>25</height>
<height>21</height>
</rect>
</property>
<widget class="QMenu" name="menuFile">
@@ -92,6 +92,8 @@
</property>
<addaction name="actionOpenNI"/>
<addaction name="actionFreenect"/>
<addaction name="actionOpenNI_CV"/>
<addaction name="actionOpenNI_CV_ASUS"/>
</widget>
<addaction name="menuImage"/>
<addaction name="actionDatabase"/>
@@ -983,7 +985,7 @@
<bool>true</bool>
</property>
<property name="text">
<string>OpenNI</string>
<string>OpenNI-PCL</string>
</property>
</action>
<action name="actionFreenect">
@@ -994,6 +996,22 @@
<string>Freenect</string>
</property>
</action>
<action name="actionOpenNI_CV">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>OpenNI-CV</string>
</property>
</action>
<action name="actionOpenNI_CV_ASUS">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>OpenNI-CV-ASUS</string>
</property>
</action>
</widget>
<customwidgets>
<customwidget>

26
guilib/src/ui/preferencesDialog.ui
View File

@@ -63,9 +63,9 @@
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>729</width>
<height>836</height>
<y>-142</y>
<width>728</width>
<height>721</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_16">
@@ -86,7 +86,7 @@
<enum>QFrame::Raised</enum>
</property>
<property name="currentIndex">
<number>1</number>
<number>3</number>
</property>
<widget class="QWidget" name="page_22">
<layout class="QVBoxLayout" name="verticalLayout_29">
@@ -1736,9 +1736,9 @@ when using the file type, logs are saved in LogRtabmap.txt (located in the worki
<item>
<layout class="QHBoxLayout" name="horizontalLayout_7">
<item>
<widget class="QRadioButton" name="radioButton_openni">
<widget class="QRadioButton" name="radioButton_opennipcl">
<property name="text">
<string>OpenNI</string>
<string>OpenNI-PCL</string>
</property>
</widget>
</item>
@@ -1749,6 +1749,20 @@ when using the file type, logs are saved in LogRtabmap.txt (located in the worki
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioButton_opennicv">
<property name="text">
<string>OpenNI-CV</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioButton_opennicvasus">
<property name="text">
<string>OpenNI-CV-ASUS</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">