Merge pull request #408 from vshekar/autoproc-table-widget

Added Autoproc log widget and fixed font

Author: vshekar

gui/control_main.py

@@ -972,13 +972,18 @@ def createSampleTab(self):
             if "pass-" in part:
                 visit_name = f"mx{part.split('-')[1]}-1"
         fast_dp_summary_file = Path(f'{getBlConfig("visitDirectory")}/{visit_name}/fast_dp_dir/fast_dp.summary.csv')
-        summaryTableGB = QtWidgets.QGroupBox()
-        summaryTableGB.setTitle("FastDP Summary")
+        auto_proc_summary_file = Path(f'{getBlConfig("visitDirectory")}/{visit_name}/autoProc_dir/autoPROC.summary.csv')
+        log_widget_tabs = QtWidgets.QTabWidget()
         summaryTableLayout = QtWidgets.QVBoxLayout()
-        self.summaryTableWidget = get_summary_widget(fast_dp_summary_file)
-        summaryTableLayout.addWidget(self.summaryTableWidget)
-        summaryTableGB.setLayout(summaryTableLayout)
-        vBoxMainColLayout.addWidget(summaryTableGB)
+        self.fastdp_summary_table_widget = get_summary_widget(fast_dp_summary_file)
+        self.auto_proc_summary_table_widget = get_summary_widget(auto_proc_summary_file)
+        self.user_log_widget = LogViewerWidget()
+
+        log_widget_tabs.addTab(self.fastdp_summary_table_widget, "Fast DP Summary")
+        log_widget_tabs.addTab(self.auto_proc_summary_table_widget, "AutoPROC Summary")
+        log_widget_tabs.addTab(self.user_log_widget, "User Message Log")
+        
+        vBoxMainColLayout.addWidget(log_widget_tabs)
 
         self.mainColFrame.setLayout(vBoxMainColLayout)
         self.mainToolBox.addItem(self.mainColFrame, "Collection Parameters")

gui/widgets/log_widget.py

@@ -1,6 +1,7 @@
 import sys
 from qtpy.QtWidgets import (
     QTextEdit,
+    QPlainTextEdit,
     QVBoxLayout,
     QWidget,
     QTableWidget,
@@ -9,7 +10,7 @@
     QAbstractScrollArea,
 )
 from qtpy.QtCore import QTimer, Qt
-from qtpy.QtGui import QTextOption
+from qtpy.QtGui import QTextOption, QTextCursor, QFont, QFontDatabase
 import csv
 from pathlib import Path
 
@@ -41,10 +42,14 @@ def __init__(self, log_file, max_height=500, parent=None):
         self.auto_scroll = True  # Auto-scroll is enabled by default
 
     def initUI(self, max_height):
-        self.text_edit = QTextEdit(self)
+        self.text_edit = QPlainTextEdit(self)
         self.text_edit.setReadOnly(True)
         self.text_edit.setWordWrapMode(QTextOption.NoWrap)
 
+        fixed = QFontDatabase.systemFont(QFontDatabase.FixedFont)
+        fixed.setStyleHint(QFont.Monospace)
+        self.text_edit.setFont(fixed)
+
         layout = QVBoxLayout(self)
         layout.addWidget(self.text_edit)
         self.setLayout(layout)
@@ -71,15 +76,17 @@ def update_log(self):
                 f.seek(self.last_position)
                 new_lines = f.readlines()
                 self.last_position = f.tell()
-
+                new_lines = [ln for ln in new_lines if ln.strip()]
                 if new_lines:
-                    # self.text_edit.append("".join(new_lines))
-                    cursor = self.text_edit.textCursor()
-                    cursor.movePosition(cursor.End)  # Move cursor to the end
-                    cursor.insertText("".join(new_lines))  # Insert text directly
-                    if self.auto_scroll:
-                        self.text_edit.moveCursor(QTextEdit().textCursor().End)
-
+                    self.add_lines(new_lines)
+    
+    def add_lines(self, text):
+        cursor = self.text_edit.textCursor()
+        cursor.movePosition(cursor.End)  # Move cursor to the end
+        cursor.insertText("".join(text))  # Insert text directly
+        if self.auto_scroll:
+            self.text_edit.moveCursor(QTextCursor.End)
+        
 
 class CSVTableWidget(QTableWidget):
     def __init__(self, parent=None, file_path=None):