biod.pnpi.spb.ru
/
alexxy
/
gromacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add basic grouping to Options
[alexxy/gromacs.git]
/
src
/
gromacs
/
trajectoryanalysis
/
cmdlinerunner.cpp
diff --git
a/src/gromacs/trajectoryanalysis/cmdlinerunner.cpp
b/src/gromacs/trajectoryanalysis/cmdlinerunner.cpp
index 5ac15b6281f04b4386ebe8ea77f95d6855d4a70f..a32a591e356d58f16d7d121d2db48f7244b90fea 100644
(file)
--- a/
src/gromacs/trajectoryanalysis/cmdlinerunner.cpp
+++ b/
src/gromacs/trajectoryanalysis/cmdlinerunner.cpp
@@
-111,19
+111,15
@@
TrajectoryAnalysisCommandLineRunner::Impl::parseOptions(
FileNameOptionManager fileoptManager;
SelectionOptionManager seloptManager(selections);
Options options(NULL, NULL);
FileNameOptionManager fileoptManager;
SelectionOptionManager seloptManager(selections);
Options options(NULL, NULL);
- Options moduleOptions(module_->name(), module_->description());
- Options commonOptions("common", "Common analysis control");
- Options selectionOptions("selection", "Common selection control");
options.addManager(&fileoptManager);
options.addManager(&seloptManager);
options.addManager(&fileoptManager);
options.addManager(&seloptManager);
- options.addSubSection(&commonOptions);
- options.addSubSection(&selectionOptions);
- options.addSubSection(&moduleOptions);
+ IOptionsContainer &commonOptions = options.addGroup();
+ IOptionsContainer &moduleOptions = options.addGroup();
module_->initOptions(&moduleOptions, settings);
common->initOptions(&commonOptions);
module_->initOptions(&moduleOptions, settings);
common->initOptions(&commonOptions);
- selections->initOptions(&
selecti
onOptions);
+ selections->initOptions(&
comm
onOptions);
{
CommandLineParser parser(&options);
{
CommandLineParser parser(&options);
@@
-134,8
+130,8
@@
TrajectoryAnalysisCommandLineRunner::Impl::parseOptions(
options.finish();
}
options.finish();
}
- common->optionsFinished(&
commonO
ptions);
- module_->optionsFinished(&
moduleO
ptions, settings);
+ common->optionsFinished(&
o
ptions);
+ module_->optionsFinished(&
o
ptions, settings);
common->initIndexGroups(selections, bUseDefaultGroups_);
common->initIndexGroups(selections, bUseDefaultGroups_);
@@
-259,18
+255,14
@@
TrajectoryAnalysisCommandLineRunner::writeHelp(const CommandLineHelpContext &con
SelectionOptionManager seloptManager(&selections);
Options options(NULL, NULL);
SelectionOptionManager seloptManager(&selections);
Options options(NULL, NULL);
- Options moduleOptions(impl_->module_->name(), impl_->module_->description());
- Options commonOptions("common", "Common analysis control");
- Options selectionOptions("selection", "Common selection control");
options.addManager(&seloptManager);
options.addManager(&seloptManager);
- options.addSubSection(&commonOptions);
- options.addSubSection(&selectionOptions);
- options.addSubSection(&moduleOptions);
+ IOptionsContainer &commonOptions = options.addGroup();
+ IOptionsContainer &moduleOptions = options.addGroup();
impl_->module_->initOptions(&moduleOptions, &settings);
common.initOptions(&commonOptions);
impl_->module_->initOptions(&moduleOptions, &settings);
common.initOptions(&commonOptions);
- selections.initOptions(&
selecti
onOptions);
+ selections.initOptions(&
comm
onOptions);
CommandLineHelpWriter(options)
.setHelpText(settings.helpText())
CommandLineHelpWriter(options)
.setHelpText(settings.helpText())