From 7921affc1471669551039144de8a90455dbd15be Mon Sep 17 00:00:00 2001 From: matlabbe Date: Thu, 7 Feb 2013 18:02:04 +0000 Subject: [PATCH] updated to version 0.4.1 git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@183 620bd6b2-0a58-f614-fd9a-1bd335dccda9 --- CMakeLists.txt | 2 +- src/ParametersToolBox.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 003df21f..40b898ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ ADD_DEFINITIONS( "-Wall" ) ####################### # VERSION ####################### -SET(PROJECT_VERSION "0.4.0") +SET(PROJECT_VERSION "0.4.1") ADD_DEFINITIONS(-DPROJECT_VERSION="${PROJECT_VERSION}") STRING(REGEX MATCHALL "[0-9]" PROJECT_VERSION_PARTS "${PROJECT_VERSION}") diff --git a/src/ParametersToolBox.cpp b/src/ParametersToolBox.cpp index 2eda263c..049c6cbb 100644 --- a/src/ParametersToolBox.cpp +++ b/src/ParametersToolBox.cpp @@ -376,7 +376,7 @@ void ParametersToolBox::changeParameter(const int & value) if(isBinaryDescriptor && nnBox->currentText().compare("Lsh") != 0) { QMessageBox::warning(this, - tr("Error"), + tr("Warning"), tr("Current selected descriptor type (\"%1\") is binary while nearest neighbor strategy is not (\"%2\").\n" "Falling back to \"Lsh\" nearest neighbor strategy (by default).") .arg(descriptorBox->currentText()) @@ -397,7 +397,7 @@ void ParametersToolBox::changeParameter(const int & value) else if(!isBinaryDescriptor && nnBox->currentText().compare("Lsh") == 0) { QMessageBox::warning(this, - tr("Error"), + tr("Warning"), tr("Current selected descriptor type (\"%1\") is not binary while nearest neighbor strategy is (\"%2\").\n" "Falling back to \"KDTree\" nearest neighbor strategy (by default).") .arg(descriptorBox->currentText()) @@ -427,7 +427,7 @@ void ParametersToolBox::changeParameter(const int & value) if(nnBox->currentText().compare("Lsh") != 0 && distBox->currentIndex() > 1) { QMessageBox::warning(this, - tr("Error"), + tr("Warning"), tr("Current selected nearest neighbor strategy type (\"%1\") cannot handle distance strategy (\"%2\").\n" "Falling back to \"EUCLIDEAN_L2\" distance strategy (by default).") .arg(nnBox->currentText())