generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #5329 from paroj:cliparser

Browse Source
This commit is contained in:
Alexander Alekhin
2015-09-21 09:46:54 +00:00
parent 0051208684 31da833574
commit 05b1636780
3 changed files with 32 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/core/include/opencv2/core/utility.hpp
View File

@@ -619,6 +619,10 @@ For example:
}
@endcode
Note that there are no default values for `help` and `timestamp` so we can check their presence using the `has()` method.
Arguments with default values are considered to be always present. Use the `get()` method in these cases to check their
actual value instead.
### Usage
For the described keys:
@@ -630,7 +634,7 @@ For the described keys:
# Bad call
$ ./app -fps=aaa
ERRORS:
Exception: can not convert: [aaa] to [double]
Parameter 'fps': can not convert: [aaa] to [double]
@endcode
*/
class CV_EXPORTS CommandLineParser

28
modules/core/src/command_line_parser.cpp
View File

@@ -97,23 +97,28 @@ void CommandLineParser::getByName(const String& name, bool space_delete, int typ
{
for (size_t j = 0; j < impl->data[i].keys.size(); j++)
{
if (name.compare(impl->data[i].keys[j]) == 0)
if (name == impl->data[i].keys[j])
{
String v = impl->data[i].def_value;
if (space_delete)
v = impl->cat_string(v);
// it is an error if we just got the default value here
if(v.empty())
break;
from_str(v, type, dst);
return;
}
}
}
impl->error = true;
impl->error_message = impl->error_message + "Unknown parameter " + name + "\n";
impl->error_message = impl->error_message + "Missing parameter: '" + name + "'\n";
}
catch (std::exception& e)
catch (Exception& e)
{
impl->error = true;
impl->error_message = impl->error_message + "Exception: " + String(e.what()) + "\n";
impl->error_message = impl->error_message + "Parameter '"+ name + "': " + e.err + "\n";
}
}
@@ -128,17 +133,22 @@ void CommandLineParser::getByIndex(int index, bool space_delete, int type, void*
{
String v = impl->data[i].def_value;
if (space_delete == true) v = impl->cat_string(v);
// it is an error if we just got the default value here
if(v.empty())
break;
from_str(v, type, dst);
return;
}
}
impl->error = true;
impl->error_message = impl->error_message + "Unknown parameter #" + format("%d", index) + "\n";
impl->error_message = impl->error_message + "Missing parameter #" + format("%d", index) + "\n";
}
catch(std::exception & e)
catch(Exception& e)
{
impl->error = true;
impl->error_message = impl->error_message + "Exception: " + String(e.what()) + "\n";
impl->error_message = impl->error_message + format("Parameter #%d: ", index) + e.err + "\n";
}
}
@@ -324,9 +334,9 @@ bool CommandLineParser::has(const String& name) const
{
for (size_t j = 0; j < impl->data[i].keys.size(); j++)
{
if (name.compare(impl->data[i].keys[j]) == 0 && String("true").compare(impl->data[i].def_value) == 0)
if (name == impl->data[i].keys[j])
{
return true;
return !impl->cat_string(impl->data[i].def_value).empty();
}
}
}