Removed RGB option from main menu (#640)

introlab · Feb 27, 2024 · 6f7e5cc · 6f7e5cc
1 parent fccf33d
commit 6f7e5cc
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 32 deletions.
diff --git a/guilib/include/rtabmap/gui/MainWindow.h b/guilib/include/rtabmap/gui/MainWindow.h
@@ -170,7 +170,6 @@ protected Q_SLOTS:
  void depthCalibration();
  void openWorkingDirectory();
  void updateEditMenu();
- void selectStream();
  void selectOpenni();
  void selectFreenect();
  void selectOpenniCv();

diff --git a/guilib/src/MainWindow.cpp b/guilib/src/MainWindow.cpp
@@ -435,7 +435,6 @@ MainWindow::MainWindow(PreferencesDialog * prefDialog, QWidget * parent, bool sh
 
  //Settings menu
  connect(_ui->actionMore_options, SIGNAL(triggered()), this, SLOT(openPreferencesSource()));
- connect(_ui->actionUsbCamera, SIGNAL(triggered()), this, SLOT(selectStream()));
  connect(_ui->actionOpenNI_PCL, SIGNAL(triggered()), this, SLOT(selectOpenni()));
  connect(_ui->actionOpenNI_PCL_ASUS, SIGNAL(triggered()), this, SLOT(selectOpenni()));
  connect(_ui->actionFreenect, SIGNAL(triggered()), this, SLOT(selectFreenect()));
@@ -5228,10 +5227,9 @@ bool MainWindow::eventFilter(QObject *obj, QEvent *event)
 
 void MainWindow::updateSelectSourceMenu()
 {
- _ui->actionUsbCamera->setChecked(_preferencesDialog->getSourceDriver() == PreferencesDialog::kSrcUsbDevice);
-
  _ui->actionMore_options->setChecked(
  _preferencesDialog->getSourceDriver() == PreferencesDialog::kSrcDatabase ||
+ _preferencesDialog->getSourceDriver() == PreferencesDialog::kSrcUsbDevice ||
  _preferencesDialog->getSourceDriver() == PreferencesDialog::kSrcImages ||
  _preferencesDialog->getSourceDriver() == PreferencesDialog::kSrcVideo ||
  _preferencesDialog->getSourceDriver() == PreferencesDialog::kSrcStereoImages ||
@@ -7061,11 +7059,6 @@ void MainWindow::updateEditMenu()
  }
 }
 
-void MainWindow::selectStream()
-{
- _preferencesDialog->selectSourceDriver(PreferencesDialog::kSrcUsbDevice);
-}
-
 void MainWindow::selectOpenni()
 {
  _preferencesDialog->selectSourceDriver(PreferencesDialog::kSrcOpenNI_PCL);

diff --git a/guilib/src/ui/mainWindow.ui b/guilib/src/ui/mainWindow.ui
@@ -105,16 +105,6 @@
  <property name="title">
  <string>Select source</string>
  </property>
- <widget class="QMenu" name="menuImage">
- <property name="title">
- <string>RGB camera</string>
- </property>
- <property name="icon">
- <iconset resource="../GuiLib.qrc">
- <normaloff>:/images/webcam.png</normaloff>:/images/webcam.png</iconset>
- </property>
- <addaction name="actionUsbCamera"/>
- </widget>
  <widget class="QMenu" name="menuRGB_D_camera">
  <property name="title">
  <string>RGB-D camera</string>
@@ -342,7 +332,6 @@
  </widget>
  <addaction name="menuRGB_D_camera"/>
  <addaction name="menuStereo_camera"/>
- <addaction name="menuImage"/>
  <addaction name="actionMore_options"/>
  </widget>
  <addaction name="menuSelect_source"/>
@@ -1244,18 +1233,6 @@
  <string>240p</string>
  </property>
  </action>
- <action name="actionUsbCamera">
- <property name="checkable">
- <bool>true</bool>
- </property>
- <property name="icon">
- <iconset resource="../GuiLib.qrc">
- <normaloff>:/images/webcam.png</normaloff>:/images/webcam.png</iconset>
- </property>
- <property name="text">
- <string>Usb camera</string>
- </property>
- </action>
  <action name="actionPrint_loop_closure_IDs_to_console">
  <property name="text">
  <string>Print loop closure IDs to console</string>