fixed release of TimeSeriesViewer instance after closing main window.

eotimeseriesviewer/main.py

@@ -114,6 +114,8 @@ class AboutDialogUI(QDialog, loadUI('aboutdialog.ui')):
 class TimeSeriesViewerUI(QMainWindow,
                          loadUI('timeseriesviewer.ui')):
 
+    sigAboutToBeClosed = pyqtSignal()
+
     def __init__(self, parent=None):
         """Constructor."""
         super(TimeSeriesViewerUI, self).__init__(parent)
@@ -253,6 +255,8 @@ class TimeSeriesViewerUI(QMainWindow,
         self.optionMoveCenter.setEnabled(b)
 
 
+    def closeEvent(self, a0:QCloseEvent):
+        self.sigAboutToBeClosed.emit()
 
 
 LUT_MESSAGELOGLEVEL = {
@@ -290,7 +294,7 @@ class TimeSeriesViewer(QgisInterface, QObject):
 
     sigCurrentSpectralProfilesChanged = pyqtSignal(list)
     sigCurrentTemporalProfilesChanged = pyqtSignal(list)
-
+    sigCloses = pyqtSignal()
 
     def __init__(self):
         """Constructor.
@@ -308,8 +312,14 @@ class TimeSeriesViewer(QgisInterface, QObject):
         import eotimeseriesviewer.utils
         eotimeseriesviewer.utils.MAP_LAYER_STORES.insert(0, self.mapLayerStore())
 
+        TimeSeriesViewer._instance = self
         self.ui = TimeSeriesViewerUI()
 
+        def onClosed():
+            TimeSeriesViewer._instance = None
+        self.ui.sigAboutToBeClosed.connect(onClosed)
+
+
         # Save reference to the QGIS interface
         import qgis.utils
         assert isinstance(qgis.utils.iface, QgisInterface)
@@ -463,7 +473,7 @@ class TimeSeriesViewer(QgisInterface, QObject):
         eotimeseriesviewer.labeling.registerLabelShortcutEditorWidget()
         self.applySettings()
 
-        TimeSeriesViewer._instance = self
+
 
         self.initQGISConnection()
 
@@ -1107,11 +1117,6 @@ class TimeSeriesViewer(QgisInterface, QObject):
     def show(self):
         self.ui.show()
 
-    def run(self):
-        #QApplication.processEvents()
-        self.ui.show()
-
-
     def clearLayoutWidgets(self, L):
         if L is not None:
             while L.count():

eotimeseriesviewer/timeseriesviewerplugin.py

@@ -32,8 +32,10 @@ from PyQt5.QtWidgets import *
 class TimeSeriesViewerPlugin:
 
     def __init__(self, iface):
+
         self.iface = iface
-        self.tsv = None
+        self.mEOTSV = None
+
         dirPlugin = os.path.dirname(__file__)
         site.addsitedir(dirPlugin)
 
@@ -46,7 +48,7 @@ class TimeSeriesViewerPlugin:
         eotimeseriesviewer.initAll()
 
     def initGui(self):
-        self.toolbarActions = []
+        self.mToolbarActions = []
 
         assert isinstance(self.iface, QgisInterface)
 
@@ -57,10 +59,9 @@ class TimeSeriesViewerPlugin:
         icon = eotimeseriesviewer.icon()
         action = QAction(icon, TITLE, self.iface)
         action.triggered.connect(self.run)
-        self.toolbarActions.append(action)
-
+        self.mToolbarActions.append(action)
 
-        for action in self.toolbarActions:
+        for action in self.mToolbarActions:
             self.iface.addToolBarIcon(action)
             self.iface.addPluginToRasterMenu(TITLE, action)
 
@@ -103,20 +104,24 @@ class TimeSeriesViewerPlugin:
 
     def run(self):
         from eotimeseriesviewer.main import TimeSeriesViewer
-        self.tsv = TimeSeriesViewer()
-        self.tsv.run()
+        self.mEOTSV = TimeSeriesViewer()
+        self.mEOTSV.ui.sigAboutToBeClosed.connect(self.onUiClosed)
+        self.mEOTSV.show()
 
 
+    def onUiClosed(self):
+        self.mEOTSV = None
+        from eotimeseriesviewer.main import TimeSeriesViewer
+        TimeSeriesViewer._instance = None
+
     def unload(self):
         from eotimeseriesviewer.main import TimeSeriesViewer
 
-        for action in self.toolbarActions:
+        for action in self.mToolbarActions:
             self.iface.removeToolBarIcon(action)
 
-        if isinstance(self.tsv, TimeSeriesViewer):
-            self.tsv.ui.close()
-            self.tsv = None
+        self.onUiClosed()
 
 
     def tr(self, message):
-        return QCoreApplication.translate('TimeSeriesViewerPlugin', message)
\ No newline at end of file
+        return QCoreApplication.translate('EOTimeSeriesViewerPlugin', message)
\ No newline at end of file