Merge pull request #322 from JYU-IBA/bugfixes_202310

Bugfixes 202310

widgets/matplotlib/measurement/tofe_histogram.py

@@ -618,6 +618,10 @@ def on_click(self, event):
 
 
     def on_release(self, event):
+        if event.inaxes != self.axes:
+            return
+        if self.__button_drag.isChecked() or self.__button_zoom.isChecked():
+            return
         if (event.button == 1) and (self.__point_selected != None):
             self.__point_selected = None
 
@@ -974,6 +978,8 @@ def __on_motion(self, event):
         """
         if event.inaxes != self.axes:
             return
+        if self.__button_drag.isChecked() or self.__button_zoom.isChecked():
+            return
         if event.xdata is None and event.ydata is None:
             return
 

widgets/simulation/controls.py

@@ -41,6 +41,7 @@
 from modules.global_settings import GlobalSettings
 from modules.enums import IonDivision
 from widgets.gui_utils import GUIObserver
+from modules.enums import SimulationType
 
 from PyQt5 import QtWidgets
 from PyQt5 import QtCore
@@ -109,8 +110,12 @@ def __init__(self, element_simulation: ElementSimulation,
         self.recoil_dist_widget = recoil_dist_widget
         self.progress_bars = {}
 
-        self.recoil_name = \
-            self.element_simulation.get_main_recoil().get_full_name()
+        main_recoil = self.element_simulation.get_main_recoil()
+        if main_recoil.type == SimulationType.ERD:
+            self.recoil_name = main_recoil.get_full_name()
+        else:
+            self.recoil_name = main_recoil.get_full_name() + "    Scatter"
+
         self.show_status(self.element_simulation.get_current_status())
         self.finished_processes = 0, self.process_count
 
@@ -164,7 +169,10 @@ def _set_name(self, _, recoil_elem):
         main recoil.
         """
         if recoil_elem is self.element_simulation.get_main_recoil():
-            self.recoil_name = recoil_elem.get_full_name()
+            if recoil_elem.type == SimulationType.ERD:
+                self.recoil_name = recoil_elem.get_full_name()
+            else:
+                self.recoil_name = recoil_elem.get_full_name() + "    Scatter"
 
     def enable_buttons(self, starting=False):
         """Switches the states of run and stop button depending on the state