Changeset a758043 in sasview

Timestamp:

Sep 7, 2018 5:13:39 AM (6 years ago)

Author:

Torin Cooper-Bennun <torin.cooper-bennun@…>

Branches:

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

Children:

bc7371fd

Parents:

88ada06

git-author:

Torin Cooper-Bennun <torin.cooper-bennun@…> (09/07/18 05:13:25)

git-committer:

Torin Cooper-Bennun <torin.cooper-bennun@…> (09/07/18 05:13:39)

Message:

function signatures and return values now maintain backwards compatibility, and do not break tests

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• FittingUtilities.py (modified) (8 diffs)
• FittingWidget.py (modified) (3 diffs)

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

@@ -91 +91 @@
     return cbox
 
-def addParametersToModel(model, view, parameters, kernel_module, is2D):
-    """
-    Update local ModelModel with sasmodel parameters
+def addParametersToModel(parameters, kernel_module, is2D, model=None, view=None):
+    """
+    Update local ModelModel with sasmodel parameters.
+    Actually appends to model, if model and view params are not None.
+    Always returns list of lists of QStandardItems.
     """
     multishell_parameters = getIterParams(parameters)
@@ -103 +105 @@
         params = parameters.iq_parameters
 
+    rows = []
     for param in params:
         # don't include shell parameters
@@ -156 +159 @@
 
         # Append to the model and use the combobox, if required
-        model.appendRow(row)
-        if cbox is not None:
-            view.setIndexWidget(item2.index(), cbox)
-
-def addSimpleParametersToModel(model, view, parameters, is2D):
+        if None not in (model, view):
+            model.appendRow(row)
+            if cbox:
+                view.setIndexWidget(item2.index(), cbox)
+        rows.append(row)
+
+    return rows
+
+def addSimpleParametersToModel(parameters, is2D, model=None, view=None):
     """
     Update local ModelModel with sasmodel parameters (non-dispersed, non-magnetic)
@@ -169 +176 @@
         params = parameters.iq_parameters
 
+    rows = []
     for param in params:
         # Create the top level, checkable item
@@ -189 +197 @@
 
         # Append to the model and use the combobox, if required
-        model.appendRow(row)
-        if cbox is not None:
-            view.setIndexWidget(item2.index(), cbox)
+        if None not in (model, view):
+            model.appendRow(row)
+            if cbox:
+                view.setIndexWidget(item2.index(), cbox)
+        rows.append(row)
+
+    return rows
 
 def markParameterDisabled(model, row):
@@ -271 +283 @@
     model.header_tooltips = copy.copy(poly_header_error_tooltips)
 
-def addShellsToModel(parameters, model, view, index):
+def addShellsToModel(parameters, model, index, view=None):
     """
     Find out multishell parameters and update the model with the requested number of them
@@ -277 +289 @@
     multishell_parameters = getIterParams(parameters)
 
+    rows = []
     for i in range(index):
         for par in multishell_parameters:
@@ -309 +322 @@
             cbox = createFixedChoiceComboBox(par, row)
 
-            # Append to the model and use the combobox, if required
+            # Always append to the model
             model.appendRow(row)
-            if cbox is not None:
+
+            # Apply combobox if required
+            if None not in (view, cbox):
                 view.setIndexWidget(item2.index(), cbox)
+
+            rows.append(row)
+
+    return rows
 
 def calculateChi2(reference_data, current_data):

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

@@ -2051 +2051 @@
         # Update the QModel
         FittingUtilities.addParametersToModel(
-                self._model_model,
-                self.lstParams,
                 self.model_parameters,
                 self.kernel_module,
-                self.is2D)
+                self.is2D,
+                self._model_model,
+                self.lstParams)
 
         # Update the counter used for multishell display
@@ -2076 +2076 @@
         # Update the QModel
         FittingUtilities.addSimpleParametersToModel(
+                structure_parameters,
+                self.is2D,
                 self._model_model,
-                self.lstParams,
-                structure_parameters,
-                self.is2D)
+                self.lstParams)
 
         # Any parameters removed from the structure factor when producing the product model, e.g. radius_effective, must
@@ -2712 +2712 @@
                 self.model_parameters,
                 self._model_model,
-                self.lstParams,
-                index)
+                index,
+                self.lstParams)
 
         self.current_shell_displayed = index