Changeset 0cd8612 in sasview

Timestamp:

Jul 8, 2016 8:13:41 AM (8 years ago)

Author:

Piotr Rozyczko <piotr.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:

a95260d

Parents:

e540cd2

Message:

output console + logging

Location:

src/sas/qtgui

Files:

• DataExplorer.py (modified) (11 diffs)
• GuiManager.py (modified) (7 diffs)
• MainWindow.py (modified) (2 diffs)
• Perspectives/Invariant/InvariantPerspective.py (modified) (3 diffs)
• SasviewLogger.py (added)
• UI/MainWindowUI.py (modified) (1 diff)
• UI/MainWindowUI.ui (modified) (1 diff)
• UnitTesting/DataExplorerTest.py (modified) (1 diff)
• UnitTesting/GuiManagerTest.py (modified) (1 diff)
• UnitTesting/SasviewLoggerTest.py (added)
• run_tests.sh (modified) (1 diff)

src/sas/qtgui/DataExplorer.py

@@ -13 +13 @@
 
 # SAS
-from GuiUtils import *
+import GuiUtils
 from Plotter import Plotter
 from sas.sascalc.dataloader.loader import Loader
@@ -307 +307 @@
         """
 
-        plots = plotsFromCheckedItems(self.model)
+        plots = GuiUtils.plotsFromCheckedItems(self.model)
 
         # Call show on requested plots
@@ -334 +334 @@
             paths = [str(f) for f in paths]
 
-        if type(paths) is not list:
+        if not isinstance(paths, list):
             paths = [paths]
 
@@ -358 +358 @@
             basename = os.path.basename(p_file)
             _, extension = os.path.splitext(basename)
-            if extension.lower() in EXTENSIONS:
+            if extension.lower() in GuiUtils.EXTENSIONS:
                 any_error = True
                 log_msg = "Data Loader cannot "
@@ -430 +430 @@
 
         if any_error or error_message:
-            self.communicator.statusBarUpdateSignal.emit(error_message)
+            logging.error(error_message)
+            status_bar_message = "Errors occurred while loading %s" % format(basename)
+            self.communicator.statusBarUpdateSignal.emit(status_bar_message)
 
         else:
             message = "Loading Data Complete! "
         message += log_msg
+        # Notify the progress bar that the updates are over.
         self.communicator.progressBarUpdateSignal.emit(-1)
 
@@ -485 +488 @@
 
                 try:
-                    is1D = type(item.child(0).data().toPyObject()) is Data1D
+                    is1D = isinstance(item.child(0).data().toPyObject(), Data1D)
                 except AttributeError:
                     msg = "Bad structure of the data model."
@@ -499 +502 @@
 
                 try:
-                    is1D = type(item.child(0).data().toPyObject()) is Data1D
+                    is1D = isinstance(item.child(0).data().toPyObject(), Data1D)
                 except AttributeError:
                     msg = "Bad structure of the data model."
@@ -513 +516 @@
                 item.setCheckState(QtCore.Qt.Unchecked)
                 try:
-                    is2D = type(item.child(0).data().toPyObject()) is Data2D
+                    is2D = isinstance(item.child(0).data().toPyObject(), Data2D)
                 except AttributeError:
                     msg = "Bad structure of the data model."
@@ -527 +530 @@
 
                 try:
-                    is2D = type(item.child(0).data().toPyObject()) is Data2D
+                    is2D = isinstance(item.child(0).data().toPyObject(), Data2D)
                 except AttributeError:
                     msg = "Bad structure of the data model."
@@ -602 +605 @@
 
         # Add rows for display in the view
-        info_item = infoFromData(data)
+        info_item = GuiUtils.infoFromData(data)
 
         # Set info_item as the only child
@@ -616 +619 @@
         """
         # Assert the correct type
-        if type(model_item) != QtGui.QStandardItem:
+        if not isinstance(model_item, QtGui.QStandardItem):
             msg = "Wrong data type returned from calculations."
             raise AttributeError, msg

src/sas/qtgui/GuiManager.py

@@ -1 +1 @@
 import sys
+import os
 import subprocess
 import logging
