FIX: fix saving session after interactive prealignment

SiLab-Bonn · Jan 17, 2018 · ee48612 · ee48612
1 parent 1b61cee
commit ee48612
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/testbeam_analysis/gui/gui_widgets/analysis_widgets.py b/testbeam_analysis/gui/gui_widgets/analysis_widgets.py
@@ -367,9 +367,11 @@ def _delete_option(self, option, func):
         Delete existing option. Needed if option is set manually.
         """
 
-        # Delete option widget
-        self.option_widgets[option].close()
-        del self.option_widgets[option]
+        # If option is not fixed, delete corresponding widget
+        if option in self.option_widgets:
+            # Delete option widget
+            self.option_widgets[option].close()
+            del self.option_widgets[option]
         # Update widgets
         self.opt_optional.update()
         self.opt_needed.update()

diff --git a/testbeam_analysis/gui/main.py b/testbeam_analysis/gui/main.py
@@ -516,6 +516,15 @@ def save_session(self):
         Opens a dialog and safes current session
         """
 
+        try:
+            if self.tw[self.current_analysis_tab()].analysis_thread.isRunning():
+                msg = 'Can not safe while %s analysis is running.' % self.current_analysis_tab()
+                logging.error(msg=msg)
+                self.console_dock.setVisible(True)
+                return
+        except AttributeError:
+            pass
+
         # Path to sessions directory in output_path
         sessions_dir = os.path.join(self.options['output_path'], 'sessions')
 
@@ -591,7 +600,8 @@ def load_session(self):
         try:
             if self.tw[self.current_analysis_tab()].analysis_thread.isRunning():
                 msg = 'Can not load while %s analysis is running.' % self.current_analysis_tab()
-                logging.warning(msg=msg)
+                logging.error(msg=msg)
+                self.console_dock.setVisible(True)
                 return
         except AttributeError:
             pass

diff --git a/testbeam_analysis/gui/tab_widgets/analysis_tabs.py b/testbeam_analysis/gui/tab_widgets/analysis_tabs.py
@@ -292,12 +292,15 @@ def listen(self):
             listener.closeSignal.connect(self.thread.quit)
             self.thread.finished.connect(listener.deleteLater)
             self.thread.finished.connect(self.thread.deleteLater)
+            # Important to delete to not safe in calls because queue has thread lock
+            self.thread.finished.connect(lambda: self._delete_option(option='queue', func=prealignment))
 
             self.add_option(option='queue',
                             default_value=io,
                             func=prealignment,
                             fixed=True,
                             hidden=True)
+
             self.thread.start()
 
         self._call_funcs()