Changeset 8b480d27 in sasview for src/sas/qtgui/Utilities/TabbedModelEditor.py

Timestamp:

Mar 21, 2018 8:24:36 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

8ac3551

Parents:

3b3b40b

Message:

Code cleanup and minor fixes

File:

• src/sas/qtgui/Utilities/TabbedModelEditor.py (modified) (10 diffs)

src/sas/qtgui/Utilities/TabbedModelEditor.py

@@ -2 +2 @@
 import sys
 import os
-import types
 import datetime
 import numpy as np
-import webbrowser
 import logging
 
-from PyQt5 import QtCore
-from PyQt5 import QtGui
 from PyQt5 import QtWidgets
 
@@ -17 +13 @@
 from sas.qtgui.Utilities.PluginDefinition import PluginDefinition
 from sas.qtgui.Utilities.ModelEditor import ModelEditor
-import sas.qtgui.Utilities.GuiUtils as GuiUtils
 
 class TabbedModelEditor(QtWidgets.QDialog, Ui_TabbedModelEditor):
@@ -314 +309 @@
         return self.tabWidget.currentWidget().getModel()
 
-    def writeFile(self, fname, model_str=""):
+    @classmethod
+    def writeFile(cls, fname, model_str=""):
         """
         Write model content to file "fname"
@@ -342 +338 @@
         model_text += 'parameters = [ \n'
         model_text += '#   ["name", "units", default, [lower, upper], "type", "description"],\n'
-        for pname, pvalue, desc in self.getParamHelper(param_str):
-            param_names.append(pname)
-            model_text += "    ['%s', '', %s, [-inf, inf], '', '%s'],\n" % (pname, pvalue, desc)
-        for pname, pvalue, desc in self.getParamHelper(pd_param_str):
-            param_names.append(pname)
-            pd_params.append(pname)
-            model_text += "    ['%s', '', %s, [-inf, inf], 'volume', '%s'],\n" % (pname, pvalue, desc)
+        if param_str:
+            for pname, pvalue, desc in self.getParamHelper(param_str):
+                param_names.append(pname)
+                model_text += "    ['%s', '', %s, [-inf, inf], '', '%s'],\n" % (pname, pvalue, desc)
+        if pd_param_str:
+            for pname, pvalue, desc in self.getParamHelper(pd_param_str):
+                param_names.append(pname)
+                pd_params.append(pname)
+                model_text += "    ['%s', '', %s, [-inf, inf], 'volume', '%s'],\n" % (pname, pvalue, desc)
         model_text += '    ]\n'
 
@@ -381 +379 @@
         return model_text
 
-    def checkModel(self, path):
+    @classmethod
+    def checkModel(cls, path):
         """
         Check that the model save in file 'path' can run.
@@ -390 +389 @@
         model = Model()
         q =  np.array([0.01, 0.1])
-        Iq = model.evalDistribution(q)
+        _ = model.evalDistribution(q)
         qx, qy =  np.array([0.01, 0.01]), np.array([0.1, 0.1])
-        Iqxy = model.evalDistribution([qx, qy])
+        _ = model.evalDistribution([qx, qy])
 
         # check the model's unit tests run
@@ -400 +399 @@
         return result
 
-    def getParamHelper(self, param_str):
+    @classmethod
+    def getParamHelper(cls, param_str):
         """
         yield a sequence of name, value pairs for the parameters in param_str
@@ -414 +414 @@
                 if name:
                     yield [v.strip() for v in (name, value, desc)]
-        
-    def strFromParamDict(self, param_dict):
+
+    @classmethod
+    def strFromParamDict(cls, param_dict):
         """
         Creates string from parameter dictionary
@@ -423 +424 @@
         """
         param_str = ""
-        for row, params in param_dict.items():
+        for _, params in param_dict.items():
             if not params[0]: continue
             value = 1
@@ -500 +501 @@
 
 if __name__ == '__main__':
-    import sys
     app = QtWidgets.QApplication(sys.argv)
     sheet = TabbedModelEditor()
     sheet.show()
-    sys.exit(app.exec_())
+    app.exec_()