Clean up waveform thread when program exits

Closes #42 (closed)

sohstationviewer/view/main_window.py

@@ -32,7 +32,6 @@ from sohstationviewer.view.plotting.waveform_dialog import WaveformDialog
 from sohstationviewer.view.search_message.search_message_dialog import (
     SearchMessageDialog
 )
-from sohstationviewer.view.plotting.state_of_health_widget import SOHWidget
 from sohstationviewer.view.help_view import HelpBrowser
 from sohstationviewer.view.ui.main_ui import UIMainWindow
 from sohstationviewer.view.util.enums import LogType
@@ -133,7 +132,7 @@ class MainWindow(QtWidgets.QMainWindow, UIMainWindow):
         """
         waveform_dlg: widget to display waveform channels' plotting
         """
-        self.waveform_dlg: SOHWidget = WaveformDialog(self)
+        self.waveform_dlg: WaveformDialog = WaveformDialog(self)
         """
         tps_dlg: dialog to display time-power-squared of waveform channels
         """
@@ -769,8 +768,7 @@ class MainWindow(QtWidgets.QMainWindow, UIMainWindow):
 
     def closeEvent(self, event: QtGui.QCloseEvent) -> None:
         """
-        Cleans up when the user exits the program. Currently only clean up
-        running data loaders.
+        Cleans up when the user exits the program.
 
         :param event: parameter of method being overridden
         """
@@ -782,6 +780,14 @@ class MainWindow(QtWidgets.QMainWindow, UIMainWindow):
             self.data_loader.thread.quit()
             self.data_loader.thread.wait()
 
+        if self.is_plotting_waveform:
+            self.waveform_dlg.plotting_widget.request_stop()
+            self.waveform_dlg.plotting_widget.thread_pool.waitForDone()
+
+        if self.is_plotting_tps:
+            self.tps_dlg.plotting_widget.request_stop()
+            self.tps_dlg.plotting_widget.thread_pool.waitForDone()
+
         # close all remaining windows
         for window in QtWidgets.QApplication.topLevelWidgets():
             window.close()