From 705d81be0e74b654dc6bde371dd47aca6b1dc03e Mon Sep 17 00:00:00 2001 From: Aseem Jain Date: Tue, 24 Jan 2023 17:54:54 +0530 Subject: [PATCH 1/2] Framework graphics integration. --- .../visualization/matplotlib/matplot_objects.py | 9 +++++++-- .../visualization/pyvista/pyvista_objects.py | 9 +++++++-- tests/test_post.py | 15 +++++++++------ 3 files changed, 23 insertions(+), 10 deletions(-) diff --git a/src/ansys/fluent/visualization/matplotlib/matplot_objects.py b/src/ansys/fluent/visualization/matplotlib/matplot_objects.py index 76e42097..d890c225 100644 --- a/src/ansys/fluent/visualization/matplotlib/matplot_objects.py +++ b/src/ansys/fluent/visualization/matplotlib/matplot_objects.py @@ -3,6 +3,7 @@ from typing import Optional from ansys.fluent.core.meta import Command +from ansys.fluent.core.post_objects.post_helper import PostAPIHelper from ansys.fluent.core.post_objects.post_object_definitions import ( MonitorDefn, XYPlotDefn, @@ -22,8 +23,12 @@ class Plots(PlotsContainer): session so that plots can be created. """ - def __init__(self, session, local_surfaces_provider=None): - super().__init__(session, sys.modules[__name__], local_surfaces_provider) + def __init__( + self, session, post_api_helper=PostAPIHelper, local_surfaces_provider=None + ): + super().__init__( + session, sys.modules[__name__], post_api_helper, local_surfaces_provider + ) class XYPlot(XYPlotDefn): diff --git a/src/ansys/fluent/visualization/pyvista/pyvista_objects.py b/src/ansys/fluent/visualization/pyvista/pyvista_objects.py index 87c689e3..f3fe2f23 100644 --- a/src/ansys/fluent/visualization/pyvista/pyvista_objects.py +++ b/src/ansys/fluent/visualization/pyvista/pyvista_objects.py @@ -4,6 +4,7 @@ from typing import Optional from ansys.fluent.core.meta import Command +from ansys.fluent.core.post_objects.post_helper import PostAPIHelper from ansys.fluent.core.post_objects.post_object_definitions import ( ContourDefn, MeshDefn, @@ -26,8 +27,12 @@ class Graphics(GraphicsContainer): session so that graphics objects can be created. """ - def __init__(self, session, local_surfaces_provider=None): - super().__init__(session, sys.modules[__name__], local_surfaces_provider) + def __init__( + self, session, post_api_helper=PostAPIHelper, local_surfaces_provider=None + ): + super().__init__( + session, sys.modules[__name__], post_api_helper, local_surfaces_provider + ) class Mesh(MeshDefn): diff --git a/tests/test_post.py b/tests/test_post.py index 4a23fc82..29c66191 100644 --- a/tests/test_post.py +++ b/tests/test_post.py @@ -181,8 +181,9 @@ def __init__(self, obj=None): def test_field_api(): - pyvista_graphics = Graphics(session=None) + pyvista_graphics = Graphics(session=None, post_api_helper=MockAPIHelper) contour1 = pyvista_graphics.Contours["contour-1"] + field_info = contour1._api_helper.field_info() field_data = contour1._api_helper.field_data() @@ -432,21 +433,23 @@ def test_surface_object(): assert "surf-1" in cont1.surfaces_list.allowed_values # New surface is not available in allowed values for plots. - matplotlib_plots = Plots(session=None) + matplotlib_plots = Plots(session=None, post_api_helper=MockAPIHelper) p1 = matplotlib_plots.XYPlots["p-1"] assert "surf-1" not in p1.surfaces_list.allowed_values # With local surface provider it becomes available. local_surfaces_provider = Graphics(session=None).Surfaces matplotlib_plots = Plots( - session=None, local_surfaces_provider=local_surfaces_provider + session=None, + post_api_helper=MockAPIHelper, + local_surfaces_provider=local_surfaces_provider, ) assert "surf-1" in p1.surfaces_list.allowed_values def test_create_plot_objects(): - matplotlib_plots1 = Plots(session=None) - matplotlib_plots2 = Plots(session=None) + matplotlib_plots1 = Plots(session=None, post_api_helper=MockAPIHelper) + matplotlib_plots2 = Plots(session=None, post_api_helper=MockAPIHelper) matplotlib_plots1.XYPlots["p-1"] matplotlib_plots2.XYPlots["p-2"] @@ -457,7 +460,7 @@ def test_create_plot_objects(): def test_xyplot_object(): - matplotlib_plots = Plots(session=None) + matplotlib_plots = Plots(session=None, post_api_helper=MockAPIHelper) p1 = matplotlib_plots.XYPlots["p-1"] field_info = p1._api_helper.field_info() From 775ce77814a8e1c8b691faba2a29540d75016dcf Mon Sep 17 00:00:00 2001 From: Your Name Date: Mon, 30 Jan 2023 16:29:41 +0530 Subject: [PATCH 2/2] Updated isort version to avoid pre-commit failure. --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 1a81b890..acd8b73c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -6,7 +6,7 @@ repos: - id: black - repo: https://github.com/pycqa/isort - rev: 5.10.1 + rev: 5.11.5 hooks: - id: isort