From 8dc85126641eaa12b24ac9dd49318bfd642ca2cd Mon Sep 17 00:00:00 2001
From: Chi Cheng <chicheng85@gmail.com>
Date: Thu, 2 Jan 2025 13:18:53 +0000
Subject: [PATCH] fixed runtime error on gui close when jobs are terminated

---
 .../Src/MDANSE_GUI/Tabs/Models/JobHolder.py   | 42 +++++++++++--------
 .../Src/MDANSE_GUI/Tabs/Views/RunTable.py     |  2 +-
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/MDANSE_GUI/Src/MDANSE_GUI/Tabs/Models/JobHolder.py b/MDANSE_GUI/Src/MDANSE_GUI/Tabs/Models/JobHolder.py
index 8cc46ee301..f001a5cfe6 100644
--- a/MDANSE_GUI/Src/MDANSE_GUI/Tabs/Models/JobHolder.py
+++ b/MDANSE_GUI/Src/MDANSE_GUI/Tabs/Models/JobHolder.py
@@ -89,7 +89,25 @@ def run(self):
                 self._job_comm.status_update(status_update)
 
 
-class JobEntry(Handler, QObject):
+class JobLogHandler(Handler):
+
+    def __init__(self):
+        super().__init__()
+        self.records = []
+
+    def msgs_and_levels(self):
+        msgs = []
+        levels = []
+        for record in self.records:
+            msgs.append(self.format(record))
+            levels.append(record.levelname)
+        return msgs, levels
+
+    def emit(self, record):
+        self.records.append(record)
+
+
+class JobEntry(QObject):
     """This coordinates all the objects that make up one line on the list
     of current jobs. It is used for reporting the task progress to the GUI."""
 
@@ -104,8 +122,7 @@ def __init__(
         pause_event=None,
         load_afterwards=False,
     ):
-        super().__init__()
-        QObject.__init__(self)
+        super().__init__(*args)
         self._command = command
         self._finished = False
         self._parameters = {}
@@ -132,7 +149,7 @@ def __init__(
         self._prog_item.setData("progress", role=Qt.ItemDataRole.DisplayRole)
         self._prog_item.setData(0, role=ProgressDelegate.progress_role)
         self._prog_item.setData(100, role=ProgressDelegate.progress_role + 1)
-        self.records = []
+        self.handler = JobLogHandler()
 
     def text_summary(self) -> str:
         result = ""
@@ -232,17 +249,6 @@ def kill_job(self):
         self._current_state.kill()
         self.update_fields()
 
-    def msgs_and_levels(self):
-        msgs = []
-        levels = []
-        for record in self.records:
-            msgs.append(self.format(record))
-            levels.append(record.levelname)
-        return msgs, levels
-
-    def emit(self, record):
-        self.records.append(record)
-
 
 class JobHolder(QStandardItemModel):
     """All the job INSTANCES that are started by the GUI
@@ -288,8 +294,8 @@ def startProcess(self, job_vars: list, load_afterwards=False):
             pause_event=pause_event,
             load_afterwards=load_afterwards,
         )
-        item_th.setFormatter(FMT)
-        item_th.setLevel("INFO")
+        item_th.handler.setFormatter(FMT)
+        item_th.handler.setLevel("INFO")
 
         try:
             subprocess_ref = Subprocess(
@@ -307,7 +313,7 @@ def startProcess(self, job_vars: list, load_afterwards=False):
             )
             return
 
-        handlers = [item_th] + LOG.handlers
+        handlers = [item_th.handler] + LOG.handlers
         listener = QueueListener(log_queue, *handlers, respect_handler_level=True)
         listener.start()
 
diff --git a/MDANSE_GUI/Src/MDANSE_GUI/Tabs/Views/RunTable.py b/MDANSE_GUI/Src/MDANSE_GUI/Tabs/Views/RunTable.py
index 540861141a..592613c16e 100644
--- a/MDANSE_GUI/Src/MDANSE_GUI/Tabs/Views/RunTable.py
+++ b/MDANSE_GUI/Src/MDANSE_GUI/Tabs/Views/RunTable.py
@@ -147,7 +147,7 @@ def item_picked(self, index: QModelIndex):
         node_number = model.index(item_row, 0).data(role=Qt.ItemDataRole.UserRole)
         job_entry = model.existing_jobs[node_number]
         self.item_details.emit(job_entry.text_summary())
-        self.jobs_logs.emit(job_entry.msgs_and_levels())
+        self.jobs_logs.emit(job_entry.handler.msgs_and_levels())
 
     def connect_to_visualiser(self, visualiser: TextInfo) -> None:
         """Connect to a visualiser.