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

fixed starting crash on Windows

Browse Source 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@239 620bd6b2-0a58-f614-fd9a-1bd335dccda9
This commit is contained in:
matlabbe
2014-04-11 22:30:38 +00:00
parent 5d4e16d954
commit 6082ab4b63
4 changed files with 238 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ParametersToolBox.cpp
+18 -12
View File
@@ -134,13 +134,16 @@ void ParametersToolBox::updateParametersVisibility()
for(int i=0; i<objects.size(); ++i)
{
if(objects[i]->objectName().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; i<objects.size(); ++i)
{
if(objects[i]->objectName().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);
}
}
}
}
src/Settings.h
+2 -2
View File
@@ -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.");