Changeset 1970780 in sasview for src/sas/qtgui/Perspectives/Fitting/FittingUtilities.py

Timestamp:

Apr 9, 2017 5:33:01 AM (7 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:

9208346

Parents:

71361f0

Message:

Add display of orientational parameters + minor refactoring

File:

• src/sas/qtgui/Perspectives/Fitting/FittingUtilities.py (modified) (4 diffs)

src/sas/qtgui/Perspectives/Fitting/FittingUtilities.py

@@ -36 +36 @@
     return (param_name, param_length)
 
-def addParametersToModel(parameters, model):
+def addParametersToModel(parameters, is2D):
     """
     Update local ModelModel with sasmodel parameters
@@ -42 +42 @@
     multishell_parameters = getIterParams(parameters)
     multishell_param_name, _ = getMultiplicity(parameters)
-
-    for param in parameters.iq_parameters:
+    params = parameters.iqxy_parameters if is2D else parameters.iq_parameters
+    item = []
+    for param in params:
         # don't include shell parameters
         if param.name == multishell_param_name:
@@ -80 +81 @@
         item4 = QtGui.QStandardItem(str(param.limits[1]))
         item5 = QtGui.QStandardItem(param.units)
-        model.appendRow([item1, item2, item3, item4, item5])
-
-def addSimpleParametersToModel(parameters, model):
+        item.append([item1, item2, item3, item4, item5])
+    return item
+
+def addSimpleParametersToModel(parameters, is2D):
     """
     Update local ModelModel with sasmodel parameters
     """
-    for param in parameters.iq_parameters:
+    params = parameters.iqxy_parameters if is2D else parameters.iq_parameters
+    item = []
+    for param in params:
         # Create the top level, checkable item
         item_name = param.name
@@ -99 +103 @@
         item5 = QtGui.QStandardItem(str(param.limits[1]))
         item6 = QtGui.QStandardItem(param.units)
-        model.appendRow([item1, item2, item4, item5, item6])
+        item.append([item1, item2, item4, item5, item6])
+    return item
 
 def addCheckedListToModel(model, param_list):