Merge pull request #47 from Chilipp/onclose

Close the QApplication when closing the app widget

Author: Chilipp

CHANGELOG.rst

@@ -5,6 +5,9 @@ Changed
 -------
 - The plotmethod tabs have now a more intuitive gridlayout (see
   `#46 <https://github.com/psyplot/psy-view/pull/46>`__)
+- When closing the mainwindow of psy-view now, one closes all open windows (i.e.
+  also the open figures, see
+  `#47 <https://github.com/psyplot/psy-view/pull/47>`__)
 
 Added
 -----

psy_view/__init__.py

@@ -78,11 +78,11 @@ def start_app(
 
     rcParams['help_explorer.use_webengineview'] = False
 
-    from psy_view.ds_widget import DatasetWidget
+    from psy_view.ds_widget import DatasetWidgetStandAlone
     from psyplot_gui.common import get_icon
 
     app = QtWidgets.QApplication(sys.argv)
-    ds_widget = DatasetWidget(ds)
+    ds_widget = DatasetWidgetStandAlone(ds)
     ds_widget.setWindowIcon(QIcon(get_icon('logo.svg')))
     if preset is not None:
         ds_widget.load_preset(preset)

psy_view/ds_widget.py

@@ -64,8 +64,8 @@
     from matplotlib.backend_bases import MouseEvent
     from psyplot_gui.main import MainWindow
 
-NOTSET_T = Type[object]
-NOTSET: NOTSET_T = object
+
+NOTSET = "__NOVARIABLEAVAILABLE"
 
 
 def get_dims_to_iterate(arr: DataArray) -> List[str]:
@@ -125,6 +125,9 @@ class DatasetWidget(QtWidgets.QSplitter):
     #: A :class:`PyQt5.QtWidgets.QGroupBox` that contains the variable buttons
     variable_frame: Optional[QtWidgets.QGroupBox] = None
 
+    #: Buttons for selecting variables in the :attr:`ds`
+    variable_buttons: Dict[str, QtWidgets.QPushButton]
+
     _new_plot: bool = False
 
     _preset: Optional[Union[str, Dict]] = None
@@ -318,7 +321,7 @@ def showEvent(self, event):
         ret = super().showEvent(event)
         current_size = self.size()
         current_sizes = self.sizes()
-        new_sizes = list(current_sizes)
+
         itree = self.indexOf(self.ds_tree)
         itable = self.indexOf(self.dimension_table)
         diff = 0
@@ -791,7 +794,7 @@ def _load_preset(self) -> None:
 
     def load_preset(self, preset: Optional[Union[str, Dict[str, Any]]]):
         """Load a given preset from disk.
-        
+
         Parameters
         ----------
         preset: str or dict
@@ -990,7 +993,7 @@ def export_project_with_data(self) -> None:
     def export_python(self):
         """Export the project as python file.
 
-        This method is not yet implemented as the functionality is missing in 
+        This method is not yet implemented as the functionality is missing in
         psyplot.
         """
         pass
@@ -1022,31 +1025,31 @@ def silence_variable_buttons(self) -> Iterator[None]:
         yield self.block_widgets(*self.variable_buttons.values())  # type: ignore
 
     @property
-    def variable(self) -> Union[str, NOTSET_T]:
+    def variable(self) -> str:
         """The current variable"""
         for v, btn in self.variable_buttons.items():
             if btn.isChecked():
                 return v
         return NOTSET
 
     @variable.setter
-    def variable(self, value: Union[str, NOTSET_T]) -> None:
+    def variable(self, value: str) -> None:
         with self.silence_variable_buttons():
             for v, btn in self.variable_buttons.items():
                 btn.setChecked(v == value)
 
     @property
     def available_plotmethods(self) -> List[str]:
         """Get the plotmethods that can visualize the selected variable.
-        
+
         Returns
         -------
         list of str
             A list of plotmethod names that can visualize the current
             :attr:`variable`
         """
         v = self.variable
-        if v is NOTSET:
+        if v == NOTSET:
             return []
         ret = []
         ds: Dataset = self.ds  # type: ignore
@@ -1141,10 +1144,10 @@ def filter_sp(self, sp: Project, ds_only: bool = False) -> Project:
 
     def new_plot(self) -> None:
         """Select a new variable and make a plot.
-        
+
         This method asks for a variable and them makes a new plot with the
         selected plotmethod.
-        
+
         See Also
         --------
         make_plot: plot the currently selected variable without asking
@@ -1380,7 +1383,7 @@ def change_combo_array(self) -> None:
                     vname = self.data.name
                 except Exception:
                     vname = self.variable
-                if vname is not NOTSET:
+                if vname != NOTSET:
                     self.expand_current_variable(vname)
                     self.show_fig(sp[:1])
 
@@ -1410,7 +1413,7 @@ def reset_combo_array(self) -> None:
     def refresh(self, reset_combo: bool = True) -> None:
         """Refresh the state of this widget.
 
-        This method refreshes the widget based on the selected project, 
+        This method refreshes the widget based on the selected project,
         variable, etc.
 
         Parameters
@@ -1450,7 +1453,7 @@ def refresh(self, reset_combo: bool = True) -> None:
             valid_variables = self.plotmethod_widget.valid_variables(self.ds)
             for v, btn in self.variable_buttons.items():
                 btn.setEnabled(v in valid_variables)
-        elif self.ds is None or variable is NOTSET or not self.sp:
+        elif self.ds is None or variable == NOTSET or not self.sp:
             return
 
         table = self.dimension_table
@@ -1557,6 +1560,16 @@ def update():
         return update
 
 
+class DatasetWidgetStandAlone(DatasetWidget):
+    """A :class:`DatasetWidget` that is supposed to work as a standalone GUI"""
+
+    def closeEvent(self, event: Any):
+        """Reimplemented close event to stop the running ``QApplication``."""
+        ret = super().closeEvent(event)
+        QtWidgets.QApplication.instance().quit()
+        return ret
+
+
 class DatasetWidgetPlugin(DatasetWidget, DockMixin):
     """A :class:`DatasetWidget` plugin for the psyplot GUI.
 
@@ -1653,7 +1666,7 @@ def show_fig(self, sp: Optional[Project]) -> None:
 
     def setup_ds_tree(self) -> None:
         """Setup the number of columns and the header of the dataset tree.
-        
+
         Reimplemented to use the :class:`psyplot_gui.content_widget.DatasetTree`
         """
         self.ds_tree = tree = DatasetTree()