Adapt python bindings for Options changes

options.setDescription was moved to settings.setHelpText. Python
bindings now use this new API.

diff --git a/src/python/pipeline_test.py b/src/python/pipeline_test.py
index de96f2df8f98e657b2fc1569c5adceacfba1426a..8e2124453b518ee9483b7f6ef888488c1c3764fd 100644 (file)
--- 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 a722970b4ce782fe97722d8b819de6c813170879..2ea912df686bcfc79f521af4025d53a945819583 100644 (file)
--- 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 02e523720817f4113bebde223385901fb96d9736..077ac6536c46964d2920fe1473efd63d735b1744 100644 (file)
--- 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 708f741726808c7962e9e8d83e42bd417fb1a3f0..3e29c100c1ab895a6092509ec25b378e1dcad199 100644 (file)
--- 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 fcc769a5e69da4c0f0417adc0d88c602fb8eecc3..67e6ecc48afef0268e8fb2138c09e68c3186c790 100644 (file)
--- 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)