Changeset 13dd7d2 in sasview for src/sas

Timestamp:

Sep 9, 2018 6:46:30 AM (6 years ago)

Author:

piotr

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:

f3cc979

Parents:

daf7c9c

git-author:

rozyczko <piotr.rozyczko@…> (09/09/18 06:44:20)

git-committer:

rozyczko <piotr.rozyczko@…> (09/09/18 06:46:30)

Message:

Improved multishell control. Added min/max to row display, used
parameter values for min/max. SASVIEW-1057

File:

• src/sas/qtgui/Perspectives/Fitting/FittingWidget.py (modified) (3 diffs)

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

@@ -2796 +2796 @@
 
         func = QtWidgets.QComboBox()
-        # Available range of shells displayed in the combobox
-        func.addItems([str(i) for i in range(param_length+1)])
-
-        # Respond to index change
-        func.currentIndexChanged.connect(self.modifyShellsInList)
 
         # cell 2: combobox
         item2 = QtGui.QStandardItem()
-        self._model_model.appendRow([item1, item2])
+
+        # cell 3: min value
+        item3 = QtGui.QStandardItem()
+
+        # cell 4: max value
+        item4 = QtGui.QStandardItem()
+
+        self._model_model.appendRow([item1, item2, item3, item4])
 
         # Beautify the row:  span columns 2-4
@@ -2823 +2825 @@
             logger.error("Could not find %s in kernel parameters.", param_name)
         default_shell_count = shell_par.default
+        shell_min = 0
+        shell_max = 0
+        try:
+            shell_min = int(shell_par.limits[0])
+            shell_max = int(shell_par.limits[1])
+        except IndexError as ex:
+            # no info about limits
+            pass
+        item3.setText(str(shell_min))
+        item4.setText(str(shell_max))
+
+        # Respond to index change
+        func.currentTextChanged.connect(self.modifyShellsInList)
+
+        # Available range of shells displayed in the combobox
+        func.addItems([str(i) for i in range(shell_min, shell_max+1)])
 
         # Add default number of shells to the model
-        func.setCurrentIndex(default_shell_count)
-
-    def modifyShellsInList(self, index):
+        func.setCurrentText(str(default_shell_count))
+
+    def modifyShellsInList(self, text):
         """
         Add/remove additional multishell parameters
@@ -2834 +2852 @@
         first_row = self._n_shells_row + 1
         remove_rows = self._num_shell_params
+        try:
+            index = int(text)
+        except ValueError:
+            # bad text on the control!
+            index = 0
+            logger.error("Multiplicity incorrect! Setting to 0")
 
         if remove_rows > 1: