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

updated to version 0.4.1

Browse Source 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@183 620bd6b2-0a58-f614-fd9a-1bd335dccda9
This commit is contained in:
matlabbe 2013-02-07 18:02:04 +00:00
parent f2b687faac
commit 7921affc14
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -11,7 +11,7 @@ ADD_DEFINITIONS( "-Wall" )
####################### #######################
# VERSION # VERSION
####################### #######################
SET(PROJECT_VERSION "0.4.0") SET(PROJECT_VERSION "0.4.1")
ADD_DEFINITIONS(-DPROJECT_VERSION="${PROJECT_VERSION}") ADD_DEFINITIONS(-DPROJECT_VERSION="${PROJECT_VERSION}")
STRING(REGEX MATCHALL "[0-9]" PROJECT_VERSION_PARTS "${PROJECT_VERSION}") STRING(REGEX MATCHALL "[0-9]" PROJECT_VERSION_PARTS "${PROJECT_VERSION}")

6
src/ParametersToolBox.cpp
View File

@ -376,7 +376,7 @@ void ParametersToolBox::changeParameter(const int & value)
if(isBinaryDescriptor && nnBox->currentText().compare("Lsh") != 0) if(isBinaryDescriptor && nnBox->currentText().compare("Lsh") != 0)
{ {
QMessageBox::warning(this, QMessageBox::warning(this,
tr("Error"), tr("Warning"),
tr("Current selected descriptor type (\"%1\") is binary while nearest neighbor strategy is not (\"%2\").\n" 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).") "Falling back to \"Lsh\" nearest neighbor strategy (by default).")
.arg(descriptorBox->currentText()) .arg(descriptorBox->currentText())
@ -397,7 +397,7 @@ void ParametersToolBox::changeParameter(const int & value)
else if(!isBinaryDescriptor && nnBox->currentText().compare("Lsh") == 0) else if(!isBinaryDescriptor && nnBox->currentText().compare("Lsh") == 0)
{ {
QMessageBox::warning(this, QMessageBox::warning(this,
tr("Error"), tr("Warning"),
tr("Current selected descriptor type (\"%1\") is not binary while nearest neighbor strategy is (\"%2\").\n" 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).") "Falling back to \"KDTree\" nearest neighbor strategy (by default).")
.arg(descriptorBox->currentText()) .arg(descriptorBox->currentText())
@ -427,7 +427,7 @@ void ParametersToolBox::changeParameter(const int & value)
if(nnBox->currentText().compare("Lsh") != 0 && distBox->currentIndex() > 1) if(nnBox->currentText().compare("Lsh") != 0 && distBox->currentIndex() > 1)
{ {
QMessageBox::warning(this, QMessageBox::warning(this,
tr("Error"), tr("Warning"),
tr("Current selected nearest neighbor strategy type (\"%1\") cannot handle distance strategy (\"%2\").\n" tr("Current selected nearest neighbor strategy type (\"%1\") cannot handle distance strategy (\"%2\").\n"
"Falling back to \"EUCLIDEAN_L2\" distance strategy (by default).") "Falling back to \"EUCLIDEAN_L2\" distance strategy (by default).")
.arg(nnBox->currentText()) .arg(nnBox->currentText())