Changeset e4335ae in sasview for src/sas/qtgui/MainWindow

Timestamp:

Jul 19, 2018 6:12:03 AM (6 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

c0de493

Parents:

02e7d3a

git-author:

Torin Cooper-Bennun <40573959+tcbennun@…> (07/19/18 06:12:03)

git-committer:

Piotr Rozyczko <piotr.rozyczko@…> (07/19/18 06:12:03)

Message:

SASVIEW-957 logging changes (#158)

• rework XStream to continue to write to stdout/stderr alongside redirection; make logging level setting consistent; make log configuration more consistent

• rm XStream; QT signal in QtHandler? logging handler; only logs in Log Explorer (no stdout/stderr)

• no need to change handler level

• use QTextBrowser.append to facilitate auto-scrolling in the Log Explorer

• modify logger unit test to reflect changes (passes)

Location:

src/sas/qtgui/MainWindow

Files:

• GuiManager.py (modified) (3 diffs)
• MainWindow.py (modified) (1 diff)

src/sas/qtgui/MainWindow/GuiManager.py

@@ -13 +13 @@
 # General SAS imports
 from sas.qtgui.Utilities.ConnectionProxy import ConnectionProxy
-from sas.qtgui.Utilities.SasviewLogger import XStream
+from sas.qtgui.Utilities.SasviewLogger import setup_qt_logging
 
 import sas.qtgui.Utilities.LocalConfig as LocalConfig
@@ -86 +86 @@
 
         # Fork off logging messages to the Log Window
-        XStream.stdout().messageWritten.connect(self.listWidget.insertPlainText)
-        XStream.stderr().messageWritten.connect(self.listWidget.insertPlainText)
+        handler = setup_qt_logging()
+        handler.messageWritten.connect(self.appendLog)
 
         # Log the start of the session
@@ -269 +269 @@
         """
         self.statusLabel.setText(text)
+
+    def appendLog(self, msg):
+        """Appends a message to the list widget in the Log Explorer. Use this
+        instead of listWidget.insertPlainText() to facilitate auto-scrolling"""
+        self.listWidget.append(msg.strip())
 
     def createGuiData(self, item, p_file=None):

src/sas/qtgui/MainWindow/MainWindow.py

@@ -10 +10 @@
 from sas.qtgui.UI import main_resources_rc
 from .UI.MainWindowUI import Ui_MainWindow
-
-# Initialize logging
-import sas.qtgui.Utilities.SasviewLogger
 
 class MainSasViewWindow(QMainWindow, Ui_MainWindow):