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

fixed crash when changing nearest neighbor approach

Browse Source
This commit is contained in:
matlabbe 2015-05-19 18:36:46 -04:00
parent 683acafa4a
commit b3b25b905b
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bin/.gitignore vendored Normal file
View File

@ -0,0 +1,8 @@
# Ignore everything in this directory
*
# Except this file
!.gitignore
!box_in_scene.png
!box.png
!multi-objs
!multi-scene.jpg

4
build/.gitignore vendored Normal file
View File

@ -0,0 +1,4 @@
# Ignore everything in this directory
*
# Except this file
!.gitignore

1
include/find_object/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
/Version.h

4
src/MainWindow.cpp
View File

@ -937,7 +937,6 @@ void MainWindow::updateObjects(const QList<int> & ids)
if(ids.size()) if(ids.size())
{ {
this->statusBar()->showMessage(tr("Updating %1 objects...").arg(ids.size())); this->statusBar()->showMessage(tr("Updating %1 objects...").arg(ids.size()));
QApplication::processEvents();
findObject_->updateObjects(ids); findObject_->updateObjects(ids);
@ -972,7 +971,6 @@ void MainWindow::updateObjects()
void MainWindow::updateVocabulary() void MainWindow::updateVocabulary()
{ {
this->statusBar()->showMessage(tr("Updating vocabulary...")); this->statusBar()->showMessage(tr("Updating vocabulary..."));
QApplication::processEvents();
QTime time; QTime time;
time.start(); 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.")); 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())
{ {
this->update(sceneImage_); this->update(sceneImage_);
ui_->label_timeRefreshRate->setVisible(false); 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_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_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()); ui_->actionCamera_from_TCP_IP->setChecked(Settings::getCamera_6useTcpCamera());