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

Using default parameters when [ --config "" ] is used.

Browse Source 
Updated default: sendNoObjDetectedEvents = true.
fixed mirror view when autoScale is set on/off


git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@397 620bd6b2-0a58-f614-fd9a-1bd335dccda9
This commit is contained in:
matlabbe
2014-08-28 17:54:29 +00:00
parent 17d5f4141a
commit 91c70ef181
6 changed files with 112 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/main.cpp
+16 -3
View File
@@ -102,9 +102,12 @@ void showUsage()
" --object \"path\" Path to an object to detect.\n"
" --objects \"path\" Directory of the objects to detect (--object is ignored).\n"
" --config \"path\" Path to configuration file (default: %s).\n"
" If set to \"\", default parameters are used "
" without saving modified parameters on closing.\n"
" --scene \"path\" Path to a scene image file.\n"
" --debug Show debug log.\n"
" --params Show all parameters.\n"
" --defaults Use default parameters (--config is ignored).\n"
" --My/Parameter \"value\" Set find-Object's parameter (look --params for parameters' name).\n"
" It will override the one in --config. Example to set 4 threads:\n"
" $ find_object --General/threads 4\n"
@@ -216,7 +219,7 @@ int main(int argc, char* argv[])
{
configPath.replace('~', QDir::homePath());
}
if(!QFile::exists(configPath))
if(!configPath.isEmpty() && !QFile::exists(configPath))
{
UWARN("Configuration file \"%s\" doesn't exist, it will be created with default values...", configPath.toStdString().c_str());
}
@@ -310,10 +313,20 @@ int main(int argc, char* argv[])
UINFO("Options:");
UINFO(" GUI mode = %s", guiMode?"true":"false");
UINFO(" Objects path: \"%s\"", objectsPath.toStdString().c_str());
if(!objectsPath.isEmpty())
{
UINFO(" Objects path: \"%s\"", objectsPath.toStdString().c_str());
}
else if(!objectPath.isEmpty())
{
UINFO(" Object path: \"%s\"", objectPath.toStdString().c_str());
}
UINFO(" Scene path: \"%s\"", scenePath.toStdString().c_str());
if(!guiMode)
{
UINFO(" JSON path: \"%s\"", jsonPath.toStdString().c_str());
}
UINFO(" Settings path: \"%s\"", configPath.toStdString().c_str());
UINFO(" JSON path: \"%s\"", jsonPath.toStdString().c_str());
for(find_object::ParametersMap::iterator iter= customParameters.begin(); iter!=customParameters.end(); ++iter)
{