diff --git a/bin/.gitignore b/bin/.gitignore new file mode 100644 index 00000000..bef66adf --- /dev/null +++ b/bin/.gitignore @@ -0,0 +1,8 @@ +# Ignore everything in this directory +* +# Except this file +!.gitignore +!box_in_scene.png +!box.png +!multi-objs +!multi-scene.jpg diff --git a/build/.gitignore b/build/.gitignore new file mode 100644 index 00000000..5e7d2734 --- /dev/null +++ b/build/.gitignore @@ -0,0 +1,4 @@ +# Ignore everything in this directory +* +# Except this file +!.gitignore diff --git a/include/find_object/.gitignore b/include/find_object/.gitignore new file mode 100644 index 00000000..3503265b --- /dev/null +++ b/include/find_object/.gitignore @@ -0,0 +1 @@ +/Version.h diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index be1ce22f..52e6475b 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -937,7 +937,6 @@ void MainWindow::updateObjects(const QList & ids) if(ids.size()) { this->statusBar()->showMessage(tr("Updating %1 objects...").arg(ids.size())); - QApplication::processEvents(); findObject_->updateObjects(ids); @@ -972,7 +971,6 @@ void MainWindow::updateObjects() void MainWindow::updateVocabulary() { this->statusBar()->showMessage(tr("Updating vocabulary...")); - QApplication::processEvents(); QTime time; time.start(); @@ -1445,12 +1443,12 @@ void MainWindow::notifyParametersChanged(const QStringList & paramChanged) { this->statusBar()->showMessage(tr("A parameter has changed... \"Update objects\" may be required.")); } + if(parameterChanged && !camera_->isRunning() && !sceneImage_.empty()) { this->update(sceneImage_); ui_->label_timeRefreshRate->setVisible(false); } - ui_->actionCamera_from_video_file->setChecked(!Settings::getCamera_5mediaPath().isEmpty() && !UDirectory::exists(Settings::getCamera_5mediaPath().toStdString()) && !Settings::getCamera_6useTcpCamera()); ui_->actionCamera_from_directory_of_images->setChecked(!Settings::getCamera_5mediaPath().isEmpty() && UDirectory::exists(Settings::getCamera_5mediaPath().toStdString()) && !Settings::getCamera_6useTcpCamera()); ui_->actionCamera_from_TCP_IP->setChecked(Settings::getCamera_6useTcpCamera());