ansys-pyensight-core 0.10.6__tar.gz → 0.10.8__tar.gz

{ansys_pyensight_core-0.10.6 → ansys_pyensight_core-0.10.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ansys-pyensight-core
-Version: 0.10.6
+Version: 0.10.8
 Summary: A python wrapper for Ansys EnSight
 Author-email: "ANSYS, Inc." <pyansys.core@ansys.com>
 Maintainer-email: "ANSYS, Inc." <pyansys.core@ansys.com>
@@ -17,10 +17,10 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 License-File: LICENSE
 Requires-Dist: importlib-metadata>=4.0; python_version<='3.8'
-Requires-Dist: ansys-api-pyensight==0.4.8
+Requires-Dist: ansys-api-pyensight==0.4.9
 Requires-Dist: requests>=2.28.2
 Requires-Dist: docker>=6.1.0
-Requires-Dist: urllib3<2.4.0
+Requires-Dist: urllib3<3
 Requires-Dist: numpy>=1.21.0,<3
 Requires-Dist: Pillow>=9.3.0
 Requires-Dist: pypng>=0.0.20

{ansys_pyensight_core-0.10.6 → ansys_pyensight_core-0.10.8}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "ansys-pyensight-core"
-version = "0.10.6"
+version = "0.10.8"
 description = "A python wrapper for Ansys EnSight"
 readme = "README.rst"
 requires-python = ">=3.10,<3.14"
@@ -27,10 +27,10 @@ classifiers = [
 
 dependencies = [
     "importlib-metadata>=4.0; python_version<='3.8'",
-    "ansys-api-pyensight==0.4.8",
+    "ansys-api-pyensight==0.4.9",
     "requests>=2.28.2",
     "docker>=6.1.0",
-    "urllib3<2.4.0",
+    "urllib3<3",
     "numpy>=1.21.0,<3",
     "Pillow>=9.3.0",
     "pypng>=0.0.20",
@@ -161,7 +161,7 @@ recursive = true
 exclude = ["venv/*", "tests/*"]
 
 [tool.mypy]
-python_version = 3.10
+python_version = "3.10"
 strict = false
 namespace_packages = true
 explicit_package_bases = true

{ansys_pyensight_core-0.10.6 → ansys_pyensight_core-0.10.8}/src/ansys/pyensight/core/common.py

@@ -97,7 +97,7 @@ def get_host_port(uri: str) -> Tuple[str, int]:
     port = (
         parse_results.port
         if parse_results.port
-        else (443 if re.search("^https|wss$", parse_results.scheme) else None)
+        else (443 if re.search(r"^https|wss$", parse_results.scheme) else None)
     )
     return (parse_results.host, port)
 

{ansys_pyensight_core-0.10.6 → ansys_pyensight_core-0.10.8}/src/ansys/pyensight/core/dvs.py

@@ -156,7 +156,9 @@ class DVS(dvs_base):
             arch = "win64" if self._is_windows() else "linux_2.6_64"
             apex_libs = os.path.join(apex_path, "machines", arch)
             python_path = glob.glob(os.path.join(apex_libs, "Python-3.*"))[-1]
-            apex_py_version = re.search("Python-3.([0-9]+).([0-9]+)", os.path.basename(python_path))
+            apex_py_version = re.search(
+                r"Python-3.([0-9]+).([0-9]+)", os.path.basename(python_path)
+            )
             apex_py_major_version = apex_py_version.group(1)
             lib_path = os.path.join(python_path, "lib", f"python3.{apex_py_major_version}")
             if self._is_windows():

{ansys_pyensight_core-0.10.6 → ansys_pyensight_core-0.10.8}/src/ansys/pyensight/core/enshell_grpc.py

@@ -455,7 +455,7 @@ class EnShellGRPC(object):
                 "Error getting CEI_HOME env var from the Docker container.\n{ret}\n"
             )  # pragma: no cover
         self._cei_home = cei_home_line[equal_sign_loc + 1 :]
-        m = re.search("/v(\d\d\d)/", self._cei_home)
+        m = re.search(r"/v(\d\d\d)/", self._cei_home)
         if not m:  # pragma: no cover
             self.stop_server()  # pragma: no cover
             raise RuntimeError(

{ansys_pyensight_core-0.10.6 → ansys_pyensight_core-0.10.8}/src/ansys/pyensight/core/libuserd.py

@@ -1138,8 +1138,8 @@ class LibUserd(object):
     >>> from ansys.pyensight.core import libuserd
     >>> l = libuserd.LibUserd()
     >>> l.initialize()
-    >>> readers = l.query_format(r"D:\data\Axial_001.res")
-    >>> data = readers[0].read_dataset(r"D:\data\Axial_001.res")
+    >>> readers = l.query_format("D:\\data\\Axial_001.res")
+    >>> data = readers[0].read_dataset("D:\\data\\Axial_001.res")
     >>> part = data.parts[0]
     >>> print(part, part.nodes())
     >>> l.shutdown()

{ansys_pyensight_core-0.10.6 → ansys_pyensight_core-0.10.8}/src/ansys/pyensight/core/session.py

@@ -1164,7 +1164,7 @@ class Session:
         --------
         >>> from ansys.pyensight.core import LocalLauncher
         >>> session = LocalLauncher().start()
-        >>> session.load_data(r'D:\data\CFX\example_data.res')
+        >>> session.load_data('D:\\data\\CFX\\example_data.res')
 
         """
         self._establish_connection()
@@ -1431,7 +1431,7 @@ class Session:
         >>> def cb(v: str):
         >>>     print("Event:", v)
         >>> s.add_callback("ensight.objs.core", "partlist", ["PARTS"], cb)
-        >>> s.load_data(r"D:\ANSYSDev\data\CFX\HeatingCoil_001.res")
+        >>> s.load_data("D:\\ANSYSDev\\data\\CFX\\HeatingCoil_001.res")
         """
         self._establish_connection()
         # shorten the tag up to the query block. Macros are only legal in the query block.

{ansys_pyensight_core-0.10.6 → ansys_pyensight_core-0.10.8}/src/ansys/pyensight/core/utils/omniverse.py

@@ -396,7 +396,7 @@ class Omniverse:
     >>> from ansys.pyensight.core import LocalLauncher
     >>> session = LocalLauncher().start()
     >>> ov = session.ensight.utils.omniverse
-    >>> ov.create_connection(r"D:\Omniverse\Example")
+    >>> ov.create_connection("D:\\Omniverse\\Example")
     >>> ov.update()
     >>> ov.close_connection()
 

{ansys_pyensight_core-0.10.6 → ansys_pyensight_core-0.10.8}/src/ansys/pyensight/core/utils/views.py

@@ -18,9 +18,13 @@ Example to set an isometric view:
 
 """
 
+
 import math
+from types import ModuleType
 from typing import TYPE_CHECKING, Dict, List, Optional, Tuple, Union
 
+import numpy as np
+
 if TYPE_CHECKING:
     try:
         import ensight
@@ -28,14 +32,243 @@ if TYPE_CHECKING:
         from ansys.api.pyensight import ensight_api
 
 
+VIEW_DICT = {
+    "x+": (1, 0, 0),
+    "x-": (-1, 0, 0),
+    "y+": (0, 1, 0),
+    "y-": (0, -1, 0),
+    "z+": (0, 0, 1),
+    "z-": (0, 0, -1),
+    "isometric": (1, 1, 1),
+}
+
+
+class _Simba:
+    """Hidden class to manage the interactor layer in simba"""
+
+    def __init__(self, ensight: Union["ensight_api.ensight", "ensight"], views: "Views"):
+        self.ensight = ensight
+        self.views = views
+        self._original_look_at = None
+        self._original_look_from = None
+        self._original_parallel_scale = None
+        self._original_view_angle = None
+        self._original_view_up = None
+
+    def _initialize_simba_view(self):
+        """Initialize the data for resetting the camera."""
+        vport = self.ensight.objs.core.VPORTS[0]
+        near_clip = vport.ZCLIPLIMITS[0]
+        view_angle = 2 * vport.PERSPECTIVEANGLE
+        self._original_parallel_scale = near_clip * math.tan(math.radians(view_angle) / 2)
+        self._original_view_angle = view_angle
+        (
+            self._original_look_from,
+            self._original_look_at,
+            self._original_view_up,
+            self._original_parallel_scale,
+        ) = self.compute_camera_from_ensight_opengl()
+        self.ensight.annotation.axis_global("off")
+        self.ensight.annotation.axis_local("off")
+        self.ensight.annotation.axis_model("off")
+
+    def get_center_of_rotation(self):
+        """Get EnSight center of rotation."""
+        return self.ensight.objs.core.VPORTS[0].TRANSFORMCENTER
+
+    def auto_scale(self):
+        """Auto scale view."""
+        self.ensight.view_transf.function("global")
+        self.ensight.view_transf.fit()
+        self._initialize_simba_view()
+        self.render()
+        return self.get_camera()
+
+    def set_view(self, value: str):
+        """Set the view."""
+        self.ensight.view_transf.function("global")
+        if value != "isometric":
+            new_value = value[1].upper() + value[0]
+            self.ensight.view_transf.view_recall(new_value)
+        else:
+            self.views.set_view_direction(
+                1, 1, 1, perspective=self.ensight.objs.core.vports[0].PERSPECTIVE
+            )
+        self.auto_scale()
+        return self.get_camera()
+
+    def get_camera(self):
+        """Get EnSight camera settings in VTK format."""
+        vport = self.ensight.objs.core.VPORTS[0]
+        position, focal_point, view_up, parallel_scale = self.compute_camera_from_ensight_opengl()
+        vport = self.ensight.objs.core.VPORTS[0]
+        view_angle = 2 * vport.PERSPECTIVEANGLE
+        # The parameter parallel scale is the actual parallel scale only
+        # if the vport is in orthographic mode. If not, it is defined as the
+        # inverge of the tangent of half of the field of view
+        parallel_scale = parallel_scale
+        return {
+            "orthographic": not vport.PERSPECTIVE,
+            "view_up": view_up,
+            "position": position,
+            "focal_point": focal_point,
+            "view_angle": view_angle,
+            "parallel_scale": parallel_scale,
+            "reset_focal_point": self._original_look_at,
+            "reset_position": self._original_look_from,
+            "reset_parallel_scale": self._original_parallel_scale,
+            "reset_view_up": self._original_view_up,
+            "reset_view_angle": self._original_view_angle,
+        }
+
+    @staticmethod
+    def normalize(v):
+        """Normalize a numpy vector."""
+        norm = np.linalg.norm(v)
+        return v / norm if norm > 0 else v
+
+    @staticmethod
+    def rotation_matrix_to_quaternion(m):
+        """Convert a numpy rotation matrix to a quaternion."""
+        trace = np.trace(m)
+        if trace > 0:
+            s = 0.5 / np.sqrt(trace + 1.0)
+            w = 0.25 / s
+            x = (m[2, 1] - m[1, 2]) * s
+            y = (m[0, 2] - m[2, 0]) * s
+            z = (m[1, 0] - m[0, 1]) * s
+        else:
+            if m[0, 0] > m[1, 1] and m[0, 0] > m[2, 2]:
+                s = 2.0 * np.sqrt(1.0 + m[0, 0] - m[1, 1] - m[2, 2])
+                w = (m[2, 1] - m[1, 2]) / s
+                x = 0.25 * s
+                y = (m[0, 1] + m[1, 0]) / s
+                z = (m[0, 2] + m[2, 0]) / s
+            elif m[1, 1] > m[2, 2]:
+                s = 2.0 * np.sqrt(1.0 + m[1, 1] - m[0, 0] - m[2, 2])
+                w = (m[0, 2] - m[2, 0]) / s
+                x = (m[0, 1] + m[1, 0]) / s
+                y = 0.25 * s
+                z = (m[1, 2] + m[2, 1]) / s
+            else:
+                s = 2.0 * np.sqrt(1.0 + m[2, 2] - m[0, 0] - m[1, 1])
+                w = (m[1, 0] - m[0, 1]) / s
+                x = (m[0, 2] + m[2, 0]) / s
+                y = (m[1, 2] + m[2, 1]) / s
+                z = 0.25 * s
+        return np.array([x, y, z, w])
+
+    def compute_model_rotation_quaternion(self, camera_position, focal_point, view_up):
+        """Compute the quaternion from the input camera."""
+        forward = self.normalize(np.array(focal_point) - np.array(camera_position))
+        right = self.normalize(np.cross(forward, view_up))
+        true_up = np.cross(right, forward)
+        camera_rotation = np.vstack([right, true_up, -forward]).T
+        model_rotation = camera_rotation.T
+        quat = self.rotation_matrix_to_quaternion(model_rotation)
+        return quat
+
+    @staticmethod
+    def quaternion_multiply(q1, q2):
+        x1, y1, z1, w1 = q1
+        x2, y2, z2, w2 = q2
+        w = w1 * w2 - x1 * x2 - y1 * y2 - z1 * z2
+        x = w1 * x2 + x1 * w2 + y1 * z2 - z1 * y2
+        y = w1 * y2 - x1 * z2 + y1 * w2 + z1 * x2
+        z = w1 * z2 + x1 * y2 - y1 * x2 + z1 * w2
+        return np.array([x, y, z, w])
+
+    def quaternion_to_euler(self, q):
+        q = self.normalize(q)
+        x, y, z, w = q
+        sinr_cosp = 2 * (w * x + y * z)
+        cosr_cosp = 1 - 2 * (x * x + y * y)
+        roll = np.arctan2(sinr_cosp, cosr_cosp)
+
+        sinp = 2 * (w * y - z * x)
+        if abs(sinp) >= 1:
+            pitch = np.pi / 2 * np.sign(sinp)
+        else:
+            pitch = np.arcsin(sinp)
+        siny_cosp = 2 * (w * z + x * y)
+        cosy_cosp = 1 - 2 * (y * y + z * z)
+        yaw = np.arctan2(siny_cosp, cosy_cosp)
+
+        return np.degrees([roll, pitch, yaw])
+
+    def compute_camera_from_ensight_opengl(self):
+        """Simulate a rotating camera using the current quaternion."""
+        if isinstance(self.ensight, ModuleType):
+            data = self.ensight.objs.core.VPORTS[0].simba_camera()
+        else:
+            data = self.ensight._session.cmd("ensight.objs.core.VPORTS[0].simba_camera())")
+        camera_position = [data[0], data[1], data[2]]
+        focal_point = [data[3], data[4], data[5]]
+        view_up = [data[6], data[7], data[8]]
+        parallel_scale = 1 / data[9]
+        return camera_position, focal_point, self.views._normalize_vector(view_up), parallel_scale
+
+    def set_camera(
+        self, orthographic, view_up=None, position=None, focal_point=None, view_angle=None
+    ):
+        """Set the EnSight camera settings from the VTK input."""
+        self.ensight.view_transf.function("global")
+        perspective = "OFF" if orthographic else "ON"
+        if orthographic:
+            self.ensight.view.perspective(perspective)
+        vport = self.ensight.objs.core.VPORTS[0]
+        if view_angle:
+            vport.PERSPECTIVEANGLE = view_angle / 2
+
+        if view_up and position and focal_point:
+            q_current = self.normalize(np.array(vport.ROTATION.copy()))
+            q_target = self.normalize(
+                self.compute_model_rotation_quaternion(position, focal_point, view_up)
+            )
+            q_relative = self.quaternion_multiply(
+                q_target, np.array([-q_current[0], -q_current[1], -q_current[2], q_current[3]])
+            )
+            angles = self.quaternion_to_euler(q_relative)
+            self.ensight.view_transf.rotate(*angles)
+        self.render()
+
+    def set_perspective(self, value):
+        self.ensight.view_transf.function("global")
+        vport = self.ensight.objs.core.VPORTS[0]
+        self.ensight.view.perspective(value)
+        vport.PERSPECTIVE = value == "ON"
+        self.ensight.view_transf.zoom(1)
+        self.ensight.view_transf.rotate(0, 0, 0)
+        self.render()
+        return self.get_camera()
+
+    def screen_to_world(self, mousex, mousey, invert_y=False, set_center=False):
+        mousex = int(mousex)
+        mousey = int(mousey)
+        if isinstance(self.ensight, ModuleType):
+            model_point = self.ensight.objs.core.VPORTS[0].screen_to_coords(
+                mousex, mousey, invert_y, set_center
+            )
+        else:
+            model_point = self.ensight._session.cmd(
+                f"ensight.objs.core.VPORTS[0].screen_to_coords({mousex}, {mousey}, {invert_y}, {set_center})"
+            )
+        self.render()
+        return {"model_point": model_point, "camera": self.get_camera()}
+
+    def render(self):
+        self.ensight.render()
+        self.ensight.refresh(1)
+
+
 class Views:
     """Controls the view in the current EnSight ``Session`` instance."""
 
     def __init__(self, ensight: Union["ensight_api.ensight", "ensight"]):
         self.ensight = ensight
         self._views_dict: Dict[str, Tuple[int, List[float]]] = {}
+        self._simba = _Simba(ensight, self)
 
-    # Utilities
     @staticmethod
     def _normalize_vector(direction: List[float]) -> List[float]:
         """Return the normalized input (3D) vector.
@@ -295,14 +528,17 @@ class Views:
         vportindex : int, optional
             Viewport to set the view direction for. The default is ``0``.
         """
-        self.ensight.view.perspective("OFF")
-        direction = [xdir, ydir, zdir]
         vport = self.ensight.objs.core.VPORTS[vportindex]
+        if not perspective:
+            self.ensight.view.perspective("OFF")
+            vport.PERSPECTIVE = False
+        direction = [xdir, ydir, zdir]
         rots = vport.ROTATION.copy()
         rots[0:4] = self._convert_view_direction_to_quaternion(direction, up_axis=up_axis)
         vport.ROTATION = rots
         if perspective:
             self.ensight.view.perspective("ON")
+            vport.PERSPECTIVE = True
         self.save_current_view(name=name, vportindex=vportindex)
 
     def save_current_view(