Changeset 4992ff2 in sasview for src/sas/qtgui/Perspectives/Invariant

Timestamp:

Nov 9, 2017 8: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 07:50:09)

git-committer:

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

Message:

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

Location:

src/sas/qtgui/Perspectives/Invariant

Files:

• InvariantDetails.py (modified) (2 diffs, 1 prop)
• InvariantPerspective.py (modified) (6 diffs)

src/sas/qtgui/Perspectives/Invariant/InvariantDetails.py

@@ -1 +1 @@
 import sys
 import os
-from PyQt4 import QtCore
-from PyQt4 import QtGui
+from PyQt5 import QtCore
+from PyQt5 import QtGui
+from PyQt5 import QtWidgets
 
 # local
@@ -8 +9 @@
 from .InvariantUtils import WIDGETS
 
-class DetailsDialog(QtGui.QDialog, Ui_Dialog):
+class DetailsDialog(QtWidgets.QDialog, Ui_Dialog):
     """
     """

src/sas/qtgui/Perspectives/Invariant/InvariantPerspective.py

@@ -2 +2 @@
 import sys
 import os
-from PyQt4 import QtCore
-from PyQt4 import QtGui
-from PyQt4 import QtWebKit
+from PyQt5 import QtCore
+from PyQt5 import QtGui
+from PyQt5 import QtWidgets
+from PyQt5 import QtWebKitWidgets
 
 from twisted.internet import threads
@@ -35 +36 @@
         self._model.appendRow(item)
 
-class InvariantWindow(QtGui.QDialog, Ui_tabbedInvariantUI):
+class InvariantWindow(QtWidgets.QDialog, Ui_tabbedInvariantUI):
     # The controller which is responsible for managing signal slots connections
     # for the gui and providing an interface to the data model.
@@ -61 +62 @@
         self._model_item = QtGui.QStandardItem()
 
-        self._helpView = QtWebKit.QWebView()
+        self._helpView = QtWebKitWidgets.QWebView()
         self.detailsDialog = DetailsDialog(self)
 
@@ -502 +503 @@
     def setupMapper(self):
         # Set up the mapper.
-        self.mapper = QtGui.QDataWidgetMapper(self)
+        self.mapper = QtWidgets.QDataWidgetMapper(self)
         self.mapper.setOrientation(QtCore.Qt.Vertical)
         self.mapper.setModel(self.model)
@@ -543 +544 @@
         self.mapper.addMapping(self.lineEdit_18, WIDGETS.W_INVARIANT_ERR)
 
-        self.mapper.toFirst()
+        # FIXME DOESNT WORK WITH QT5
+        #self.mapper.toFirst()
 
     def setData(self, data_item, is_batch=False):
@@ -644 +646 @@
         """
         return False
-
-if __name__ == "__main__":
-    app = QtGui.QApplication([])
-    import qt4reactor
-    qt4reactor.install()
-    # DO NOT move the following import to the top!
-    # (unless you know what you're doing)
-    from twisted.internet import reactor
-    dlg = InvariantWindow(reactor)
-    dlg.show()
-    reactor.run()