diff --git a/.cproject b/.cproject
index 6b45f00b..7ddc2155 100644
--- a/.cproject
+++ b/.cproject
@@ -1,131 +1,215 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- cmake
- -E chdir build/ cmake -G "MinGW Makefiles" -D CMAKE_BUILD_TYPE=Debug ../
-
- true
- false
- true
-
-
- cmake
- -E chdir build/ cmake -G "MinGW Makefiles" -D CMAKE_BUILD_TYPE=Release ../
-
- true
- false
- true
-
-
- cmake
- -E chdir build/ cmake -G "Unix Makefiles" -D CMAKE_BUILD_TYPE=Debug ../
-
- true
- false
- true
-
-
- cmake
- -E chdir build/ cmake -G "Unix Makefiles" -D CMAKE_BUILD_TYPE=Release ../
-
- true
- false
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- cmake
- -E chdir build/ cmake -G "MinGW Makefiles" -D CMAKE_BUILD_TYPE=Debug ../
-
- true
- false
- true
-
-
- cmake
- -E chdir build/ cmake -G "MinGW Makefiles" -D CMAKE_BUILD_TYPE=Release ../
-
- true
- false
- true
-
-
- cmake
- -E chdir build/ cmake -G "Unix Makefiles" -D CMAKE_BUILD_TYPE=Debug ../
-
- true
- false
- true
-
-
- cmake
- -E chdir build/ cmake -G "Unix Makefiles" -D CMAKE_BUILD_TYPE=Release ../
-
- true
- false
- true
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ cmake
+ -E chdir build/ cmake -G "MinGW Makefiles" -D CMAKE_BUILD_TYPE=Debug ../
+
+ true
+ false
+ true
+
+
+ cmake
+ -E chdir build/ cmake -G "MinGW Makefiles" -D CMAKE_BUILD_TYPE=Release ../
+
+ true
+ false
+ true
+
+
+ cmake
+ -E chdir build/ cmake -G "Unix Makefiles" -D CMAKE_BUILD_TYPE=Debug ../
+
+ true
+ false
+ true
+
+
+ cmake
+ -E chdir build/ cmake -G "Unix Makefiles" -D CMAKE_BUILD_TYPE=Release ../
+
+ true
+ false
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ cmake
+ -E chdir build/ cmake -G "MinGW Makefiles" -D CMAKE_BUILD_TYPE=Debug ../
+
+ true
+ false
+ true
+
+
+ cmake
+ -E chdir build/ cmake -G "MinGW Makefiles" -D CMAKE_BUILD_TYPE=Release ../
+
+ true
+ false
+ true
+
+
+ cmake
+ -E chdir build/ cmake -G "Unix Makefiles" -D CMAKE_BUILD_TYPE=Debug ../
+
+ true
+ false
+ true
+
+
+ cmake
+ -E chdir build/ cmake -G "Unix Makefiles" -D CMAKE_BUILD_TYPE=Release ../
+
+ true
+ false
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ cmake
+ -E chdir build/ cmake -G "MinGW Makefiles" -D CMAKE_BUILD_TYPE=Debug ../
+
+ true
+ false
+ true
+
+
+ cmake
+ -E chdir build/ cmake -G "MinGW Makefiles" -D CMAKE_BUILD_TYPE=Release ../
+
+ true
+ false
+ true
+
+
+ cmake
+ -E chdir build/ cmake -G "Unix Makefiles" -D CMAKE_BUILD_TYPE=Debug ../
+
+ true
+ false
+ true
+
+
+ cmake
+ -E chdir build/ cmake -G "Unix Makefiles" -D CMAKE_BUILD_TYPE=Release ../
+
+ true
+ false
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e7811eac..ea7fa34d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,9 @@ SET(PROJECT_PREFIX find_object)
ADD_DEFINITIONS(-DPROJECT_PREFIX="${PROJECT_PREFIX}")
ADD_DEFINITIONS(-DPROJECT_NAME="${PROJECT_NAME}")
-ADD_DEFINITIONS( "-Wall" )
+IF(NOT WIN32)
+ ADD_DEFINITIONS( "-Wall" )
+ENDIF(NOT WIN32)
#ADD_DEFINITIONS("-DUNICODE") # to test with UNICODE projects
#######################
diff --git a/src/ParametersToolBox.cpp b/src/ParametersToolBox.cpp
index 6b394a9f..06efebee 100644
--- a/src/ParametersToolBox.cpp
+++ b/src/ParametersToolBox.cpp
@@ -134,13 +134,16 @@ void ParametersToolBox::updateParametersVisibility()
for(int i=0; iobjectName().contains(descriptorName) || objects[i]->objectName().contains(detectorName))
+ if(!objects[i]->objectName().isEmpty())
{
- ((QWidget*)objects[i])->setVisible(true);
- }
- else if(!objects[i]->objectName().split('/').at(1).at(0).isDigit())
- {
- ((QWidget*)objects[i])->setVisible(false);
+ if(objects[i]->objectName().contains(descriptorName) || objects[i]->objectName().contains(detectorName))
+ {
+ ((QWidget*)objects[i])->setVisible(true);
+ }
+ else if(!objects[i]->objectName().split('/').at(1).at(0).isDigit())
+ {
+ ((QWidget*)objects[i])->setVisible(false);
+ }
}
}
}
@@ -166,13 +169,16 @@ void ParametersToolBox::updateParametersVisibility()
for(int i=0; iobjectName().contains(nnName))
+ if(!objects[i]->objectName().isEmpty())
{
- ((QWidget*)objects[i])->setVisible(true);
- }
- else if(!objects[i]->objectName().split('/').at(1).at(0).isDigit())
- {
- ((QWidget*)objects[i])->setVisible(false);
+ if(objects[i]->objectName().contains(nnName))
+ {
+ ((QWidget*)objects[i])->setVisible(true);
+ }
+ else if(!objects[i]->objectName().split('/').at(1).at(0).isDigit())
+ {
+ ((QWidget*)objects[i])->setVisible(false);
+ }
}
}
}
diff --git a/src/Settings.h b/src/Settings.h
index 4db69d7b..9614c6d3 100644
--- a/src/Settings.h
+++ b/src/Settings.h
@@ -62,8 +62,8 @@ class Settings
PARAMETER(Camera, 5mediaPath, QString, "", "Video file or directory of images. If set, the camera is not used. See General->videoFormats and General->imageFormats for available formats.");
//List format : [Index:item0;item1;item3;...]
- PARAMETER(Feature2D, 1Detector, QString, "5:Dense;Fast;GFTT;MSER;ORB;SIFT;Star;SURF;BRISK" , "Keypoint detector.");
- PARAMETER(Feature2D, 2Descriptor, QString, "2:Brief;ORB;SIFT;SURF;BRISK;FREAK", "Keypoint descriptor.");
+ PARAMETER(Feature2D, 1Detector, QString, "7:Dense;Fast;GFTT;MSER;ORB;SIFT;Star;SURF;BRISK" , "Keypoint detector.");
+ PARAMETER(Feature2D, 2Descriptor, QString, "3:Brief;ORB;SIFT;SURF;BRISK;FREAK", "Keypoint descriptor.");
PARAMETER(Feature2D, Brief_bytes, int, 32, "Bytes is a length of descriptor in bytes. It can be equal 16, 32 or 64 bytes.");