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

Timestamp:

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

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/Utilities

Files:

• GuiUtils.py (modified) (9 diffs)
• IPythonWidget.py (modified) (2 diffs)

src/sas/qtgui/Utilities/GuiUtils.py

@@ -249 +249 @@
         plot_item = item.child(index)
         if plot_item.isCheckable():
-            plot_data = plot_item.child(0).data() #.toPyObject()
+            plot_data = plot_item.child(0).data()
             if plot_data.id is not None and plot_data.id == py_update_data.id:
                 # replace data section in item
@@ -270 +270 @@
     Adds 'update_data' to that row.
     """
-    #assert isinstance(update_data, QtCore.QVariant)
-    #py_update_data = update_data.toPyObject()
     py_update_data = update_data
 
@@ -339 +337 @@
         if str(item.text()) == filename:
             # TODO: assure item type is correct (either data1/2D or Plotter)
-            plot_data.append(item.child(0).data()) #.toPyObject())
+            plot_data.append(item.child(0).data())
             # Going 1 level deeper only
             for index_2 in range(item.rowCount()):
@@ -345 +343 @@
                 if item_2 and item_2.isCheckable():
                     # TODO: assure item type is correct (either data1/2D or Plotter)
-                    plot_data.append(item_2.child(0).data()) #.toPyObject())
+                    plot_data.append(item_2.child(0).data())
 
     return plot_data
@@ -361 +359 @@
         if item.isCheckable() and item.checkState() == QtCore.Qt.Checked:
             # TODO: assure item type is correct (either data1/2D or Plotter)
-            plot_data.append((item, item.child(0).data())) #.toPyObject()))
+            plot_data.append((item, item.child(0).data()))
         # Going 1 level deeper only
         for index_2 in range(item.rowCount()):
@@ -367 +365 @@
             if item_2 and item_2.isCheckable() and item_2.checkState() == QtCore.Qt.Checked:
                 # TODO: assure item type is correct (either data1/2D or Plotter)
-                plot_data.append((item_2, item_2.child(0).data())) #.toPyObject()))
+                plot_data.append((item_2, item_2.child(0).data()))
 
     return plot_data
@@ -635 +633 @@
   
     def validate(self, input, pos):
-        try:
-            Formula(str(input))
-            self._setStyleSheet("")
-            return QtGui.QValidator.Acceptable, pos
-
-        except Exception as e:
-            self._setStyleSheet("background-color:pink;")
-            return QtGui.QValidator.Intermediate, pos
+
+        self._setStyleSheet("")
+        return QtGui.QValidator.Acceptable, pos
+
+        #try:
+        #    Formula(str(input))
+        #    self._setStyleSheet("")
+        #    return QtGui.QValidator.Acceptable, pos
+
+        #except Exception as e:
+        #    self._setStyleSheet("background-color:pink;")
+        #    return QtGui.QValidator.Intermediate, pos
 
     def _setStyleSheet(self, value):
@@ -756 +758 @@
     The assumption - data stored in SasView standard, in child 0
     """
-    return item.child(0).data() #.toPyObject()
+    return item.child(0).data()
 
 def formatNumber(value, high=False):
@@ -806 +808 @@
     else:
         return name
+
+def toDouble(value_string):
+    """
+    toFloat conversion which cares deeply about user's locale
+    """
+    # Holy shit this escalated quickly in Qt5.
+    # No more float() cast on general locales.
+    value = QtCore.QLocale().toFloat(value_string)
+    if value[1]:
+        return value[0]
+
+    # Try generic locale
+    value = QtCore.QLocale(QtCore.QLocale('en_US')).toFloat(value_string)
+    if value[1]:
+        return value[0]
+    else:
+        raise ValueError

src/sas/qtgui/Utilities/IPythonWidget.py

@@ -3 +3 @@
 from PyQt5 import QtWidgets
 
-##from PyQt4 import QtSvg
+from PyQt5 import QtSvg
 
 def new_load_qt(api_options):
@@ -18 +18 @@
 # Do some monkey patching to satisfy pyinstaller complaining
 # about pyside/pyqt confusion
-qt_loaders.load_qt = new_load_qt
-qtconsole_qt_loaders.load_qt = qtconsole_new_load_qt
+#qt_loaders.load_qt = new_load_qt
+#qtconsole_qt_loaders.load_qt = qtconsole_new_load_qt
 
 from qtconsole.rich_jupyter_widget import RichJupyterWidget