rtabmap: added parameter to keep the old id or to update to new id when merging on rehearsal

git-svn-id: http://rtabmap.googlecode.com/svn/trunk/rtabmap@758 f169173b-cf89-36c8-b27e-44dbe73f0c83
This commit is contained in:
matlabbe
2013-01-27 04:50:49 +00:00
parent 635dd9c177
commit a4ccd6acd6
10 changed files with 156 additions and 111 deletions

View File

@@ -155,7 +155,8 @@ PreferencesDialog::PreferencesDialog(QWidget * parent) :
_ui->doubleSpinBox_similarityThreshold->setObjectName(Parameters::kMemRehearsalSimilarity().c_str());
_ui->general_checkBox_incrementalMemory->setObjectName(Parameters::kMemIncrementalMemory().c_str());
_ui->general_doubleSpinBox_recentWmRatio->setObjectName(Parameters::kMemRecentWmRatio().c_str());
_ui->general_checkBox_dataMergedOnRehearsal->setObjectName(Parameters::kMemDataMergedOnRehearsal().c_str());
_ui->general_checkBox_RehearsalOldDataKept->setObjectName(Parameters::kMemRehearsalOldDataKept().c_str());
_ui->general_checkBox_RehearsalIdUpdatedToNewOne->setObjectName(Parameters::kMemRehearsalIdUpdatedToNewOne().c_str());
// Database
_ui->general_checkBox_imagesCompressed->setObjectName(Parameters::kDbImagesCompressed().c_str());

View File

@@ -86,7 +86,7 @@
<enum>QFrame::Raised</enum>
</property>
<property name="currentIndex">
<number>4</number>
<number>7</number>
</property>
<widget class="QWidget" name="page_22">
<layout class="QVBoxLayout" name="verticalLayout_29">
@@ -1864,9 +1864,9 @@ see Sqlite3 doc 'PRAGMA temp_store'.</string>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="label_17">
<widget class="QLabel" name="label_119">
<property name="text">
<string>Only compare to the last signature in STM, otherwise all signatures in STM are compared.</string>
<string>On merging, keep old data. The similarity threshold may be lower than updating to new data.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
@@ -1874,24 +1874,7 @@ see Sqlite3 doc 'PRAGMA temp_store'.</string>
</widget>
</item>
<item row="2" column="0">
<widget class="QCheckBox" name="general_checkBox_similarityOnlyLast">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="label_119">
<property name="text">
<string>The data of the new location is cleared, then old location's data is copied back to new one. The similarity threshold may be also lower than without data copied.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="general_checkBox_dataMergedOnRehearsal">
<widget class="QCheckBox" name="general_checkBox_RehearsalOldDataKept">
<property name="text">
<string/>
</property>
@@ -1907,6 +1890,40 @@ see Sqlite3 doc 'PRAGMA temp_store'.</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLabel" name="label_19">
<property name="text">
<string>On merging, update to new id.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QCheckBox" name="general_checkBox_RehearsalIdUpdatedToNewOne">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="general_checkBox_similarityOnlyLast">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="label_17">
<property name="text">
<string>Only compare to the last signature in STM, otherwise all signatures in STM are compared.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>