i/rtabmap_ros
1
0
Fork 0
mirror of https://github.com/introlab/rtabmap_ros.git synced 2026-10-03 16:27:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:introlab/rtabmap

Browse Source
This commit is contained in:
Mathieu Labbe
2015-03-01 15:51:21 -05:00
parent d3a2c62b45 d86f8e8d02
commit 5971dd2eab
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/RGBDMapping/MapBuilder.h
+1 -1
View File
@@ -31,7 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <QtGui/QVBoxLayout> #include <QtGui/QVBoxLayout>
#include <QtCore/QMetaType> #include <QtCore/QMetaType>
#ifndef Q_MOC_RUN #ifndef Q_MOC_RUN // Mac OS X issue
#include "rtabmap/gui/CloudViewer.h" #include "rtabmap/gui/CloudViewer.h"
#include "rtabmap/core/util3d.h" #include "rtabmap/core/util3d.h"
#include "rtabmap/core/RtabmapEvent.h" #include "rtabmap/core/RtabmapEvent.h"
guilib/src/PreferencesDialog.cpp
+3 -2
View File
@@ -122,7 +122,9 @@ PreferencesDialog::PreferencesDialog(QWidget * parent) :
#ifdef _WIN32 #ifdef _WIN32
_ui->radioButton_openni2->setChecked(true); _ui->radioButton_openni2->setChecked(true);
_ui->radioButton_opennipcl->setChecked(false); _ui->radioButton_opennipcl->setChecked(false);
showOpenNI2GroupBox(true); _ui->groupBox_openni2->setVisible(true);
#else
_ui->groupBox_openni2->setVisible(false);
#endif #endif
if(RTABMAP_NONFREE == 0) if(RTABMAP_NONFREE == 0)
@@ -140,7 +142,6 @@ PreferencesDialog::PreferencesDialog(QWidget * parent) :
} }
_ui->predictionPlot->showLegend(false); _ui->predictionPlot->showLegend(false);
_ui->groupBox_openni2->setVisible(false);
QButtonGroup * buttonGroup = new QButtonGroup(this); QButtonGroup * buttonGroup = new QButtonGroup(this);
buttonGroup->addButton(_ui->radioButton_basic); buttonGroup->addButton(_ui->radioButton_basic);