Changeset 7f41584 in sasview

Timestamp:

Nov 21, 2018 5:21:11 AM (6 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

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

Children:

ba400d1

Parents:

c30822c

Message:

Fix minor formatting/display issues with parameters. SASVIEW-1191

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• FittingUtilities.py (modified) (2 diffs)
• FittingWidget.py (modified) (2 diffs)
• ViewDelegate.py (modified) (1 diff)

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

@@ -368 +368 @@
             cbox = createFixedChoiceComboBox(par, row)
 
+            # Apply combobox if required
+            if None not in (view, cbox):
+                # set the min/max cell to be empty
+                item3.setText("")
+                item4.setText("")
+
             # Always add to the model
             if row_num is None:
@@ -375 +381 @@
                 row_num += 1
 
-            # Apply combobox if required
-            if None not in (view, cbox):
+            if cbox is not None:
                 view.setIndexWidget(item2.index(), cbox)
 

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

@@ -3083 +3083 @@
         # cell 3: min value
         item3 = QtGui.QStandardItem()
+        # set the cell to be non-editable
+        item3.setFlags(item3.flags() ^ QtCore.Qt.ItemIsEditable)
 
         # cell 4: max value
         item4 = QtGui.QStandardItem()
+        # set the cell to be non-editable
+        item4.setFlags(item4.flags() ^ QtCore.Qt.ItemIsEditable)
 
         # cell 4: SLD button
@@ -3125 +3129 @@
             # no info about limits
             pass
+        except OverflowError:
+            # Try to limit shell_par, if possible
+            if float(shell_par.limits[1])==np.inf:
+                shell_max = 9
+            logging.warning("Limiting shell count to 9.")
         except Exception as ex:
             logging.error("Badly defined multiplicity: "+ str(ex))

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

@@ -95 +95 @@
             # Set some columns uneditable
             return None
+        if index.column() in (self.param_min, self.param_max):
+            # Check if the edit role is set
+            if not (index.flags() & QtCore.Qt.ItemIsEditable):
+                return None
 
         return super(ModelViewDelegate, self).createEditor(widget, option, index)