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

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

Browse Source
This commit is contained in:
Mathieu Labbe
2015-05-06 00:30:16 -04:00
parent 4927b56939 0d500ff1bf
commit 146c12f51a
7 changed files with 167 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
guilib/include/rtabmap/gui/CalibrationDialog.h
View File

@@ -47,7 +47,7 @@ class RTABMAPGUI_EXP CalibrationDialog : public QDialog, public UEventsHandler
Q_OBJECT;
public:
CalibrationDialog(bool stereo = false, const QString & savingDirectory = ".", QWidget * parent = 0);
CalibrationDialog(bool stereo = false, const QString & savingDirectory = ".", bool switchImages = false, QWidget * parent = 0);
virtual ~CalibrationDialog();
bool isCalibrated() const {return models_[0].isValid() && (stereo_?models_[1].isValid():true);}
@@ -58,6 +58,7 @@ public:
void saveSettings(QSettings & settings, const QString & group = "") const;
void loadSettings(QSettings & settings, const QString & group = "");
void setSwitchedImages(bool switched);
void setStereoMode(bool stereo);
void setSavingDirectory(const QString & savingDirectory) {savingDirectory_ = savingDirectory;}

9
guilib/src/CalibrationDialog.cpp
View File

@@ -46,7 +46,7 @@ namespace rtabmap {
#define COUNT_MIN 40
CalibrationDialog::CalibrationDialog(bool stereo, const QString & savingDirectory, QWidget * parent) :
CalibrationDialog::CalibrationDialog(bool stereo, const QString & savingDirectory, bool switchImages, QWidget * parent) :
QDialog(parent),
stereo_(stereo),
savingDirectory_(savingDirectory),
@@ -91,6 +91,8 @@ CalibrationDialog::CalibrationDialog(bool stereo, const QString & savingDirector
ui_->radioButton_raw->setChecked(true);
ui_->checkBox_switchImages->setChecked(switchImages);
this->setStereoMode(stereo_);
}
@@ -136,6 +138,11 @@ void CalibrationDialog::loadSettings(QSettings & settings, const QString & group
}
}
void CalibrationDialog::setSwitchedImages(bool switched)
{
ui_->checkBox_switchImages->setChecked(switched);
}
void CalibrationDialog::setStereoMode(bool stereo)
{
this->restart();

1
guilib/src/PreferencesDialog.cpp
View File

@@ -3523,6 +3523,7 @@ void PreferencesDialog::calibrate()
}
}
_calibrationDialog->setStereoMode(true);
_calibrationDialog->setSwitchedImages(dynamic_cast<CameraFreenect2*>(camera) != 0);
_calibrationDialog->setSavingDirectory(this->getCameraInfoDir());
_calibrationDialog->registerToEventsManager();

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

@@ -63,9 +63,9 @@
<property name="geometry">
<rect>
<x>0</x>
<y>-485</y>
<y>-591</y>
<width>760</width>
<height>1132</height>
<height>1502</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_16">
@@ -1974,6 +1974,11 @@ when using the file type, logs are saved in LogRtabmap.txt (located in the worki
<string>RGB+Depth HD</string>
</property>
</item>
<item>
<property name="text">
<string>IR+Depth</string>
</property>
</item>
</widget>
</item>
</layout>