From c4ac09b75027926ce9e1410462ee73c97c8f4fe1 Mon Sep 17 00:00:00 2001 From: matlabbe Date: Tue, 10 Jun 2014 22:32:35 +0000 Subject: [PATCH] Hiding camera actions when a camera is given to main window (like the ros-pkg) git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@334 620bd6b2-0a58-f614-fd9a-1bd335dccda9 --- src/MainWindow.cpp | 36 ++++++++++++++++++++++-------------- src/MainWindow.h | 1 - 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index aef4f5db..b386ebd3 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -65,15 +65,6 @@ MainWindow::MainWindow(Camera * camera, const QString & settings, QWidget * pare ui_->likelihoodPlot->addCurve(inliersCurve_, false); ui_->likelihoodPlot->setGraphicsView(true); - if(!camera_) - { - camera_ = new Camera(this); - } - else - { - camera_->setParent(this); - } - ui_->dockWidget_statistics->setVisible(false); ui_->dockWidget_parameters->setVisible(false); ui_->dockWidget_plot->setVisible(false); @@ -92,6 +83,28 @@ MainWindow::MainWindow(Camera * camera, const QString & settings, QWidget * pare lastObjectsUpdateParameters_ = Settings::getParameters(); ui_->toolBox->setupUi(); + + if(!camera_) + { + camera_ = new Camera(this); + } + else + { + camera_->setParent(this); + ui_->toolBox->getParameterWidget(Settings::kCamera_1deviceId())->setEnabled(false); + ui_->toolBox->getParameterWidget(Settings::kCamera_2imageWidth())->setEnabled(false); + ui_->toolBox->getParameterWidget(Settings::kCamera_3imageHeight())->setEnabled(false); + ui_->toolBox->getParameterWidget(Settings::kCamera_4imageRate())->setEnabled(false); + ui_->toolBox->getParameterWidget(Settings::kCamera_5mediaPath())->setEnabled(false); + ui_->toolBox->getParameterWidget(Settings::kCamera_6useTcpCamera())->setEnabled(false); + ui_->toolBox->getParameterWidget(Settings::kCamera_7IP())->setEnabled(false); + ui_->toolBox->getParameterWidget(Settings::kCamera_8port())->setEnabled(false); + ui_->actionCamera_from_video_file->setVisible(false); + ui_->actionCamera_from_TCP_IP->setVisible(false); + ui_->actionCamera_from_directory_of_images->setVisible(false); + ui_->actionLoad_scene_from_file->setVisible(false); + } + connect((QDoubleSpinBox*)ui_->toolBox->getParameterWidget(Settings::kCamera_4imageRate()), SIGNAL(editingFinished()), camera_, @@ -233,11 +246,6 @@ void MainWindow::setupTCPServer() tcpServer_->getHostAddress().toString().toStdString().c_str(), tcpServer_->getPort()); } -ParametersToolBox * MainWindow::parametersToolBox() const -{ - return ui_->toolBox; -} - void MainWindow::setSourceImageText(const QString & text) { ui_->imageView_source->setTextLabel(text); diff --git a/src/MainWindow.h b/src/MainWindow.h index eecc2953..d724cfb2 100644 --- a/src/MainWindow.h +++ b/src/MainWindow.h @@ -45,7 +45,6 @@ public: int loadObjects(const QString & dirPath); void saveObjects(const QString & dirPath); - ParametersToolBox * parametersToolBox() const; void setSourceImageText(const QString & text); protected: