Changeset 8353d90 in sasview

Timestamp:

Dec 13, 2017 6:14:23 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:

e90988c

Parents:

9387fe3

Message:

Assure the main window opens maximized and the welcome widget doesnt mess up the layout. SASVIEW-831

Location:

src/sas/qtgui/MainWindow

Files:

• GuiManager.py (modified) (4 diffs)
• MainWindow.py (modified) (2 diffs)
• UnitTesting/GuiManagerTest.py (modified) (1 diff, 1 prop)
• UnitTesting/MainWindowTest.py (modified) (2 diffs)

src/sas/qtgui/MainWindow/GuiManager.py

@@ -86 +86 @@
         # Set up the status bar
         self.statusBarSetup()
-        # Show the Welcome panel
-        self.welcomePanel = WelcomePanel()
-        self._workspace.workspace.addSubWindow(self.welcomePanel)
 
         # Current help file
@@ -99 +96 @@
                                               "_downloads",
                                               "Tutorial.pdf"))
+
     def addWidgets(self):
         """
@@ -131 +129 @@
         self.ackWidget = Acknowledgements()
         self.aboutWidget = AboutBox()
+        self.welcomePanel = WelcomePanel()
 
         # Add calculators - floating for usability
@@ -334 +333 @@
             msg += " Please try again later."
             self.communicate.statusBarUpdateSignal.emit(msg)
+
+    def showWelcomeMessage(self):
+        """ Show the Welcome panel """
+        self._workspace.workspace.addSubWindow(self.welcomePanel)
+        self.welcomePanel.show()
 
     def addCallbacks(self):

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 PyQt5.QtWidgets import *
-from PyQt5.QtGui import *
+from PyQt5.QtWidgets import QMainWindow
+from PyQt5.QtWidgets import QMdiArea
+from PyQt5.QtWidgets import QSplashScreen
+from PyQt5.QtWidgets import QApplication
+from PyQt5.QtGui import QPixmap
 
 # Local UI
@@ -71 +73 @@
     # Show the main SV window
     mainwindow = MainSasViewWindow()
-    mainwindow.show()
+    mainwindow.showMaximized()
 
     # no more splash screen
     splash.finish(mainwindow)
+
+    # Time for the welcome window
+    mainwindow.guiManager.showWelcomeMessage()
 
     # No need to .exec_ - the reactor takes care of it.

src/sas/qtgui/MainWindow/UnitTesting/GuiManagerTest.py

@@ -19 +19 @@
 from sas.qtgui.MainWindow.AboutBox import AboutBox
 from sas.qtgui.MainWindow.WelcomePanel import WelcomePanel
-#from sas.qtgui.Utilities.IPythonWidget import IPythonWidget
+from sas.qtgui.Utilities.IPythonWidget import IPythonWidget
 
 from sas.qtgui.MainWindow.GuiManager import Acknowledgements, GuiManager

src/sas/qtgui/MainWindow/UnitTesting/MainWindowTest.py

@@ -15 +15 @@
 from sas.qtgui.MainWindow.MainWindow import SplashScreen
 from sas.qtgui.MainWindow.GuiManager import GuiManager
+from sas.qtgui.Perspectives.Fitting import FittingPerspective
 
 if not QtWidgets.QApplication.instance():
@@ -40 +41 @@
         self.assertIsInstance(splash, QtWidgets.QSplashScreen)
 
+    def testWidgets(self):
+        """ Test enablement/disablement of widgets """
+        # Open the main window
+        tmp_main = MainSasViewWindow(None)
+        tmp_main.showMaximized()
+        # See that only one subwindow is up
+        self.assertEqual(len(tmp_main.workspace.subWindowList()), 1)
+        # and that the subwindow is the fitting perspective
+        self.assertIsInstance(tmp_main.workspace.subWindowList()[0].widget(),
+                              FittingPerspective.FittingWindow)
+        # Show the message widget
+        tmp_main.guiManager.showWelcomeMessage()
+        # Assure it is visible and a part of the MdiArea
+        self.assertTrue(tmp_main.guiManager.welcomePanel.isVisible())
+        self.assertEqual(len(tmp_main.workspace.subWindowList()), 2)
+
+        tmp_main.close()
+
     def testExit(self):
         """