Changeset 0cd8612 in sasview for src/sas/qtgui/GuiManager.py

Timestamp:

Jul 8, 2016 10: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

File:

• src/sas/qtgui/GuiManager.py (modified) (7 diffs)

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