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

reverted rawImageSizeCaptured parameter... (because OpenCV has already a default so native image over 640x480 cannot be extracted)

Browse Source 
git-svn-id: http://rtabmap.googlecode.com/svn/branches/0.3/rtabmap@68 f169173b-cf89-36c8-b27e-44dbe73f0c83
This commit is contained in:
matlabbe
2011-06-07 15:42:41 +00:00
parent b4446c3ddd
commit 4ceeb78c8b
7 changed files with 4 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
guilib/src/MainWindow.cpp
View File

@@ -992,7 +992,6 @@ void MainWindow::startDetection()
{
_camera = new CameraVideo(
_preferencesDialog->getSourceUsbDeviceId(),
_preferencesDialog->isSourceUsbRawImageSizeCaptured(),
_preferencesDialog->getGeneralImageRate(),
_preferencesDialog->getGeneralAutoRestart(),
_preferencesDialog->getSourceWidth(),

7
guilib/src/PreferencesDialog.cpp
View File

@@ -85,7 +85,6 @@ PreferencesDialog::PreferencesDialog(QWidget * parent) :
connect(_ui->general_checkBox_autoRestart, SIGNAL(stateChanged(int)), this, SLOT(makeObsoleteSourcePanel()));
//usbDevice group
connect(_ui->source_usbDevice_spinBox_id, SIGNAL(valueChanged(int)), this, SLOT(makeObsoleteSourcePanel()));
connect(_ui->general_checkBox_rawImageSizeCaptured, SIGNAL(currentIndexChanged(int)), this, SLOT(makeObsoleteSourcePanel()));
connect(_ui->source_spinBox_imgWidth, SIGNAL(valueChanged(int)), this, SLOT(makeObsoleteSourcePanel()));
connect(_ui->source_spinBox_imgheight, SIGNAL(valueChanged(int)), this, SLOT(makeObsoleteSourcePanel()));
//images group
@@ -521,7 +520,6 @@ void PreferencesDialog::readCameraSettings(const QString & filePath)
//usbDevice group
settings.beginGroup("usbDevice");
_ui->source_usbDevice_spinBox_id->setValue(settings.value("id",_ui->source_usbDevice_spinBox_id->value()).toInt());
_ui->general_checkBox_rawImageSizeCaptured->setChecked(settings.value("rawImageSizeCaptured", _ui->general_checkBox_rawImageSizeCaptured->isChecked()).toBool());
settings.endGroup(); // usbDevice
//images group
settings.beginGroup("images");
@@ -661,7 +659,6 @@ void PreferencesDialog::writeCameraSettings(const QString & filePath)
//usbDevice group
settings.beginGroup("usbDevice");
settings.setValue("id", _ui->source_usbDevice_spinBox_id->value());
settings.setValue("rawImageSizeCaptured", _ui->general_checkBox_rawImageSizeCaptured->isChecked());
settings.endGroup(); //usbDevice
//images group
settings.beginGroup("images");
@@ -1532,10 +1529,6 @@ int PreferencesDialog::getSourceUsbDeviceId() const
{
return _ui->source_usbDevice_spinBox_id->value();
}
bool PreferencesDialog::isSourceUsbRawImageSizeCaptured() const
{
return _ui->general_checkBox_rawImageSizeCaptured->isChecked();
}
QString PreferencesDialog::getSourceDatabasePath() const
{
return _ui->source_database_lineEdit_path->text();

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

@@ -579,24 +579,6 @@ when using the file type, logs are saved in Logrtabmap.txt (located in the worki
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="general_checkBox_rawImageSizeCaptured">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="label_13">
<property name="text">
<string>Raw image size captured.
If false, the usb driver is configured with the image width/height above. If true, the image is resized after the capture.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
@@ -1071,7 +1053,7 @@ We can edit how will like the prediction used in the Bayes filter when there is
<rect>
<x>0</x>
<y>0</y>
<width>26</width>
<width>98</width>
<height>78</height>
</rect>
</property>