From c068c3c33ad25a7c667bba40cb357dd4889312b5 Mon Sep 17 00:00:00 2001 From: matlabbe Date: Wed, 19 Apr 2017 15:24:42 -0400 Subject: [PATCH] MainWindow: added ZR300 menu --- guilib/src/GuiLib.qrc | 3 ++- guilib/src/MainWindow.cpp | 9 ++++++--- guilib/src/images/zr300.png | Bin 0 -> 2459 bytes guilib/src/ui/mainWindow.ui | 25 ++++++++++++++++++++++--- 4 files changed, 30 insertions(+), 7 deletions(-) create mode 100644 guilib/src/images/zr300.png diff --git a/guilib/src/GuiLib.qrc b/guilib/src/GuiLib.qrc index 005bbf02..047003e0 100644 --- a/guilib/src/GuiLib.qrc +++ b/guilib/src/GuiLib.qrc @@ -29,8 +29,9 @@ images/sense.png images/xtion_pro_live.png images/bumblebee2.png - images/webcam.png + images/webcam.png images/zed.png images/r200.png + images/zr300.png diff --git a/guilib/src/MainWindow.cpp b/guilib/src/MainWindow.cpp index 889a4805..4ba12ff0 100644 --- a/guilib/src/MainWindow.cpp +++ b/guilib/src/MainWindow.cpp @@ -418,7 +418,8 @@ MainWindow::MainWindow(PreferencesDialog * prefDialog, QWidget * parent) : connect(_ui->actionOpenNI2_kinect, SIGNAL(triggered()), this, SLOT(selectOpenni2())); connect(_ui->actionOpenNI2_sense, SIGNAL(triggered()), this, SLOT(selectOpenni2())); connect(_ui->actionFreenect2, SIGNAL(triggered()), this, SLOT(selectFreenect2())); - connect(_ui->actionRealSense, SIGNAL(triggered()), this, SLOT(selectRealSense())); + connect(_ui->actionRealSense_R200, SIGNAL(triggered()), this, SLOT(selectRealSense())); + connect(_ui->actionRealSense_ZR300, SIGNAL(triggered()), this, SLOT(selectRealSense())); connect(_ui->actionStereoDC1394, SIGNAL(triggered()), this, SLOT(selectStereoDC1394())); connect(_ui->actionStereoFlyCapture2, SIGNAL(triggered()), this, SLOT(selectStereoFlyCapture2())); connect(_ui->actionStereoZed, SIGNAL(triggered()), this, SLOT(selectStereoZed())); @@ -430,7 +431,8 @@ MainWindow::MainWindow(PreferencesDialog * prefDialog, QWidget * parent) : _ui->actionOpenNI2_kinect->setEnabled(CameraOpenNI2::available()); _ui->actionOpenNI2_sense->setEnabled(CameraOpenNI2::available()); _ui->actionFreenect2->setEnabled(CameraFreenect2::available()); - _ui->actionRealSense->setEnabled(CameraRealSense::available()); + _ui->actionRealSense_R200->setEnabled(CameraRealSense::available()); + _ui->actionRealSense_ZR300->setEnabled(CameraRealSense::available()); _ui->actionStereoDC1394->setEnabled(CameraStereoDC1394::available()); _ui->actionStereoFlyCapture2->setEnabled(CameraStereoFlyCapture2::available()); _ui->actionStereoZed->setEnabled(CameraStereoZed::available()); @@ -3899,7 +3901,8 @@ void MainWindow::updateSelectSourceMenu() _ui->actionOpenNI2_kinect->setChecked(_preferencesDialog->getSourceDriver() == PreferencesDialog::kSrcOpenNI2); _ui->actionOpenNI2_sense->setChecked(_preferencesDialog->getSourceDriver() == PreferencesDialog::kSrcOpenNI2); _ui->actionFreenect2->setChecked(_preferencesDialog->getSourceDriver() == PreferencesDialog::kSrcFreenect2); - _ui->actionRealSense->setChecked(_preferencesDialog->getSourceDriver() == PreferencesDialog::kSrcRealSense); + _ui->actionRealSense_R200->setChecked(_preferencesDialog->getSourceDriver() == PreferencesDialog::kSrcRealSense); + _ui->actionRealSense_ZR300->setChecked(_preferencesDialog->getSourceDriver() == PreferencesDialog::kSrcRealSense); _ui->actionStereoDC1394->setChecked(_preferencesDialog->getSourceDriver() == PreferencesDialog::kSrcDC1394); _ui->actionStereoFlyCapture2->setChecked(_preferencesDialog->getSourceDriver() == PreferencesDialog::kSrcFlyCapture2); _ui->actionStereoZed->setChecked(_preferencesDialog->getSourceDriver() == PreferencesDialog::kSrcStereoZed); diff --git a/guilib/src/images/zr300.png b/guilib/src/images/zr300.png new file mode 100644 index 0000000000000000000000000000000000000000..6926d070b6b8d5ff34d7fb86850412c6475195c3 GIT binary patch literal 2459 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 Z{x`xl*k8d`o`V1Y002ovPDHLkV1kJOzZ(Dm literal 0 HcmV?d00001 diff --git a/guilib/src/ui/mainWindow.ui b/guilib/src/ui/mainWindow.ui index d5485620..544decae 100644 --- a/guilib/src/ui/mainWindow.ui +++ b/guilib/src/ui/mainWindow.ui @@ -27,7 +27,7 @@ 0 0 1012 - 22 + 25 @@ -176,13 +176,24 @@ :/images/r200.png:/images/r200.png - + + + + + RealSense ZR300 + + + + :/images/zr300.png:/images/zr300.png + + + @@ -1338,7 +1349,7 @@ Export octomap... - + true @@ -1351,6 +1362,14 @@ Depth calibration... + + + true + + + RealSense + +