From af8cabd0be4c0f27c2a534b83b58af790f500738 Mon Sep 17 00:00:00 2001 From: Aseem Jain Date: Wed, 23 Mar 2022 20:16:09 +0530 Subject: [PATCH] Post refactoring --- .../post/matplotlib/matplot_windows_manager.py | 12 ++++++------ ansys/fluent/post/pyvista/pyvista_objects.py | 16 ++++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ansys/fluent/post/matplotlib/matplot_windows_manager.py b/ansys/fluent/post/matplotlib/matplot_windows_manager.py index 2be85794e9bf..317105a0d7c9 100644 --- a/ansys/fluent/post/matplotlib/matplot_windows_manager.py +++ b/ansys/fluent/post/matplotlib/matplot_windows_manager.py @@ -19,7 +19,7 @@ class _ProcessPlotterHandle: def __init__( self, - plotter_id, + window_id, curves=[], title="XY Plot", xlabel="position", @@ -28,7 +28,7 @@ def __init__( self._closed = False self.plot_pipe, plotter_pipe = mp.Pipe() self.plotter = ProcessPlotter( - plotter_id, curves, title, xlabel, ylabel + window_id, curves, title, xlabel, ylabel ) self.plot_process = mp.Process( target=self.plotter, args=(plotter_pipe,), daemon=True @@ -326,9 +326,9 @@ def close_windows( # private methods def _open_window( - self, plotter_id: str + self, window_id: str ) -> Union[Plotter, _ProcessPlotterHandle]: - window = self._post_windows.get(plotter_id) + window = self._post_windows.get(window_id) plotter = None if ( window @@ -337,8 +337,8 @@ def _open_window( ): window.refresh = False else: - window = MatplotWindow(plotter_id, None) - self._post_windows[plotter_id] = window + window = MatplotWindow(window_id, None) + self._post_windows[window_id] = window if in_notebook(): window.plotter() return window diff --git a/ansys/fluent/post/pyvista/pyvista_objects.py b/ansys/fluent/post/pyvista/pyvista_objects.py index 2feb1b3f8c25..2f48581b1d10 100644 --- a/ansys/fluent/post/pyvista/pyvista_objects.py +++ b/ansys/fluent/post/pyvista/pyvista_objects.py @@ -48,7 +48,7 @@ def _init_module(self, obj, mod): class Mesh(MeshDefn): """Mesh graphics.""" - def display(self, plotter_id: Optional[str] = None): + def display(self, window_id: Optional[str] = None): """ Display mesh graphics. @@ -57,13 +57,13 @@ def display(self, plotter_id: Optional[str] = None): window_id : str, optional Window id. If not specified unique id is used. """ - pyvista_windows_manager.plot(self, plotter_id) + pyvista_windows_manager.plot(self, window_id) class Surface(SurfaceDefn): """Surface graphics.""" - def display(self, plotter_id: Optional[str] = None): + def display(self, window_id: Optional[str] = None): """ Display surface graphics. @@ -72,13 +72,13 @@ def display(self, plotter_id: Optional[str] = None): window_id : str, optional Window id. If not specified unique id is used. """ - pyvista_windows_manager.plot(self, plotter_id) + pyvista_windows_manager.plot(self, window_id) class Contour(ContourDefn): """Contour graphics.""" - def display(self, plotter_id: Optional[str] = None): + def display(self, window_id: Optional[str] = None): """ Display contour graphics. @@ -87,13 +87,13 @@ def display(self, plotter_id: Optional[str] = None): window_id : str, optional Window id. If not specified unique id is used. """ - pyvista_windows_manager.plot(self, plotter_id) + pyvista_windows_manager.plot(self, window_id) class Vector(VectorDefn): """Vector graphics.""" - def display(self, plotter_id: Optional[str] = None): + def display(self, window_id: Optional[str] = None): """ Display vector graphics. @@ -102,4 +102,4 @@ def display(self, plotter_id: Optional[str] = None): window_id : str, optional Window id. If not specified unique id is used. """ - pyvista_windows_manager.plot(self, plotter_id) + pyvista_windows_manager.plot(self, window_id)