Changeset 4992ff2 in sasview for src/sas/qtgui/MainWindow/MainWindow.py

Timestamp:

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

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

File:

• src/sas/qtgui/MainWindow/MainWindow.py (modified) (5 diffs, 1 prop)

src/sas/qtgui/MainWindow/MainWindow.py

@@ -1 +1 @@
 # UNLESS EXEPTIONALLY REQUIRED TRY TO AVOID IMPORTING ANY MODULES HERE
 # ESPECIALLY ANYTHING IN SAS, SASMODELS NAMESPACE
-from PyQt4 import QtGui
+#from PyQt4 import QtGui
+from PyQt5.QtWidgets import *
+from PyQt5.QtGui import *
 
 # Local UI
@@ -10 +12 @@
 import sas.qtgui.Utilities.SasviewLogger
 
-class MainSasViewWindow(QtGui.QMainWindow, Ui_MainWindow):
+class MainSasViewWindow(QMainWindow, Ui_MainWindow):
     # Main window of the application
     def __init__(self, parent=None):
@@ -17 +19 @@
 
         # define workspace for dialogs.
-        self.workspace = QtGui.QWorkspace(self)
+        self.workspace = QMdiArea(self)
         self.setCentralWidget(self.workspace)
 
         # Create the gui manager
         from .GuiManager import GuiManager
-        self.guiManager = GuiManager(self)
+        try:
+            self.guiManager = GuiManager(self)
+        except Exception as ex:
+            print("EXCEPTION: ", ex)
 
     def closeEvent(self, event):
@@ -37 +42 @@
     """
     # TODO: standardize path to images
-    pixmap = QtGui.QPixmap("src/sas/qtgui/images/SVwelcome_mini.png")
-    splashScreen = QtGui.QSplashScreen(pixmap)
+    pixmap = QPixmap("src/sas/qtgui/images/SVwelcome_mini.png")
+    splashScreen = QSplashScreen(pixmap)
     return splashScreen
 
 def run():
-    app = QtGui.QApplication([])
+    app = QApplication([])
 
     # Main must have reference to the splash screen, so making it explicit
@@ -55 +60 @@
     # DO NOT move the following import to the top!
     # (unless you know what you're doing)
-    import qt4reactor
+    import qt5reactor
     # Using the Qt4 reactor wrapper from https://github.com/ghtdak/qtreactor
-    qt4reactor.install()
+    qt5reactor.install()
 
     # DO NOT move the following import to the top!