Changeset d6b8a1d in sasview for src/sas/qtgui/Utilities

Timestamp:

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

53c771e

Parents:

fbfc488

git-author:

Piotr Rozyczko <rozyczko@…> (11/07/17 08:29:59)

git-committer:

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

Message:

More Qt5 related fixes

File:

• src/sas/qtgui/Utilities/GuiUtils.py (modified) (3 diffs)

src/sas/qtgui/Utilities/GuiUtils.py

@@ -584 +584 @@
     }
     # Query user for filename.
-    filename = QtWidgets.QFileDialog.getSaveFileName(**kwargs)
+    filename_tuple = QtWidgets.QFileDialog.getSaveFileName(**kwargs)
+    filename = filename_tuple[0]
 
     # User cancelled.
     if not filename:
         return
-
-    filename = str(filename)
 
     #Instantiate a loader
@@ -616 +615 @@
     }
     # Query user for filename.
-    filename = QtWidgets.QFileDialog.getSaveFileName(**kwargs)
+    filename_tuple = QtWidgets.QFileDialog.getSaveFileName(**kwargs)
+    filename = filename_tuple[0]
 
     # User cancelled.
     if not filename:
         return
-    filename = str(filename)
+
     #Instantiate a loader
     loader = Loader()
@@ -825 +825 @@
     else:
         raise ValueError
+
+class DoubleValidator(QtGui.QDoubleValidator):
+    """
+    Allow only dots as decimal separator
+    """
+    def validate(self, input, pos):
+        """
+        Return invalid for commas
+        """
+        if (',' in input):
+            return (QtGui.QValidator.Invalid, input, pos)
+        return super(DoubleValidator, self).validate(input, pos)
+
+    def fixup(self, input):
+        """
+        Correct (remove) potential preexisting content
+        """
+        QtGui.QDoubleValidator.fixup(input)
+        input = input.replace(",", "")
+