Changeset a9b568c in sasview

Timestamp:

Mar 24, 2017 10:06:37 AM (8 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:

6fd4e36

Parents:

a0f5c36

Message:

Sprint demo issues addressed.

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

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

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

@@ -21 +21 @@
     """
     iter_params = getIterParams(model)
-    # return the iterator parameter name and length
-    return (iter_params[0].length_control if iter_params else "",
-            iter_params[0].length if iter_params else 0)
+    param_name = ""
+    param_length = 0
+    if iter_params:
+        param_length = iter_params[0].length
+        param_name = iter_params[0].length_control
+        if param_name is None and '[' in iter_params[0].name:
+            param_name = iter_params[0].name[:iter_params[0].name.index('[')]
+    return (param_name, param_length)
 
 def addParametersToModel(parameters, model):

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

@@ -66 +66 @@
         self.tab_id = id
 
+        # Which shell is being currently displayed?
+        self.current_shell_displayed = 0
+
         # Range parameters
         self.q_range_min = QMIN_DEFAULT
@@ -420 +423 @@
         self.setMagneticModel()
 
+        # Adjust the table cells width
+        self.lstParams.resizeColumnToContents(0)
+        self.lstParams.setSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Expanding)
+
         # Now we claim the model has been loaded
         self.model_is_loaded = True
@@ -719 +726 @@
         # Available range of shells displayed in the combobox
         func.addItems([str(i) for i in xrange(param_length+1)])
+
         # Respond to index change
         func.currentIndexChanged.connect(self.modifyShellsInList)
@@ -733 +741 @@
         self._last_model_row = self._model_model.rowCount()
 
+        # Set the index to the state-kept value
+        func.setCurrentIndex(self.current_shell_displayed
+                             if self.current_shell_displayed < func.count() else 0)
+
     def modifyShellsInList(self, index):
         """
@@ -745 +757 @@
 
         FittingUtilities.addShellsToModel(self.model_parameters, self._model_model, index)
+        self.current_shell_displayed = index
 
     def togglePoly(self, isChecked):