From 431623ab5cb2ff34e7052b4bba0d84550a295c6a Mon Sep 17 00:00:00 2001 From: Maxim Koltsov Date: Tue, 21 Jul 2015 16:44:08 +0300 Subject: [PATCH] Adapt python bindings for Options changes options.setDescription was moved to settings.setHelpText. Python bindings now use this new API. --- src/python/pipeline_test.py | 2 +- src/python/runner/pipeline.py | 2 +- src/python/sip/options/options.sip | 13 ------------- .../sip/trajectoryanalysis/analysissettings.sip | 5 +++++ src/python/test.py | 3 ++- 5 files changed, 9 insertions(+), 16 deletions(-) diff --git a/src/python/pipeline_test.py b/src/python/pipeline_test.py index de96f2df8f..8e2124453b 100644 --- a/src/python/pipeline_test.py +++ b/src/python/pipeline_test.py @@ -8,7 +8,7 @@ class Test(TrajectoryAnalysis.TrajectoryAnalysisModule): super(Test, self).__init__("test", "test") def initOptions(self, options, settings): - options.setDescription(self.description()) + settings.setHelpText(self.description()) def getBatch(self): return self.modules diff --git a/src/python/runner/pipeline.py b/src/python/runner/pipeline.py index a722970b4c..2ea912df68 100644 --- a/src/python/runner/pipeline.py +++ b/src/python/runner/pipeline.py @@ -35,7 +35,7 @@ class GromacsPipeline(TrajectoryAnalysis.TrajectoryAnalysisModule): self.options.append(options_list) def initOptions(self, options, settings): - options.setDescription(self.description()) + settings.setHelpText(self.description()) def getBatch(self): return self.modules diff --git a/src/python/sip/options/options.sip b/src/python/sip/options/options.sip index 02e5237208..077ac6536c 100644 --- a/src/python/sip/options/options.sip +++ b/src/python/sip/options/options.sip @@ -53,19 +53,6 @@ using gmx::Options; public: Options(const char *name, const char *title); - const char* name() const; - %MethodCode - sipRes = sipCpp->name().c_str(); - %End - const char* title() const; - %MethodCode - sipRes = sipCpp->title().c_str(); - %End - const char* description() const; - %MethodCode - sipRes = sipCpp->description().c_str(); - %End - void setDescription (const char *desc); void addManager (IOptionManager *manager); void addSubSection (Options *section); void addOption(const AbstractOption &settings); diff --git a/src/python/sip/trajectoryanalysis/analysissettings.sip b/src/python/sip/trajectoryanalysis/analysissettings.sip index 708f741726..3e29c100c1 100644 --- a/src/python/sip/trajectoryanalysis/analysissettings.sip +++ b/src/python/sip/trajectoryanalysis/analysissettings.sip @@ -63,6 +63,11 @@ public: void setPBC(bool bPBC); void setRmPBC(bool bRmPBC); void setFrameFlags(int frflags); + void setHelpText(const char *helpText); + %MethodCode + const char *const helpText[] = {a0}; + sipCpp->setHelpText(helpText); + %End private: TrajectoryAnalysisSettings(const TrajectoryAnalysisSettings &other); }; diff --git a/src/python/test.py b/src/python/test.py index fcc769a5e6..67e6ecc48a 100644 --- a/src/python/test.py +++ b/src/python/test.py @@ -8,9 +8,10 @@ class M(TrajectoryAnalysis.TrajectoryAnalysisModule): def initOptions(self, options, settings): print('python: initOptions') + settings.setHelpText('A stupid test module') + self.optionsHolder = Options.PyOptionsHolder() - options.setDescription('A stupid test module') options.addOption(self.optionsHolder.selectionOption('sel').required()) options.addOption(self.optionsHolder.fileNameOption('file').defaultBasename('test').description('filename from python to rule them all').outputFile().required().filetype(Options.eftGenericData)) settings.setFlag(TrajectoryAnalysis.TrajectoryAnalysisSettings.efRequireTop) -- 2.22.0