Added RealSense SR300 camera support (#421)

This commit is contained in:
matlabbe
2019-07-05 11:19:45 -04:00
parent bb94adc846
commit 78d0d60b9f
5 changed files with 25 additions and 2 deletions

View File

@@ -539,7 +539,7 @@ bool CameraRealSense2::init(const std::string & calibrationFolder, const std::st
} }
else if ("Coded-Light Depth Sensor" == module_name) else if ("Coded-Light Depth Sensor" == module_name)
{ {
UINFO("Found \"%s\"", module_name.c_str()); sensors[1] = elem;
} }
else if ("RGB Camera" == module_name) else if ("RGB Camera" == module_name)
{ {

View File

@@ -37,5 +37,6 @@
<file>images/d415.png</file> <file>images/d415.png</file>
<file>images/tara.png</file> <file>images/tara.png</file>
<file>images/t265.png</file> <file>images/t265.png</file>
<file>images/sr300.png</file>
</qresource> </qresource>
</RCC> </RCC>

View File

@@ -433,6 +433,7 @@ MainWindow::MainWindow(PreferencesDialog * prefDialog, QWidget * parent, bool sh
connect(_ui->actionKinect_for_Windows_SDK_v2, SIGNAL(triggered()), this, SLOT(selectK4W2())); connect(_ui->actionKinect_for_Windows_SDK_v2, SIGNAL(triggered()), this, SLOT(selectK4W2()));
connect(_ui->actionRealSense_R200, 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->actionRealSense_ZR300, SIGNAL(triggered()), this, SLOT(selectRealSense()));
connect(_ui->actionRealSense2_SR300, SIGNAL(triggered()), this, SLOT(selectRealSense2()));
connect(_ui->actionRealSense2_D415, SIGNAL(triggered()), this, SLOT(selectRealSense2())); connect(_ui->actionRealSense2_D415, SIGNAL(triggered()), this, SLOT(selectRealSense2()));
connect(_ui->actionRealSense2_D435, SIGNAL(triggered()), this, SLOT(selectRealSense2())); connect(_ui->actionRealSense2_D435, SIGNAL(triggered()), this, SLOT(selectRealSense2()));
connect(_ui->actionStereoDC1394, SIGNAL(triggered()), this, SLOT(selectStereoDC1394())); connect(_ui->actionStereoDC1394, SIGNAL(triggered()), this, SLOT(selectStereoDC1394()));
@@ -451,6 +452,7 @@ MainWindow::MainWindow(PreferencesDialog * prefDialog, QWidget * parent, bool sh
_ui->actionKinect_for_Windows_SDK_v2->setEnabled(CameraK4W2::available()); _ui->actionKinect_for_Windows_SDK_v2->setEnabled(CameraK4W2::available());
_ui->actionRealSense_R200->setEnabled(CameraRealSense::available()); _ui->actionRealSense_R200->setEnabled(CameraRealSense::available());
_ui->actionRealSense_ZR300->setEnabled(CameraRealSense::available()); _ui->actionRealSense_ZR300->setEnabled(CameraRealSense::available());
_ui->actionRealSense2_SR300->setEnabled(CameraRealSense2::available());
_ui->actionRealSense2_D415->setEnabled(CameraRealSense2::available()); _ui->actionRealSense2_D415->setEnabled(CameraRealSense2::available());
_ui->actionRealSense2_D435->setEnabled(CameraRealSense2::available()); _ui->actionRealSense2_D435->setEnabled(CameraRealSense2::available());
_ui->actionRealSense2_T265->setEnabled(CameraRealSense2::available()); _ui->actionRealSense2_T265->setEnabled(CameraRealSense2::available());
@@ -4452,6 +4454,7 @@ void MainWindow::updateSelectSourceMenu()
_ui->actionKinect_for_Windows_SDK_v2->setChecked(_preferencesDialog->getSourceDriver() == PreferencesDialog::kSrcK4W2); _ui->actionKinect_for_Windows_SDK_v2->setChecked(_preferencesDialog->getSourceDriver() == PreferencesDialog::kSrcK4W2);
_ui->actionRealSense_R200->setChecked(_preferencesDialog->getSourceDriver() == PreferencesDialog::kSrcRealSense); _ui->actionRealSense_R200->setChecked(_preferencesDialog->getSourceDriver() == PreferencesDialog::kSrcRealSense);
_ui->actionRealSense_ZR300->setChecked(_preferencesDialog->getSourceDriver() == PreferencesDialog::kSrcRealSense); _ui->actionRealSense_ZR300->setChecked(_preferencesDialog->getSourceDriver() == PreferencesDialog::kSrcRealSense);
_ui->actionRealSense2_SR300->setChecked(_preferencesDialog->getSourceDriver() == PreferencesDialog::kSrcRealSense2);
_ui->actionRealSense2_D415->setChecked(_preferencesDialog->getSourceDriver() == PreferencesDialog::kSrcRealSense2); _ui->actionRealSense2_D415->setChecked(_preferencesDialog->getSourceDriver() == PreferencesDialog::kSrcRealSense2);
_ui->actionRealSense2_D435->setChecked(_preferencesDialog->getSourceDriver() == PreferencesDialog::kSrcRealSense2); _ui->actionRealSense2_D435->setChecked(_preferencesDialog->getSourceDriver() == PreferencesDialog::kSrcRealSense2);
_ui->actionStereoDC1394->setChecked(_preferencesDialog->getSourceDriver() == PreferencesDialog::kSrcDC1394); _ui->actionStereoDC1394->setChecked(_preferencesDialog->getSourceDriver() == PreferencesDialog::kSrcDC1394);

BIN
guilib/src/images/sr300.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

View File

@@ -174,7 +174,7 @@
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../GuiLib.qrc"> <iconset resource="../GuiLib.qrc">
<normaloff>:/images/d435.png</normaloff>:/images/d435.png</iconset> <normaloff>:/images/r200.png</normaloff>:/images/r200.png</iconset>
</property> </property>
<addaction name="actionRealSense_R200"/> <addaction name="actionRealSense_R200"/>
</widget> </widget>
@@ -208,12 +208,23 @@
</property> </property>
<addaction name="actionRealSense2_D415"/> <addaction name="actionRealSense2_D415"/>
</widget> </widget>
<widget class="QMenu" name="menuRealSense_SR300">
<property name="title">
<string>RealSense SR300</string>
</property>
<property name="icon">
<iconset resource="../GuiLib.qrc">
<normaloff>:/images/sr300.png</normaloff>:/images/sr300.png</iconset>
</property>
<addaction name="actionRealSense2_SR300"/>
</widget>
<addaction name="menuKinect_for_Xbox_360"/> <addaction name="menuKinect_for_Xbox_360"/>
<addaction name="menuXtion_PRO_LIVE"/> <addaction name="menuXtion_PRO_LIVE"/>
<addaction name="menuSense_3D_scanner"/> <addaction name="menuSense_3D_scanner"/>
<addaction name="menuKinect_v2"/> <addaction name="menuKinect_v2"/>
<addaction name="menuRealSense_R200"/> <addaction name="menuRealSense_R200"/>
<addaction name="menuRealSense_ZR300"/> <addaction name="menuRealSense_ZR300"/>
<addaction name="menuRealSense_SR300"/>
<addaction name="menuRealSense_D415"/> <addaction name="menuRealSense_D415"/>
<addaction name="menuRealSense_D435"/> <addaction name="menuRealSense_D435"/>
</widget> </widget>
@@ -1560,6 +1571,14 @@
<string>RealSense2</string> <string>RealSense2</string>
</property> </property>
</action> </action>
<action name="actionRealSense2_SR300">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>RealSense2</string>
</property>
</action>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget> <customwidget>