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

PreferencesDialog: Fixed odom stack widget index always set to ORB-SLAM2 on loading

Browse Source
This commit is contained in:
matlabbe
2017-09-06 11:01:39 -04:00
parent 39283a5526
commit 380fc2cbde
3 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
guilib/include/rtabmap/gui/PreferencesDialog.h
View File

@@ -301,7 +301,6 @@ private slots:
void addParameter(double value); void addParameter(double value);
void addParameter(const QString & value); void addParameter(const QString & value);
void updatePredictionPlot(); void updatePredictionPlot();
void updateOdometryVisibility();
void updateKpROI(); void updateKpROI();
void updateStereoDisparityVisibility(); void updateStereoDisparityVisibility();
void useOdomFeatures(); void useOdomFeatures();

14
guilib/src/PreferencesDialog.cpp
View File

@@ -907,7 +907,6 @@ PreferencesDialog::PreferencesDialog(QWidget * parent) :
//Odometry //Odometry
_ui->odom_strategy->setObjectName(Parameters::kOdomStrategy().c_str()); _ui->odom_strategy->setObjectName(Parameters::kOdomStrategy().c_str());
connect(_ui->odom_strategy, SIGNAL(currentIndexChanged(int)), _ui->stackedWidget_odometryType, SLOT(setCurrentIndex(int))); connect(_ui->odom_strategy, SIGNAL(currentIndexChanged(int)), _ui->stackedWidget_odometryType, SLOT(setCurrentIndex(int)));
connect(_ui->odom_strategy, SIGNAL(currentIndexChanged(int)), this, SLOT(updateOdometryVisibility()));
_ui->odom_strategy->setCurrentIndex(Parameters::defaultOdomStrategy()); _ui->odom_strategy->setCurrentIndex(Parameters::defaultOdomStrategy());
_ui->odom_countdown->setObjectName(Parameters::kOdomResetCountdown().c_str()); _ui->odom_countdown->setObjectName(Parameters::kOdomResetCountdown().c_str());
_ui->odom_holonomic->setObjectName(Parameters::kOdomHolonomic().c_str()); _ui->odom_holonomic->setObjectName(Parameters::kOdomHolonomic().c_str());
@@ -1628,7 +1627,6 @@ void PreferencesDialog::resetSettings(QGroupBox * groupBox)
if(groupBox->objectName() == _ui->groupBox_odometry1->objectName()) if(groupBox->objectName() == _ui->groupBox_odometry1->objectName())
{ {
_ui->odom_registration->setCurrentIndex(3); _ui->odom_registration->setCurrentIndex(3);
updateOdometryVisibility();
} }
} }
} }
@@ -3950,18 +3948,6 @@ void PreferencesDialog::setupKpRoiPanel()
_ui->doubleSpinBox_kp_roi3->setValue(strings[3].toDouble()*100.0); _ui->doubleSpinBox_kp_roi3->setValue(strings[3].toDouble()*100.0);
} }
void PreferencesDialog::updateOdometryVisibility()
{
UASSERT(_ui->odom_strategy->count() == 6);
_ui->groupBox_odomF2M->setVisible(_ui->odom_strategy->currentIndex()==0);
_ui->groupBox_odomF2F->setVisible(_ui->odom_strategy->currentIndex()==1);
_ui->groupBox_odomFovis->setVisible(_ui->odom_strategy->currentIndex()==2);
_ui->groupBox_odomViso2->setVisible(_ui->odom_strategy->currentIndex()==3);
_ui->groupBox_odomDVO->setVisible(_ui->odom_strategy->currentIndex()==4);
_ui->groupBox_odomORBSLAM2->setVisible(_ui->odom_strategy->currentIndex()==5);
_ui->groupBox_odomMono->setVisible(_ui->odom_strategy->currentIndex()==6);
}
void PreferencesDialog::updateKpROI() void PreferencesDialog::updateKpROI()
{ {
QStringList strings; QStringList strings;

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

@@ -63,9 +63,9 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>-531</y>
<width>678</width> <width>673</width>
<height>2736</height> <height>2749</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_16"> <layout class="QVBoxLayout" name="verticalLayout_16">
@@ -86,7 +86,7 @@
<enum>QFrame::Raised</enum> <enum>QFrame::Raised</enum>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>21</number> <number>18</number>
</property> </property>
<widget class="QWidget" name="page_22"> <widget class="QWidget" name="page_22">
<layout class="QVBoxLayout" name="verticalLayout_29" stretch="0,1"> <layout class="QVBoxLayout" name="verticalLayout_29" stretch="0,1">
@@ -10018,7 +10018,7 @@ If set to false, classic RTAB-Map loop closure detection is done using only imag
<item> <item>
<widget class="QStackedWidget" name="stackedWidget_odometryType"> <widget class="QStackedWidget" name="stackedWidget_odometryType">
<property name="currentIndex"> <property name="currentIndex">
<number>5</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="page_52"> <widget class="QWidget" name="page_52">
<layout class="QVBoxLayout" name="verticalLayout_77"> <layout class="QVBoxLayout" name="verticalLayout_77">