ansys-pyensight-core 0.8.5__tar.gz → 0.8.6__tar.gz

{ansys_pyensight_core-0.8.5 → ansys_pyensight_core-0.8.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ansys-pyensight-core
-Version: 0.8.5
+Version: 0.8.6
 Summary: A python wrapper for Ansys EnSight
 Author-email: "ANSYS, Inc." <pyansys.core@ansys.com>
 Maintainer-email: "ANSYS, Inc." <pyansys.core@ansys.com>

{ansys_pyensight_core-0.8.5 → ansys_pyensight_core-0.8.6}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "ansys-pyensight-core"
-version = "0.8.5"
+version = "0.8.6"
 description = "A python wrapper for Ansys EnSight"
 readme = "README.rst"
 requires-python = ">=3.9,<4"

{ansys_pyensight_core-0.8.5 → ansys_pyensight_core-0.8.6}/src/ansys/pyensight/core/exts/ansys.geometry.service/ansys/geometry/service/extension.py

@@ -13,6 +13,8 @@ import psutil
 
 try:
     import ansys.pyensight.core
+    import ansys.pyensight.core.utils.dsg_server as tmp_dsg_server  # noqa: F401
+    import ansys.pyensight.core.utils.omniverse_dsg_server as tmp_ov_dsg_server  # noqa: F401
 except ModuleNotFoundError:
     logging.warning("ansys.geometry.server - Installing ansys-pyensight-core")
     omni.kit.pipapi.install("ansys-pyensight-core")
@@ -82,6 +84,11 @@ class AnsysGeometryServiceServerExtension(omni.ext.IExt):
         self._security_token = self._setting("securityCode", "ENSIGHT_SECURITY_TOKEN")
         self._temporal = self._setting("temporal") != "0"
         self._vrmode = self._setting("vrmode") != "0"
+        try:
+            scale = float(self._setting("timeScale"))
+        except ValueError:
+            scale = 1.0
+        self._time_scale = scale
         self._normalize_geometry = self._setting("normalizeGeometry") != "0"
         self._version = "unknown"
         self._shutdown = False
@@ -141,6 +148,15 @@ class AnsysGeometryServiceServerExtension(omni.ext.IExt):
     def normalize_geometry(self, val: bool) -> None:
         self._normalize_geometry = val
 
+    @property
+    def time_scale(self) -> float:
+        """Value to multiply DSG time values by before passing to Omniverse"""
+        return self._time_scale
+
+    @time_scale.setter
+    def time_scale(self, value: float) -> None:
+        self._time_scale = value
+
     @classmethod
     def get_instance(cls) -> Optional["AnsysGeometryServiceServerExtension"]:
         return cls._service_instance
@@ -260,18 +276,40 @@ class AnsysGeometryServiceServerExtension(omni.ext.IExt):
         self.warning(
             f"    If non-zero, remap the geometry to the domain [-1,-1,-1]-[1,1,1].  (default: {self.normalize_geometry})"
         )
+        self.warning("  --/exts/ansys.geometry.service/timeScale=FLOAT")
+        self.warning(
+            f"    Multiply all DSG time values by this value.  (default: {self.time_scale})"
+        )
+
+    def is_server_running(self) -> bool:
+        """
+        Returns True if the server is running.
+
+        Returns
+        -------
+        bool
+            True if the server is running.
+        """
+        if self._server_process:
+            if psutil.pid_exists(self._server_process.pid):
+                return True
+        return False
 
     def stop_server(self) -> None:
         """
         If a DSG server connection has been started, stop it.  It could be in
         process or a subprocess.
         """
-        self._shutdown = True
-        if self._server_process:
-            for child in psutil.Process(self._server_process.pid).children(recursive=True):
-                child.kill()
-            self._server_process.kill()
-            self._server_process = None
+        try:
+            self._shutdown = True
+            if self._server_process:
+                for child in psutil.Process(self._server_process.pid).children(recursive=True):
+                    child.kill()
+                self._server_process.kill()
+        except psutil.NoSuchProcess:
+            pass
+        self._server_process = None
+        self._shutdown = False
 
     def launch_server(self) -> None:
         """
@@ -300,6 +338,8 @@ class AnsysGeometryServiceServerExtension(omni.ext.IExt):
             cmd.append("--/exts/ansys.geometry.service/vrmode=1")
         if self.normalize_geometry:
             cmd.append("--/exts/ansys.geometry.service/normalizeGeometry=1")
+        if self.time_scale != 1.0:
+            cmd.append(f"--/exts/ansys.geometry.service/timeScale={self.time_scale}")
         cmd.append(f"--/exts/ansys.geometry.service/omniUrl={self.omni_uri}")
         cmd.append(f"--/exts/ansys.geometry.service/dsgUrl={self.dsg_uri}")
         cmd.append("--/exts/ansys.geometry.service/run=1")
@@ -344,6 +384,7 @@ class AnsysGeometryServiceServerExtension(omni.ext.IExt):
             security_code=self.security_token,
             verbose=1,
             normalize_geometry=self.normalize_geometry,
+            time_scale=self.time_scale,
             handler=update_handler,
         )
 

{ansys_pyensight_core-0.8.5 → ansys_pyensight_core-0.8.6}/src/ansys/pyensight/core/exts/ansys.geometry.service/config/extension.toml

@@ -1,6 +1,6 @@
 [package]
 # Semantic Versioning is used: https://semver.org/
-version = "0.8.5"
+version = "0.8.6"
 
 # Lists people or organizations that are considered the "authors" of the package.
 authors = ["ANSYS"]
@@ -56,3 +56,4 @@ exts."ansys.geometry.service".securityCode = ""
 exts."ansys.geometry.service".temporal = "0"
 exts."ansys.geometry.service".vrmode = "0"
 exts."ansys.geometry.service".normalizeGeometry = "0"
+exts."ansys.geometry.service".timeScale = "1.0"

{ansys_pyensight_core-0.8.5 → ansys_pyensight_core-0.8.6}/src/ansys/pyensight/core/exts/ansys.geometry.serviceui/ansys/geometry/serviceui/extension.py

@@ -20,6 +20,7 @@ class AnsysGeometryServiceUIExtension(omni.ext.IExt):
         self._temporal_w = None
         self._vrmode_w = None
         self._normalize_w = None
+        self._time_scale_w = None
         self._connect_w = None
         self._update_w = None
         self._connected = False
@@ -38,7 +39,7 @@ class AnsysGeometryServiceUIExtension(omni.ext.IExt):
         self._logger.error(text)
 
     def launch_server(self) -> None:
-        if self._connected:
+        if self.service.is_server_running():
             return
         self.service.dsg_uri = self._dsg_uri_w.model.as_string
         self.service.security_token = self._dsg_token_w.model.as_string
@@ -46,7 +47,14 @@ class AnsysGeometryServiceUIExtension(omni.ext.IExt):
         self.service.temporal = self._temporal_w.model.as_bool
         self.service.vrmode = self._vrmode_w.model.as_bool
         self.service.normalize_geometry = self._normalize_w.model.as_bool
+        scale = self._time_scale_w.model.as_float
+        if scale <= 0.0:
+            scale = 1.0
+        self.service.time_scale = scale
         self.service.launch_server()
+        if not self.service.is_server_running():
+            self.error("Failed to launch omniverse service.")
+            return
 
         # parse the DSG USI
         parsed = urlparse(self.service.dsg_uri)
@@ -60,6 +68,9 @@ class AnsysGeometryServiceUIExtension(omni.ext.IExt):
             host=host, port=port, secret_key=self.service.security_token
         )
         self._grpc.connect()
+        if not self._grpc.is_connected():
+            self.error(f"Failed to connect to DSG service {host}:{port}")
+            return
 
         self.info("Connected to DSG service")
         self._connected = True
@@ -69,6 +80,7 @@ class AnsysGeometryServiceUIExtension(omni.ext.IExt):
             return
         self.service.stop_server()
         self._grpc.shutdown()
+        self._grpc = None
 
         self.info("Disconnect from DSG service")
         self._connected = False
@@ -104,12 +116,15 @@ class AnsysGeometryServiceUIExtension(omni.ext.IExt):
     def update_ui(self) -> None:
         if self._connected:
             self._connect_w.text = "Disconnect from DSG Server"
+            self._label_w.text = f"Connected to: {self.service.dsg_uri}"
         else:
             self._connect_w.text = "Connect to DSG Server"
+            self._label_w.text = "No connected DSG server"
         self._update_w.enabled = self._connected
         self._temporal_w.enabled = True
         self._vrmode_w.enabled = not self._connected
         self._normalize_w.enabled = not self._connected
+        self._time_scale_w.enabled = not self._connected
         self._dsg_uri_w.enabled = not self._connected
         self._dsg_token_w.enabled = not self._connected
         self._omni_uri_w.enabled = not self._connected
@@ -151,6 +166,13 @@ class AnsysGeometryServiceUIExtension(omni.ext.IExt):
                         self._normalize_w.model.set_value(self.service.normalize_geometry)
                         ui.Label("Normalize", alignment=ui.Alignment.LEFT_CENTER)
 
+                with ui.HStack(spacing=5):
+                    ui.Label(
+                        "Temporal scaling factor:", alignment=ui.Alignment.RIGHT_CENTER, width=0
+                    )
+                    self._time_scale_w = ui.FloatField()
+                    self._time_scale_w.model.as_float = self.service.time_scale
+
                 with ui.HStack():
                     self._connect_w = ui.Button("Connect to DSG Server", clicked_fn=self.connect_cb)
                     self._update_w = ui.Button("Request Update", clicked_fn=self.update_cb)
@@ -166,5 +188,6 @@ class AnsysGeometryServiceUIExtension(omni.ext.IExt):
         self._temporal_w = None
         self._vrmode_w = None
         self._normalize_w = None
+        self._time_scale_w = None
         self._connect_w = None
         self._update_w = None

{ansys_pyensight_core-0.8.5 → ansys_pyensight_core-0.8.6}/src/ansys/pyensight/core/exts/ansys.geometry.serviceui/config/extension.toml

@@ -1,6 +1,6 @@
 [package]
 # Semantic Versioning is used: https://semver.org/
-version = "0.8.5"
+version = "0.8.6"
 
 # Lists people or organizations that are considered the "authors" of the package.
 authors = ["ANSYS"]

{ansys_pyensight_core-0.8.5 → ansys_pyensight_core-0.8.6}/src/ansys/pyensight/core/utils/dsg_server.py

@@ -349,6 +349,7 @@ class DSGSession(object):
         verbose: int = 0,
         normalize_geometry: bool = False,
         vrmode: bool = False,
+        time_scale: float = 1.0,
         handler: UpdateHandler = UpdateHandler(),
     ):
         """
@@ -378,6 +379,9 @@ class DSGSession(object):
         vrmode : bool
             If True, do not include the EnSight camera in the generated view group. The default
             is to include the EnSight view in the scene transformations.
+        time_scale : float
+            All DSG protobuffers time values will be multiplied by this factor after
+            being received.  The default is ``1.0``.
         handler : UpdateHandler
             This is an UpdateHandler subclass that is called back when the state of
             a scene transfer changes.  For example, methods are called when the
@@ -394,6 +398,7 @@ class DSGSession(object):
         self._dsg = None
         self._normalize_geometry = normalize_geometry
         self._vrmode = vrmode
+        self._time_scale = time_scale
         self._time_limits = [
             sys.float_info.max,
             -sys.float_info.max,
@@ -709,5 +714,7 @@ class DSGSession(object):
         self._scene_bounds = None
         self._groups[view.id] = view
         if len(view.timeline) == 2:
+            view.timeline[0] *= self._time_scale
+            view.timeline[1] *= self._time_scale
             self.cur_timeline = [view.timeline[0], view.timeline[1]]
         self._callback_handler.add_group(view.id, view=True)

{ansys_pyensight_core-0.8.5 → ansys_pyensight_core-0.8.6}/src/ansys/pyensight/core/utils/omniverse_dsg_server.py

@@ -314,10 +314,11 @@ class OmniverseWrapper:
         diffuse=[1.0, 1.0, 1.0, 1.0],
         variable=None,
         timeline=[0.0, 0.0],
+        first_timestep=False,
     ):
         # 1D texture map for variables https://graphics.pixar.com/usd/release/tut_simple_shading.html
         # create the part usd object
-        partname = self.clean_name(name + str(timeline[0]))
+        partname = self.clean_name(name + str(id) + str(timeline[0]))
         stage_name = "/Parts/" + partname + ".usd"
         part_stage_url = self.stage_url(stage_name)
         omni.client.delete(part_stage_url)
@@ -363,7 +364,10 @@ class OmniverseWrapper:
         )
         timestep_prim = UsdGeom.Xform.Define(self._stage, timestep_group_path)
         visibility_attr = UsdGeom.Imageable(timestep_prim).GetVisibilityAttr()
-        visibility_attr.Set("invisible", Usd.TimeCode.EarliestTime())
+        if first_timestep:
+            visibility_attr.Set("inherited", Usd.TimeCode.EarliestTime())
+        else:
+            visibility_attr.Set("invisible", Usd.TimeCode.EarliestTime())
         visibility_attr.Set("inherited", timeline[0])
         # Final timestep has timeline[0]==timeline[1].  Leave final timestep visible.
         if timeline[0] < timeline[1]:
@@ -685,7 +689,7 @@ class OmniverseUpdateHandler(UpdateHandler):
         if command is None:
             return
         parent_prim = self._group_prims[command.parent_id]
-        obj_id = self._session.mesh_block_count
+        obj_id = self.session.mesh_block_count
         matrix = command.matrix4x4
         name = command.name
         color = [
@@ -707,6 +711,7 @@ class OmniverseUpdateHandler(UpdateHandler):
             diffuse=color,
             variable=var_cmd,
             timeline=self.session.cur_timeline,
+            first_timestep=(self.session.cur_timeline[0] == self.session.time_limits[0]),
         )
         super().finalize_part(part)