Changeset 4992ff2 in sasview for src/sas/qtgui/Utilities

Timestamp:

Nov 9, 2017 6:43:07 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:

7969b9c

Parents:

7fb471d

git-author:

Piotr Rozyczko <rozyczko@…> (10/30/17 05:50:09)

git-committer:

Piotr Rozyczko <rozyczko@…> (11/09/17 06:43:07)

Message:

Initial, in-progress version. Not really working atm. SASVIEW-787

Location:

src/sas/qtgui/Utilities

Files:

• GuiUtils.py (modified) (4 diffs)
• IPythonWidget.py (modified) (1 diff)
• SasviewLogger.py (modified) (1 diff, 1 prop)

src/sas/qtgui/Utilities/GuiUtils.py

@@ -14 +14 @@
 import logging
 
-from PyQt4 import QtCore
-from PyQt4 import QtGui
+from PyQt5 import QtCore
+from PyQt5 import QtGui
+from PyQt5 import QtWidgets
 
 from periodictable import formula as Formula
@@ -309 +310 @@
     object_item = QtGui.QStandardItem()
     object_item.setText(name)
-    #object_item.setData(QtCore.QVariant(update_data))
     object_item.setData(update_data)
 
@@ -586 +586 @@
     }
     # Query user for filename.
-    filename = QtGui.QFileDialog.getSaveFileName(**kwargs)
+    filename = QtWidgets.QFileDialog.getSaveFileName(**kwargs)
 
     # User cancelled.
@@ -618 +618 @@
     }
     # Query user for filename.
-    filename = QtGui.QFileDialog.getSaveFileName(**kwargs)
+    filename = QtWidgets.QFileDialog.getSaveFileName(**kwargs)
 
     # User cancelled.

src/sas/qtgui/Utilities/IPythonWidget.py

@@ -1 @@
-from PyQt4 import QtCore, QtGui, QtSvg
+from PyQt5 import QtCore
+from PyQt5 import QtGui
+from PyQt5 import QtWidgets
+
+##from PyQt4 import QtSvg
 
 def new_load_qt(api_options):

src/sas/qtgui/Utilities/SasviewLogger.py

@@ -3 +3 @@
 import logging
 
-from PyQt4 import QtCore
+from PyQt5.QtCore import *
 
 
-class XStream(QtCore.QObject):
+class XStream(QObject):
     _stdout = None
     _stderr = None
-    messageWritten = QtCore.pyqtSignal(str)
+    messageWritten = pyqtSignal(str)
 
     def flush(self):