Changeset 88ada06 in sasview

Timestamp:

Sep 7, 2018 4:57:51 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:

a758043

Parents:

04ce9ac

Message:

support fixed-choice shell parameters (e.g. spherical_sld.shape[n])

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• FittingUtilities.py (modified) (3 diffs)
• FittingWidget.py (modified) (1 diff)

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

@@ -271 +271 @@
     model.header_tooltips = copy.copy(poly_header_error_tooltips)
 
-def addShellsToModel(parameters, model, index):
+def addShellsToModel(parameters, model, view, index):
     """
     Find out multishell parameters and update the model with the requested number of them
@@ -294 +294 @@
                     item1_3 = QtGui.QStandardItem(str(p.limits[0]))
                     item1_4 = QtGui.QStandardItem(str(p.limits[1]))
-                    item1_5 = QtGui.QStandardItem(p.units)
+                    item1_5 = QtGui.QStandardItem(str(p.units))
                     poly_item.appendRow([item1_1, item1_2, item1_3, item1_4, item1_5])
                     break
@@ -302 +302 @@
             item3 = QtGui.QStandardItem(str(par.limits[0]))
             item4 = QtGui.QStandardItem(str(par.limits[1]))
-            item5 = QtGui.QStandardItem(par.units)
-            model.appendRow([item1, item2, item3, item4, item5])
+            item5 = QtGui.QStandardItem(str(par.units))
+            item5.setEditable(False)
+
+            # Check if fixed-choice (returns combobox, if so, also makes some items uneditable)
+            row = [item1, item2, item3, item4, item5]
+            cbox = createFixedChoiceComboBox(par, row)
+
+            # Append to the model and use the combobox, if required
+            model.appendRow(row)
+            if cbox is not None:
+                view.setIndexWidget(item2.index(), cbox)
 
 def calculateChi2(reference_data, current_data):

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

@@ -2709 +2709 @@
             self._model_model.removeRows(last_row, remove_rows)
 
-        FittingUtilities.addShellsToModel(self.model_parameters, self._model_model, index)
+        FittingUtilities.addShellsToModel(
+                self.model_parameters,
+                self._model_model,
+                self.lstParams,
+                index)
+
         self.current_shell_displayed = index