mirror of
https://github.com/introlab/rtabmap.git
synced 2026-09-02 01:20:25 +08:00
Added Kinect for Azure menu option (#551)
* Added Kinect for Azure menu option * Reintegrated Kinect for Azure initialization code, fixed previous GUI commit * Added ifdefs to fix build
This commit is contained in:
@@ -172,6 +172,7 @@ protected Q_SLOTS:
|
||||
void selectOpenni2();
|
||||
void selectFreenect2();
|
||||
void selectK4W2();
|
||||
void selectK4A();
|
||||
void selectRealSense();
|
||||
void selectRealSense2();
|
||||
void selectRealSense2Stereo();
|
||||
|
||||
@@ -431,6 +431,7 @@ MainWindow::MainWindow(PreferencesDialog * prefDialog, QWidget * parent, bool sh
|
||||
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()));
|
||||
connect(_ui->actionKinect_for_Azure, SIGNAL(triggered()), this, SLOT(selectK4A()));
|
||||
connect(_ui->actionRealSense_R200, SIGNAL(triggered()), this, SLOT(selectRealSense()));
|
||||
connect(_ui->actionRealSense_ZR300, SIGNAL(triggered()), this, SLOT(selectRealSense()));
|
||||
connect(_ui->actionRealSense2_SR300, SIGNAL(triggered()), this, SLOT(selectRealSense2()));
|
||||
@@ -451,6 +452,7 @@ MainWindow::MainWindow(PreferencesDialog * prefDialog, QWidget * parent, bool sh
|
||||
_ui->actionOpenNI2_sense->setEnabled(CameraOpenNI2::available());
|
||||
_ui->actionFreenect2->setEnabled(CameraFreenect2::available());
|
||||
_ui->actionKinect_for_Windows_SDK_v2->setEnabled(CameraK4W2::available());
|
||||
_ui->actionKinect_for_Azure->setEnabled(false);
|
||||
_ui->actionRealSense_R200->setEnabled(CameraRealSense::available());
|
||||
_ui->actionRealSense_ZR300->setEnabled(CameraRealSense::available());
|
||||
_ui->actionRealSense2_SR300->setEnabled(CameraRealSense2::available());
|
||||
@@ -6332,6 +6334,11 @@ void MainWindow::selectK4W2()
|
||||
_preferencesDialog->selectSourceDriver(PreferencesDialog::kSrcK4W2);
|
||||
}
|
||||
|
||||
void MainWindow::selectK4A()
|
||||
{
|
||||
_preferencesDialog->selectSourceDriver(PreferencesDialog::kSrcK4A);
|
||||
}
|
||||
|
||||
void MainWindow::selectRealSense()
|
||||
{
|
||||
_preferencesDialog->selectSourceDriver(PreferencesDialog::kSrcRealSense);
|
||||
|
||||
@@ -168,6 +168,16 @@
|
||||
<addaction name="actionFreenect2"/>
|
||||
<addaction name="actionKinect_for_Windows_SDK_v2"/>
|
||||
</widget>
|
||||
<widget class="QMenu" name="menuKinect_K4A">
|
||||
<property name="title">
|
||||
<string>Kinect for Azure</string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../GuiLib.qrc">
|
||||
<normaloff>:/images/kinect_xbox_one.png</normaloff>:/images_kinect_xbox_one.png</iconset>
|
||||
</property>
|
||||
<addaction name="actionKinect_for_Azure"/>
|
||||
</widget>
|
||||
<widget class="QMenu" name="menuRealSense_R200">
|
||||
<property name="title">
|
||||
<string>RealSense R200</string>
|
||||
@@ -222,6 +232,7 @@
|
||||
<addaction name="menuXtion_PRO_LIVE"/>
|
||||
<addaction name="menuSense_3D_scanner"/>
|
||||
<addaction name="menuKinect_v2"/>
|
||||
<addaction name="menuKinect_K4A"/>
|
||||
<addaction name="menuRealSense_R200"/>
|
||||
<addaction name="menuRealSense_ZR300"/>
|
||||
<addaction name="menuRealSense_SR300"/>
|
||||
@@ -1542,6 +1553,14 @@
|
||||
<string>Kinect for Windows SDK v2</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionKinect_for_Azure">
|
||||
<property name="checkable">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Kinect for Azure</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionRealSense2_D435">
|
||||
<property name="checkable">
|
||||
<bool>true</bool>
|
||||
|
||||
Reference in New Issue
Block a user