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

Fixed double re-detection when the camera is not running and objects were updated

Browse Source
This commit is contained in:
matlabbe 2016-01-17 14:01:36 -05:00
parent 9cc9868820
commit 52387f27b3
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/MainWindow.cpp
View File

@ -1607,7 +1607,10 @@ void MainWindow::notifyParametersChanged(const QStringList & paramChanged)
this->statusBar()->showMessage(tr("A parameter has changed... \"Update objects\" may be required.")); this->statusBar()->showMessage(tr("A parameter has changed... \"Update objects\" may be required."));
} }
if(parameterChanged && !camera_->isRunning() && !sceneImage_.empty()) if(parameterChanged &&
!camera_->isRunning() &&
!sceneImage_.empty() &&
!(Settings::getGeneral_autoUpdateObjects() && detectorDescriptorParamsChanged)) // already done in updateObjects() above
{ {
this->update(sceneImage_); this->update(sceneImage_);
ui_->label_timeRefreshRate->setVisible(false); ui_->label_timeRefreshRate->setVisible(false);