Changeset fbfc488 in sasview for src/sas/qtgui/Perspectives/Fitting

Timestamp:

Nov 9, 2017 8:43:55 AM (6 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:

d6b8a1d

Parents:

7969b9c

git-author:

Piotr Rozyczko <rozyczko@…> (11/03/17 10:58:39)

git-committer:

Piotr Rozyczko <rozyczko@…> (11/09/17 08:43:55)

Message:

More Qt5 related fixes.

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• FittingWidget.py (modified) (7 diffs)
• ViewDelegate.py (modified) (3 diffs)

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

@@ -61 +61 @@
         QtGui.QStandardItemModel.__init__(self,parent)
 
-    def headerData(self, section, orientation, role):
+    def headerData(self, section, orientation, role=QtCore.Qt.DisplayRole):
         """
         Displays tooltip for each column's header
@@ -592 +592 @@
         elif model_column in [self.lstPoly.itemDelegate().poly_min, self.lstPoly.itemDelegate().poly_max]:
             try:
-                value = float(item.text())
+                value = GuiUtils.toDouble(item.text())
             except ValueError:
                 # Can't be converted properly, bring back the old value and exit
@@ -607 +607 @@
         else:
             try:
-                value = float(item.text())
+                value = GuiUtils.toDouble(item.text())
             except ValueError:
                 # Can't be converted properly, bring back the old value and exit
@@ -624 +624 @@
         model_row = item.row()
         name_index = self._magnet_model.index(model_row, 0)
-        parameter_name = str(self._magnet_model.data(name_index).toPyObject())
+        parameter_name = str(self._magnet_model.data(name_index))
 
         if model_column == 0:
@@ -640 +640 @@
         # Extract changed value.
         try:
-            value = float(item.text())
+            value = GuiUtils.toDouble(item.text())
         except ValueError:
             # Unparsable field
             return
 
-        property_index = self._magnet_model.headerData(0, 1, model_column).toInt()[0]-1 # Value, min, max, etc.
+        property_index = self._magnet_model.headerData(1, model_column)-1 # Value, min, max, etc.
 
         # Update the parameter value - note: this supports +/-inf as well
@@ -1304 +1304 @@
         # Extract changed value.
         try:
-            value = float(item.text())
+            value = GuiUtils.toDouble(item.text())
         except ValueError:
             # Unparsable field
             return
-        parameter_name = str(self._model_model.data(name_index)) #.toPyObject()) # sld, background etc.
+
+        parameter_name = str(self._model_model.data(name_index)) # sld, background etc.
 
         # Update the parameter value - note: this supports +/-inf as well
@@ -1687 +1688 @@
         datafile = QtWidgets.QFileDialog.getOpenFileName(
             self, "Choose a weight file", "", "All files (*.*)", None,
-            QtWidgets.QFileDialog.DontUseNativeDialog)
-
-        if datafile is None or str(datafile)=='':
+            QtWidgets.QFileDialog.DontUseNativeDialog)[0]
+
+        if not datafile:
             logging.info("No weight data chosen.")
             raise IOError

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

@@ -4 +4 @@
 
 import sas.qtgui.Utilities.GuiUtils as GuiUtils
+
+class CommaLessValidator(QtGui.QDoubleValidator):
+    """
+    Custom double validator which doesn't allow for commas to be used as decimal point
+    """
+    pass
 
 class ModelViewDelegate(QtWidgets.QStyledItemDelegate):
@@ -44 +50 @@
         if index.column() in self.fancyColumns():
             # Units - present in nice HTML
-            #options = QtWidgets.QStyleOptionViewItemV4(option)
             options = QtWidgets.QStyleOptionViewItem(option)
             self.initStyleOption(options,index)
@@ -236 +241 @@
     def createEditor(self, widget, option, index):
         # Remember the current choice
-        current_text = index.data().toString()
+        current_text = index.data()
         if not index.isValid():
             return 0