split vtk and png plot modes

Author: otvam

pypeec/lib_check/check_data_options.py

@@ -46,7 +46,7 @@ def check_plot_options(plot_mode, folder, name):
     # check plot_mode
     schema = {
         "type": ["null", "string"],
-        "enum": [None, "qt", "nb_int", "nb_std", "save", "debug"],
+        "enum": [None, "qt", "nb_int", "nb_std", "png", "vtk", "debug"],
     }
     scisave.validate_schema(plot_mode, schema)
 

pypeec/lib_plot/manage_plotgui.py

@@ -312,7 +312,7 @@ def _get_filename(self, tag, ext):
 
     def _save_screenshot(self):
         """
-        Save all the plots as images.
+        Save all the plot content as PNG files.
         """
 
         # save the PyVista plots
@@ -325,7 +325,11 @@ def _save_screenshot(self):
             filename = self._get_filename(tag, "png")
             fig.savefig(filename)
 
-        # save the VTK objects
+    def _save_data(self):
+        """
+        Save all the plot data as VTK files.
+        """
+
         for tag, vtk in self.vtk_list:
             filename = self._get_filename(tag, "vtk")
             vtk.save(filename)
@@ -351,7 +355,7 @@ def open_pyvista(self, tag, data_window):
         # create the figure
         if self.plot_mode in ["nb_int", "nb_std"]:
             pl = self._get_plotter_pyvista_nb(notebook_size)
-        elif self.plot_mode in ["save", "debug"]:
+        elif self.plot_mode in ["png", "vtk", "debug"]:
             pl = self.__get_plotter_pyvista_base(image_size)
         elif self.plot_mode == "qt":
             pl = self._get_plotter_pyvista_qt(tag, show_menu, window_size)
@@ -377,7 +381,7 @@ def open_matplotlib(self, tag, data_window):
         # create the figure
         if self.plot_mode in ["nb_int", "nb_std"]:
             fig = self._get_figure_matplotlib_nb(notebook_size)
-        elif self.plot_mode in ["save", "debug"]:
+        elif self.plot_mode in ["png", "vtk", "debug"]:
             fig = self._get_figure_matplotlib_base(image_size)
         elif self.plot_mode == "qt":
             fig = self._get_figure_matplotlib_qt(tag, show_menu, window_size)
@@ -412,11 +416,16 @@ def show(self):
             LOGGER.debug("display notebook plots")
             self._show_figure_nb(False)
             LOGGER.debug("exit plotting routine")
-        elif self.plot_mode == "save":
-            LOGGER.debug("save and close all the plots")
+        elif self.plot_mode == "png":
+            LOGGER.debug("save PNG files")
             self._save_screenshot()
             self._close_figure()
             LOGGER.debug("exit plotting routine")
+        elif self.plot_mode == "vtk":
+            LOGGER.debug("save VTK files")
+            self._save_data()
+            self._close_figure()
+            LOGGER.debug("exit plotting routine")
         elif self.plot_mode == "debug":
             LOGGER.debug("close all the plots")
             self._close_figure()

pypeec/main.py

@@ -109,10 +109,11 @@ def run_viewer_data(data_voxel, data_viewer, **kwargs):
         - The list describes plots to be shown.
         - If None or omitted: all the plots are shown.
     plot_mode : string
-        - If "qt", the Qt framework is used for the rendering.
+        - If "qt", the Qt framework is used for rendering the plots.
         - If "nb_int", interactive plots are rendered within the Jupyter notebook.
         - If "nb_std", static plots are rendered within the Jupyter notebook.
-        - If "save", the plots are not shown but saved as PNG and VTK files.
+        - If "png", the plot content are saved as PNG files.
+        - If "vtk", the plot data are saved as VTK files.
         - If "debug", the plots are not shown (test mode).
         - If None or omitted: the debug mode is used.
     folder : string
@@ -158,10 +159,11 @@ def run_viewer_file(file_voxel, file_viewer, **kwargs):
         - The list describes plots to be shown.
         - If None or omitted: all the plots are shown.
     plot_mode : string
-        - If "qt", the Qt framework is used for the rendering.
+        - If "qt", the Qt framework is used for rendering the plots.
         - If "nb_int", interactive plots are rendered within the Jupyter notebook.
         - If "nb_std", static plots are rendered within the Jupyter notebook.
-        - If "save", the plots are not shown but saved as PNG and VTK files.
+        - If "png", the plot content are saved as PNG files.
+        - If "vtk", the plot data are saved as VTK files.
         - If "debug", the plots are not shown (test mode).
         - If None or omitted: the debug mode is used.
     folder : string
@@ -295,10 +297,11 @@ def run_plotter_data(data_solution, data_plotter, **kwargs):
         - The list describes plots to be shown.
         - If None or omitted: all the plots are shown.
     plot_mode : string
-        - If "qt", the Qt framework is used for the rendering.
+        - If "qt", the Qt framework is used for rendering the plots.
         - If "nb_int", interactive plots are rendered within the Jupyter notebook.
         - If "nb_std", static plots are rendered within the Jupyter notebook.
-        - If "save", the plots are not shown but saved as PNG and VTK files.
+        - If "png", the plot content are saved as PNG files.
+        - If "vtk", the plot data are saved as VTK files.
         - If "debug", the plots are not shown (test mode).
         - If None or omitted: the debug mode is used.
     folder : string
@@ -347,10 +350,11 @@ def run_plotter_file(file_solution, file_plotter, **kwargs):
         - The list describes plots to be shown.
         - If None or omitted: all the plots are shown.
     plot_mode : string
-        - If "qt", the Qt framework is used for the rendering.
+        - If "qt", the Qt framework is used for rendering the plots.
         - If "nb_int", interactive plots are rendered within the Jupyter notebook.
         - If "nb_std", static plots are rendered within the Jupyter notebook.
-        - If "save", the plots are not shown but saved as PNG and VTK files.
+        - If "png", the plot content are saved as PNG files.
+        - If "vtk", the plot data are saved as VTK files.
         - If "debug", the plots are not shown (test mode).
         - If None or omitted: the debug mode is used.
     folder : string

pypeec/script.py

@@ -195,7 +195,7 @@ def _get_arg_viewer(subparsers):
         "-pm",
         "--plot_mode",
         help="selection of the plot mode (default: window)",
-        choices=["qt", "nb_int", "nb_std", "save", "debug"],
+        choices=["qt", "nb_int", "nb_std", "png", "vtk", "debug"],
         default=None,
         dest="plot_mode",
     )
@@ -307,7 +307,7 @@ def _get_arg_plotter(subparsers):
         "-pm",
         "--plot_mode",
         help="selection of the plot mode (default: window)",
-        choices=["qt", "nb_int", "nb_std", "save", "debug"],
+        choices=["qt", "nb_int", "nb_std", "png", "vtk", "debug"],
         default=None,
         dest="plot_mode",
     )