From e5b4973ddca4a868d57ee890486a19ed8cf16dff Mon Sep 17 00:00:00 2001 From: matlabbe Date: Wed, 29 Dec 2021 15:53:40 -0500 Subject: [PATCH] GUI: Added Orbbec Astra icon --- guilib/src/GuiLib.qrc | 1 + guilib/src/MainWindow.cpp | 3 +++ guilib/src/images/astra.png | Bin 0 -> 11052 bytes guilib/src/ui/mainWindow.ui | 21 ++++++++++++++++++++- 4 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 guilib/src/images/astra.png 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 0000000000000000000000000000000000000000..8259301755d6f5cac2f3c464803c840fe512b7b8 GIT binary patch literal 11052 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 Z5?ys$9@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 + +