diff --git a/guilib/src/GuiLib.qrc b/guilib/src/GuiLib.qrc index ada5bab0ae..ab16bc6316 100644 --- a/guilib/src/GuiLib.qrc +++ b/guilib/src/GuiLib.qrc @@ -42,5 +42,6 @@ images/mynteyes.png images/l515.png images/oakd.png + images/astra.png diff --git a/guilib/src/MainWindow.cpp b/guilib/src/MainWindow.cpp index f0a1e7186a..e2e0765408 100644 --- a/guilib/src/MainWindow.cpp +++ b/guilib/src/MainWindow.cpp @@ -428,6 +428,7 @@ MainWindow::MainWindow(PreferencesDialog * prefDialog, QWidget * parent, bool sh connect(_ui->actionOpenNI_CV_ASUS, SIGNAL(triggered()), this, SLOT(selectOpenniCvAsus())); connect(_ui->actionOpenNI2, SIGNAL(triggered()), this, SLOT(selectOpenni2())); connect(_ui->actionOpenNI2_kinect, SIGNAL(triggered()), this, SLOT(selectOpenni2())); + connect(_ui->actionOpenNI2_orbbec, SIGNAL(triggered()), this, SLOT(selectOpenni2())); connect(_ui->actionOpenNI2_sense, SIGNAL(triggered()), this, SLOT(selectOpenni2())); connect(_ui->actionFreenect2, SIGNAL(triggered()), this, SLOT(selectFreenect2())); connect(_ui->actionKinect_for_Windows_SDK_v2, SIGNAL(triggered()), this, SLOT(selectK4W2())); @@ -451,6 +452,7 @@ MainWindow::MainWindow(PreferencesDialog * prefDialog, QWidget * parent, bool sh _ui->actionOpenNI_CV_ASUS->setEnabled(CameraOpenNICV::available()); _ui->actionOpenNI2->setEnabled(CameraOpenNI2::available()); _ui->actionOpenNI2_kinect->setEnabled(CameraOpenNI2::available()); + _ui->actionOpenNI2_orbbec->setEnabled(CameraOpenNI2::available()); _ui->actionOpenNI2_sense->setEnabled(CameraOpenNI2::available()); _ui->actionFreenect2->setEnabled(CameraFreenect2::available()); _ui->actionKinect_for_Windows_SDK_v2->setEnabled(CameraK4W2::available()); @@ -4971,6 +4973,7 @@ void MainWindow::updateSelectSourceMenu() _ui->actionOpenNI_CV_ASUS->setChecked(_preferencesDialog->getSourceDriver() == PreferencesDialog::kSrcOpenNI_CV_ASUS); _ui->actionOpenNI2->setChecked(_preferencesDialog->getSourceDriver() == PreferencesDialog::kSrcOpenNI2); _ui->actionOpenNI2_kinect->setChecked(_preferencesDialog->getSourceDriver() == PreferencesDialog::kSrcOpenNI2); + _ui->actionOpenNI2_orbbec->setChecked(_preferencesDialog->getSourceDriver() == PreferencesDialog::kSrcOpenNI2); _ui->actionOpenNI2_sense->setChecked(_preferencesDialog->getSourceDriver() == PreferencesDialog::kSrcOpenNI2); _ui->actionFreenect2->setChecked(_preferencesDialog->getSourceDriver() == PreferencesDialog::kSrcFreenect2); _ui->actionKinect_for_Windows_SDK_v2->setChecked(_preferencesDialog->getSourceDriver() == PreferencesDialog::kSrcK4W2); diff --git a/guilib/src/images/astra.png b/guilib/src/images/astra.png new file mode 100644 index 0000000000..8259301755 Binary files /dev/null and b/guilib/src/images/astra.png differ diff --git a/guilib/src/ui/mainWindow.ui b/guilib/src/ui/mainWindow.ui index 7a695b4e87..e59126d53f 100644 --- a/guilib/src/ui/mainWindow.ui +++ b/guilib/src/ui/mainWindow.ui @@ -27,7 +27,7 @@ 0 0 1012 - 22 + 21 @@ -229,8 +229,19 @@ + + + Orbbec Astra + + + + :/images/astra.png:/images/astra.png + + + + @@ -1651,6 +1662,14 @@ RGBD-SLAM + ID format (*.txt) + + + true + + + OpenNI2 + +