@@ -15 +16 @@
 from sas.sasgui.guiframe.proxy import Connection
 
+from SasviewLogger import XStream
+
 import LocalConfig
-from GuiUtils import *
+import GuiUtils
 from UI.AcknowledgementsUI import Acknowledgements
 from AboutBox import AboutBox
@@ -34 +37 @@
         """
         """
-
         self._workspace = mainWindow
         self._parent = parent
@@ -58 +60 @@
         # Widgets
         #
-        # Add FileDialog widget as docked
-        self.filesWidget = DataExplorerWindow(parent, self)
-
-        self.dockedFilesWidget = QtGui.QDockWidget("Data explorer", self._workspace)
-        self.dockedFilesWidget.setWidget(self.filesWidget)
-        self.dockedFilesWidget.setFeatures(QtGui.QDockWidget.NoDockWidgetFeatures)
-        self._workspace.addDockWidget(QtCore.Qt.DockWidgetArea(1), self.dockedFilesWidget)
-
-        self.ackWidget = Acknowledgements()
-        self.aboutWidget = AboutBox()
+        self.addWidgets()
+
+        # Fork off logging messages to the Log Window
+        XStream.stdout().messageWritten.connect( self.listWidget.insertPlainText  )
+        XStream.stderr().messageWritten.connect( self.listWidget.insertPlainText  )
+
+        # Log the start of the session
+        logging.info(" --- SasView session started ---")
+        # Log the python version
+        logging.info("Python: %s" % sys.version)
 
         # Set up the status bar
@@ -94 +96 @@
         # Default perspective
         self._current_perspective = self.invariantWidget
+
+    def addWidgets(self):
+        """
+        Populate the main window with widgets
+
+        TODO: overwrite close() on Log and DR widgets so they can be hidden/shown
+        on request
+        """
+        # Add FileDialog widget as docked
+        self.filesWidget = DataExplorerWindow(self._parent, self)
+
+        self.dockedFilesWidget = QtGui.QDockWidget("Data Explorer", self._workspace)
+        self.dockedFilesWidget.setWidget(self.filesWidget)
+        # Disable maximize/minimize and close buttons
+        self.dockedFilesWidget.setFeatures(QtGui.QDockWidget.NoDockWidgetFeatures)
+        self._workspace.addDockWidget(QtCore.Qt.LeftDockWidgetArea,
+                                      self.dockedFilesWidget)
+
+        # Add the console window as another docked widget
+        self.logDockWidget = QtGui.QDockWidget("Log Explorer", self._workspace)
+        self.logDockWidget.setObjectName("LogDockWidget")
+        self.listWidget = QtGui.QTextBrowser()
+        self.logDockWidget.setWidget(self.listWidget)
+        self._workspace.addDockWidget(QtCore.Qt.BottomDockWidgetArea,
+                                      self.logDockWidget)
+
+        # Add other, minor widgets
+        self.ackWidget = Acknowledgements()
+        self.aboutWidget = AboutBox()
 
     def statusBarSetup(self):
