Changeset 70f4458 in sasview

Timestamp:

Sep 7, 2018 5:57:38 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:

3fbd77b

Parents:

f3a19ad

Message:

shell parameters appear in P(Q) section correctly

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• FittingUtilities.py (modified) (2 diffs)
• FittingWidget.py (modified) (7 diffs)

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

@@ -259 +259 @@
     model.header_tooltips = copy.copy(poly_header_error_tooltips)
 
-def addShellsToModel(parameters, model, index):
-    """
-    Find out multishell parameters and update the model with the requested number of them
+def addShellsToModel(parameters, model, index, row_num=None):
+    """
+    Find out multishell parameters and update the model with the requested number of them.
+    Inserts them after the row at row_num, if not None; otherwise, appends to end.
+    Returns a list of lists of QStandardItem objects.
     """
     multishell_parameters = getIterParams(parameters)
 
+    rows = []
     for i in range(index):
         for par in multishell_parameters:
@@ -291 +294 @@
             item4 = QtGui.QStandardItem(str(par.limits[1]))
             item5 = QtGui.QStandardItem(par.units)
-            model.appendRow([item1, item2, item3, item4, item5])
+            row = [item1, item2, item3, item4, item5]
+            rows.append(row)
+
+            if row_num is None:
+                model.appendRow(row)
+            else:
+                model.insertRow(row_num, row)
+                row_num += 1
+
+    return rows
 
 def calculateChi2(reference_data, current_data):

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

@@ -221 +221 @@
         # Utility variable to enable unselectable option in category combobox
         self._previous_category_index = 0
-        # Utility variable for multishell display
-        self._last_model_row = 0
+        # Utility variables for multishell display
+        self._n_shells_row = 0
+        self._num_shell_params = 0
         # Dictionary of {model name: model class} for the current category
         self.models = {}
@@ -1968 +1969 @@
         else:
             self.fromModelToQModel(model_name)
+            self.addExtraShells()
+
             if structure_factor not in (None, "None"):
                 # add S(Q)
@@ -1974 +1977 @@
                 # enable selection of S(Q)
                 self.enableStructureFactorControl(structure_factor)
+
             # Add polydispersity to the model
             self.setPolyModel()
             # Add magnetic parameters to the model
             self.setMagneticModel()
-
-        # Then, add multishells
-        if model_name is not None:
-            # Multishell models need additional treatment
-            self.addExtraShells()
 
         # Adjust the table cells width
@@ -2056 +2055 @@
         for row in new_rows:
             self._model_model.appendRow(row)
-        # Update the counter used for multishell display
-        self._last_model_row = self._model_model.rowCount()
 
     def fromStructureFactorToQModel(self, structure_factor):
@@ -2124 +2121 @@
             #     row_num = self._model_model.rowCount() - 1
             #     FittingUtilities.markParameterDisabled(self._model_model, row_num)
-
-        # Update the counter used for multishell display
-        self._last_model_row = self._model_model.rowCount()
 
     def haveParamsToFit(self):
@@ -2744 +2738 @@
 
         self.lstParams.setIndexWidget(shell_index, func)
-        self._last_model_row = self._model_model.rowCount()
+        self._n_shells_row = shell_row - 1
 
         # Set the index to the state-kept value
@@ -2755 +2749 @@
         """
         # Find row location of the combobox
-        last_row = self._last_model_row
-        remove_rows = self._model_model.rowCount() - last_row
+        first_row = self._n_shells_row + 1
+        remove_rows = self._num_shell_params
 
         if remove_rows > 1:
-            self._model_model.removeRows(last_row, remove_rows)
-
-        FittingUtilities.addShellsToModel(self.model_parameters, self._model_model, index)
+            self._model_model.removeRows(first_row, remove_rows)
+
+        new_rows = FittingUtilities.addShellsToModel(self.model_parameters, self._model_model, index, first_row)
+        self._num_shell_params = len(new_rows)
+
         self.current_shell_displayed = index