apoorva/greenhouse
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When selecting an object from scene, don't start the camera when it is paused. (issue with a directory of image, which we don't want the camera running while selecting objects)

Browse Source 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@267 620bd6b2-0a58-f614-fd9a-1bd335dccda9
This commit is contained in:
matlabbe 2014-05-08 19:02:42 +00:00
parent 69c416aebf
commit 3bd58086d2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/MainWindow.cpp
View File

@ -416,7 +416,7 @@ void MainWindow::addObjectFromScene()
disconnect(camera_, SIGNAL(imageReceived(const cv::Mat &)), this, SLOT(update(const cv::Mat &))); disconnect(camera_, SIGNAL(imageReceived(const cv::Mat &)), this, SLOT(update(const cv::Mat &)));
AddObjectDialog * dialog; AddObjectDialog * dialog;
bool resumeCamera = camera_->isRunning(); bool resumeCamera = camera_->isRunning();
if(!ui_->actionStart_camera->isEnabled() || ui_->imageView_source->cvImage().empty()) if(camera_->isRunning() || ui_->imageView_source->cvImage().empty())
{ {
dialog = new AddObjectDialog(camera_, cv::Mat(), ui_->imageView_source->isMirrorView(), this); dialog = new AddObjectDialog(camera_, cv::Mat(), ui_->imageView_source->isMirrorView(), this);
} }