@@ -266 +297 @@
         Method defining all signal connections for the gui manager
         """
-        self.communicate = Communicate()
+        self.communicate = GuiUtils.Communicate()
         self.communicate.fileDataReceivedSignal.connect(self.fileRead)
         self.communicate.statusBarUpdateSignal.connect(self.updateStatusBar)
@@ -411 +442 @@
         """
         """
-        print("actionReset TRIGGERED")
+        logging.warning(" *** actionOpen_Analysis logging *******")
+        print("actionReset print TRIGGERED")
+        sys.stderr.write("STDERR - TRIGGERED")
         pass
 

src/sas/qtgui/MainWindow.py

@@ -8 +8 @@
 # Local UI
 from UI.MainWindowUI import MainWindow
+
+# Initialize logging
+import SasviewLogger
 
 class MainSasViewWindow(MainWindow):
@@ -54 +57 @@
     # Show the main SV window
     mainwindow = MainSasViewWindow(reactor)
-    mainwindow.show()
+    #mainwindow.show()
+    mainwindow.showMaximized()
 
     # no more splash screen

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

@@ -12 +12 @@
 from sas.sascalc.invariant import invariant
 from sas.sasgui.guiframe.dataFitting import Data1D
-# from sas.qtgui.GuiUtils import *
-from GuiUtils import *
+import GuiUtils
 
 # local
@@ -67 +66 @@
         self._high_power_value  = False
 
-        self.communicate = Communicate()
+        self.communicate = GuiUtils.Communicate()
 
         # Mask file selector
@@ -278 +277 @@
 
             # This needs to run in the main thread
-            reactor.callFromThread(updateModelItem, self._model_item, variant_item, title)
+            reactor.callFromThread(GuiUtils.updateModelItem, self._model_item, variant_item, title)
 
         if self._high_extrapolate:

src/sas/qtgui/UI/MainWindowUI.py

@@ -56 +56 @@
         MainWindow.setMenuBar(self.menubar)
         self.statusbar = QtGui.QStatusBar(MainWindow)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.statusbar.sizePolicy().hasHeightForWidth())
+        self.statusbar.setSizePolicy(sizePolicy)
         self.statusbar.setObjectName(_fromUtf8("statusbar"))
         MainWindow.setStatusBar(self.statusbar)

src/sas/qtgui/UI/MainWindowUI.ui

@@ -149 +149 @@
    <addaction name="menuHelp"/>
   </widget>
-  <widget class="QStatusBar" name="statusbar"/>
+  <widget class="QStatusBar" name="statusbar">
+   <property name="sizePolicy">
+    <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+  </widget>
   <widget class="QToolBar" name="toolBar">
    <property name="windowTitle">

src/sas/qtgui/UnitTesting/DataExplorerTest.py

@@ -95 +95 @@
         """
         Test if all required widgets got added
-        """        
+        """
     def testLoadButton(self):
         loadButton = self.form.cmdLoad

src/sas/qtgui/UnitTesting/GuiManagerTest.py

@@ -48 +48 @@
         self.assertIsInstance(self.manager.filesWidget, DataExplorerWindow)
         self.assertIsInstance(self.manager.dockedFilesWidget, QDockWidget)
+        self.assertIsInstance(self.manager.dockedFilesWidget.widget(), DataExplorerWindow)
         self.assertEqual(self.manager.dockedFilesWidget.features(), QDockWidget.NoDockWidgetFeatures)
         self.assertEqual(self.manager._workspace.dockWidgetArea(self.manager.dockedFilesWidget), Qt.LeftDockWidgetArea)
+
+        self.assertIsInstance(self.manager.logDockWidget, QDockWidget)
+        self.assertIsInstance(self.manager.logDockWidget.widget(), QTextBrowser)
+        self.assertEqual(self.manager._workspace.dockWidgetArea(self.manager.logDockWidget), Qt.BottomDockWidgetArea)
+
         self.assertIsInstance(self.manager.ackWidget, Acknowledgements)
         self.assertIsInstance(self.manager.aboutWidget, AboutBox)
         self.assertIsInstance(self.manager.welcomePanel, WelcomePanel)
+
+    def testLogging(self):
+        """
+        Test logging of stdout, stderr and log messages
+        """
+        # See if the log window is empty
+        self.assertEqual(self.manager.logDockWidget.widget().toPlainText(), "")
+
+        # Now, send some message to stdout.
+        # We are in the MainWindow scope, so simple 'print' will work
+        message = "from stdout"
+        print message
+        self.assertIn(message, self.manager.logDockWidget.widget().toPlainText())
+
+        # Send some message to stderr
+        message = "from stderr"
+        sys.stderr.write(message)
+        self.assertIn(message, self.manager.logDockWidget.widget().toPlainText())
+
+        # And finally, send a log message
+        import logging
+        message = "from logging"
+        message_logged = "ERROR: " + message
+        logging.error(message)
+        self.assertIn(message_logged, self.manager.logDockWidget.widget().toPlainText())
 
     def testUpdatePerspective(self):

src/sas/qtgui/run_tests.sh

@@ -7 +7 @@
 python -m UnitTesting.AboutBoxTest
 python -m UnitTesting.DroppableDataLoadWidgetTest
+python -m UnitTesting.SasviewLoggerTest