pyedb 0.26.0__tar.gz → 0.26.2__tar.gz

{pyedb-0.26.0 → pyedb-0.26.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyedb
-Version: 0.26.0
+Version: 0.26.2
 Summary: Higher-Level Pythonic Ansys Electronics Data Base
 Author-email: "ANSYS, Inc." <pyansys.core@ansys.com>
 Maintainer-email: PyEDB developers <simon.vandenbrouck@ansys.com>
@@ -19,7 +19,7 @@ Requires-Dist: cffi>=1.16.0,<1.18; platform_system=='Linux'
 Requires-Dist: pywin32 >= 303;platform_system=='Windows'
 Requires-Dist: ansys-pythonnet >= 3.1.0rc3
 Requires-Dist: dotnetcore2 ==3.1.23;platform_system=='Linux'
-Requires-Dist: numpy>=1.20.0,<2
+Requires-Dist: numpy>=1.20.0,<2.2
 Requires-Dist: pandas>=1.1.0,<2.3
 Requires-Dist: pydantic>=2.6.4,<2.9
 Requires-Dist: Rtree >= 1.2.0
@@ -27,7 +27,7 @@ Requires-Dist: toml == 0.10.2
 Requires-Dist: scikit-rf
 Requires-Dist: ansys-sphinx-theme>=0.10.0,<1.1 ; extra == "doc"
 Requires-Dist: imageio>=2.30.0,<2.36 ; extra == "doc"
-Requires-Dist: ipython>=8.13.0,<8.27 ; extra == "doc"
+Requires-Dist: ipython>=8.13.0,<8.28 ; extra == "doc"
 Requires-Dist: jupyterlab>=4.0.0,<4.3 ; extra == "doc"
 Requires-Dist: jupytext>=1.16.0,<1.17 ; extra == "doc"
 Requires-Dist: matplotlib>=3.5.0,<3.10 ; extra == "doc"

{pyedb-0.26.0 → pyedb-0.26.2}/pyproject.toml

@@ -29,7 +29,7 @@ dependencies = [
     "pywin32 >= 303;platform_system=='Windows'",
     "ansys-pythonnet >= 3.1.0rc3",
     "dotnetcore2 ==3.1.23;platform_system=='Linux'",
-    "numpy>=1.20.0,<2",
+    "numpy>=1.20.0,<2.2",
     "pandas>=1.1.0,<2.3",
     "pydantic>=2.6.4,<2.9",
     "Rtree >= 1.2.0",
@@ -49,7 +49,7 @@ tests = [
 doc = [
     "ansys-sphinx-theme>=0.10.0,<1.1",
     "imageio>=2.30.0,<2.36",
-    "ipython>=8.13.0,<8.27",
+    "ipython>=8.13.0,<8.28",
     "jupyterlab>=4.0.0,<4.3",
     "jupytext>=1.16.0,<1.17",
     "matplotlib>=3.5.0,<3.10",

{pyedb-0.26.0 → pyedb-0.26.2}/src/pyedb/__init__.py

@@ -44,7 +44,7 @@ deprecation_warning()
 #
 
 pyedb_path = os.path.dirname(__file__)
-__version__ = "0.26.0"
+__version__ = "0.26.2"
 version = __version__
 
 #

{pyedb-0.26.0 → pyedb-0.26.2}/src/pyedb/dotnet/edb.py

@@ -4411,12 +4411,19 @@ class Edb(Database):
         if not temp_directory:
             self.logger.error("Temp directory must be provided when creating model foe arbitrary wave port")
             return False
+        if mounting_side not in ["top", "bottom"]:
+            self.logger.error(
+                "Mounting side must be provided and only `top` or `bottom` are supported. Setting to "
+                "`top` will take the top layer from the current design as reference. Setting to `bottom` "
+                "will take the bottom one."
+            )
         if not output_edb:
             output_edb = os.path.join(temp_directory, "waveport_model.aedb")
         if os.path.isdir(temp_directory):
             shutil.rmtree(temp_directory)
+        os.mkdir(temp_directory)
         reference_layer = list(self.stackup.signal_layers.keys())[0]
-        if mounting_side.lower == "bottom":
+        if mounting_side.lower() == "bottom":
             reference_layer = list(self.stackup.signal_layers.keys())[-1]
         if not signal_nets:
             signal_nets = list(self.nets.signal.keys())
@@ -4462,25 +4469,31 @@ class Edb(Database):
             )
             return False
         cloned_edb = Edb(edbpath=output_edb, edbversion=self.edbversion)
-        cloned_edb.stackup.add_layer(layer_name="ref", layer_type="signal", thickness=0.0, material="pec")
+
         cloned_edb.stackup.add_layer(
             layer_name="ports",
             layer_type="signal",
             thickness=self.stackup.signal_layers[reference_layer].thickness,
             material="pec",
         )
-        box_thick = "100um"
         if launching_box_thickness:
-            box_thick = self.edb_value(launching_box_thickness).ToString()
-        if mounting_side == "top":
-            cloned_edb.stackup.add_layer(
-                layer_name="port_pec", layer_type="signal", thickness=box_thick, method="add_on_bottom", material="pec"
-            )
-        else:
-            cloned_edb.stackup.add_layer(
-                layer_name="port_pec", layer_type="signal", thickness=box_thick, method="add_on_top", material="pec"
-            )
-
+            launching_box_thickness = self.edb_value(launching_box_thickness).ToString()
+        cloned_edb.stackup.add_layer(
+            layer_name="ref",
+            layer_type="signal",
+            thickness=0.0,
+            material="pec",
+            method=f"add_on_{mounting_side}",
+            base_layer="ports",
+        )
+        cloned_edb.stackup.add_layer(
+            layer_name="port_pec",
+            layer_type="signal",
+            thickness=launching_box_thickness,
+            method=f"add_on_{mounting_side}",
+            material="pec",
+            base_layer="ports",
+        )
         for void_info in void_padstacks:
             port_poly = cloned_edb.modeler.create_polygon(
                 main_shape=void_info[0].polygon_data._edb_object, layer_name="ref", net_name="GND"

{pyedb-0.26.0 → pyedb-0.26.2}/src/pyedb/dotnet/edb_core/cell/primitive/primitive.py

@@ -19,11 +19,11 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
-import math
 
 from pyedb.dotnet.edb_core.cell.connectable import Connectable
 from pyedb.dotnet.edb_core.general import convert_py_list_to_net_list
 from pyedb.dotnet.edb_core.geometry.polygon_data import PolygonData
+from pyedb.misc.utilities import compute_arc_points
 from pyedb.modeler.geometry_operators import GeometryOperators
 
 
@@ -202,80 +202,6 @@ class Primitive(Connectable):
     def is_negative(self, value):
         self._edb_object.SetIsNegative(value)
 
-    @staticmethod
-    def _eval_arc_points(p1, p2, h, n=6, tol=1e-12):
-        """Get the points of the arc
-
-        Parameters
-        ----------
-        p1 : list
-            Arc starting point.
-        p2 : list
-            Arc ending point.
-        h : float
-            Arc height.
-        n : int
-            Number of points to generate along the arc.
-        tol : float
-            Geometric tolerance.
-
-        Returns
-        -------
-        list, list
-            Points generated along the arc.
-        """
-        # fmt: off
-        if abs(h) < tol:
-            return [], []
-        elif h > 0:
-            reverse = False
-            x1 = p1[0]
-            y1 = p1[1]
-            x2 = p2[0]
-            y2 = p2[1]
-        else:
-            reverse = True
-            x1 = p2[0]
-            y1 = p2[1]
-            x2 = p1[0]
-            y2 = p1[1]
-            h *= -1
-        xa = (x2 - x1) / 2
-        ya = (y2 - y1) / 2
-        xo = x1 + xa
-        yo = y1 + ya
-        a = math.sqrt(xa ** 2 + ya ** 2)
-        if a < tol:
-            return [], []
-        r = (a ** 2) / (2 * h) + h / 2
-        if abs(r - a) < tol:
-            b = 0
-            th = 2 * math.asin(1)  # chord angle
-        else:
-            b = math.sqrt(r ** 2 - a ** 2)
-            th = 2 * math.asin(a / r)  # chord angle
-
-        # center of the circle
-        xc = xo + b * ya / a
-        yc = yo - b * xa / a
-
-        alpha = math.atan2((y1 - yc), (x1 - xc))
-        xr = []
-        yr = []
-        for i in range(n):
-            i += 1
-            dth = (float(i) / (n + 1)) * th
-            xi = xc + r * math.cos(alpha - dth)
-            yi = yc + r * math.sin(alpha - dth)
-            xr.append(xi)
-            yr.append(yi)
-
-        if reverse:
-            xr.reverse()
-            yr.reverse()
-        # fmt: on
-        return xr, yr
-
     def _get_points_for_plot(self, my_net_points, num):
         """
         Get the points to be plotted.
@@ -295,7 +221,7 @@ class Primitive(Connectable):
                     p2 = [my_net_points[i + 1].X.ToDouble(), my_net_points[i + 1].Y.ToDouble()]
                 else:
                     p2 = [my_net_points[0].X.ToDouble(), my_net_points[0].Y.ToDouble()]
-                x_arc, y_arc = self._eval_arc_points(p1, p2, arc_h, num)
+                x_arc, y_arc = compute_arc_points(p1, p2, arc_h, num)
                 x.extend(x_arc)
                 y.extend(y_arc)
                 # i += 1

{pyedb-0.26.0 → pyedb-0.26.2}/src/pyedb/dotnet/edb_core/dotnet/primitive.py

@@ -21,8 +21,10 @@
 # SOFTWARE.
 
 """Primitive."""
+
 from pyedb.dotnet.edb_core.dotnet.database import NetDotNet
 from pyedb.dotnet.edb_core.general import convert_py_list_to_net_list
+from pyedb.misc.utilities import compute_arc_points
 from pyedb.modeler.geometry_operators import GeometryOperators
 
 
@@ -256,11 +258,10 @@ class PrimitiveDotNet:
         """
         self.prim_obj.MakeZonePrimitive(zone_id)
 
-    def _get_points_for_plot(self, my_net_points, num):
+    def _get_points_for_plot(self, my_net_points, n=6, tol=1e-12):
         """
         Get the points to be plot
         """
-        # fmt: off
         x = []
         y = []
         for i, point in enumerate(my_net_points):
@@ -276,11 +277,9 @@ class PrimitiveDotNet:
                     p2 = [my_net_points[i + 1].X.ToDouble(), my_net_points[i + 1].Y.ToDouble()]
                 else:
                     p2 = [my_net_points[0].X.ToDouble(), my_net_points[0].Y.ToDouble()]
-                x_arc, y_arc = self._eval_arc_points(p1, p2, arc_h, num)
+                x_arc, y_arc = compute_arc_points(p1, p2, arc_h, n, tol)
                 x.extend(x_arc)
                 y.extend(y_arc)
-                # i += 1
-        # fmt: on
         return x, y
 
     def points(self, arc_segments=6):

{pyedb-0.26.0 → pyedb-0.26.2}/src/pyedb/dotnet/edb_core/edb_data/primitives_data.py

@@ -488,7 +488,7 @@ class EDBArcs(object):
         """
         try:
             my_net_points = self.points_raw
-            xt, yt = self._app._get_points_for_plot(my_net_points, arc_segments)
+            xt, yt = self._app._active_cell.primitive._get_points_for_plot(my_net_points, arc_segments)
             if not xt:
                 return []
             x, y = GeometryOperators.orient_polygon(xt, yt, clockwise=True)

{pyedb-0.26.0 → pyedb-0.26.2}/src/pyedb/dotnet/edb_core/nets.py

@@ -22,7 +22,6 @@
 
 from __future__ import absolute_import  # noreorder
 
-import math
 import os
 import time
 import warnings
@@ -30,6 +29,7 @@ import warnings
 from pyedb.dotnet.edb_core.edb_data.nets_data import EDBNetsData
 from pyedb.generic.constants import CSS4_COLORS
 from pyedb.generic.general_methods import generate_unique_name
+from pyedb.misc.utilities import compute_arc_points
 from pyedb.modeler.geometry_operators import GeometryOperators
 
 
@@ -354,80 +354,6 @@ class EdbNets(object):
 
         return _extended_nets
 
-    @staticmethod
-    def _eval_arc_points(p1, p2, h, n=6, tol=1e-12):
-        """Get the points of the arc.
-
-        Parameters
-        ----------
-        p1 : list
-            Arc starting point.
-        p2 : list
-            Arc ending point.
-        h : float
-            Arc height.
-        n : int
-            Number of points to generate along the arc.
-        tol : float
-            Geometric tolerance.
-
-        Returns
-        -------
-        list
-            points generated along the arc.
-        """
-        # fmt: off
-        if abs(h) < tol:
-            return [], []
-        elif h > 0:
-            reverse = False
-            x1 = p1[0]
-            y1 = p1[1]
-            x2 = p2[0]
-            y2 = p2[1]
-        else:
-            reverse = True
-            x1 = p2[0]
-            y1 = p2[1]
-            x2 = p1[0]
-            y2 = p1[1]
-            h *= -1
-        xa = (x2 - x1) / 2
-        ya = (y2 - y1) / 2
-        xo = x1 + xa
-        yo = y1 + ya
-        a = math.sqrt(xa ** 2 + ya ** 2)
-        if a < tol:
-            return [], []
-        r = (a ** 2) / (2 * h) + h / 2
-        if abs(r - a) < tol:
-            b = 0
-            th = 2 * math.asin(1)  # chord angle
-        else:
-            b = math.sqrt(r ** 2 - a ** 2)
-            th = 2 * math.asin(a / r)  # chord angle
-
-        # center of the circle
-        xc = xo + b * ya / a
-        yc = yo - b * xa / a
-
-        alpha = math.atan2((y1 - yc), (x1 - xc))
-        xr = []
-        yr = []
-        for i in range(n):
-            i += 1
-            dth = (i / (n + 1)) * th
-            xi = xc + r * math.cos(alpha - dth)
-            yi = yc + r * math.sin(alpha - dth)
-            xr.append(xi)
-            yr.append(yi)
-
-        if reverse:
-            xr.reverse()
-            yr.reverse()
-        # fmt: on
-        return xr, yr
-
     def _get_points_for_plot(self, my_net_points):
         """
         Get the points to be plot
@@ -448,7 +374,7 @@ class EdbNets(object):
                     p2 = [my_net_points[i + 1].X.ToDouble(), my_net_points[i + 1].Y.ToDouble()]
                 else:
                     p2 = [my_net_points[0].X.ToDouble(), my_net_points[0].Y.ToDouble()]
-                x_arc, y_arc = self._eval_arc_points(p1, p2, arc_h)
+                x_arc, y_arc = compute_arc_points(p1, p2, arc_h)
                 x.extend(x_arc)
                 y.extend(y_arc)
                 # i += 1

pyedb-0.26.2/src/pyedb/misc/utilities.py

@@ -0,0 +1,100 @@
+# Copyright (C) 2023 - 2024 ANSYS, Inc. and/or its affiliates.
+# SPDX-License-Identifier: MIT
+#
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+"""Module gathering utility functions for PyEDB modules."""
+
+
+import math
+
+
+def compute_arc_points(p1, p2, h, n=6, tol=1e-12):
+    """Get the points of the arc.
+
+    Parameters
+    ----------
+    p1 : list
+        Arc starting point.
+    p2 : list
+        Arc ending point.
+    h : float
+        Arc height.
+    n : int
+        Number of points to generate along the arc.
+    tol : float
+        Geometric tolerance.
+
+    Returns
+    -------
+    list, list
+        Points generated along the arc.
+    """
+    if abs(h) < tol:
+        return [], []
+    elif h > 0:
+        reverse = False
+        x1 = p1[0]
+        y1 = p1[1]
+        x2 = p2[0]
+        y2 = p2[1]
+    else:
+        reverse = True
+        x1 = p2[0]
+        y1 = p2[1]
+        x2 = p1[0]
+        y2 = p1[1]
+        h *= -1
+
+    xa = (x2 - x1) / 2
+    ya = (y2 - y1) / 2
+    xo = x1 + xa
+    yo = y1 + ya
+    a = math.sqrt(xa**2 + ya**2)
+    if a < tol:
+        return [], []
+    r = (a**2) / (2 * h) + h / 2
+    if abs(r - a) < tol:
+        b = 0
+        th = 2 * math.asin(1)  # chord angle
+    else:
+        b = math.sqrt(r**2 - a**2)
+        th = 2 * math.asin(a / r)  # chord angle
+
+    # Center of the circle
+    xc = xo + b * ya / a
+    yc = yo - b * xa / a
+
+    alpha = math.atan2((y1 - yc), (x1 - xc))
+    xr = []
+    yr = []
+    for i in range(n):
+        i += 1
+        dth = (float(i) / (n + 1)) * th
+        xi = xc + r * math.cos(alpha - dth)
+        yi = yc + r * math.sin(alpha - dth)
+        xr.append(xi)
+        yr.append(yi)
+
+    if reverse:
+        xr.reverse()
+        yr.reverse()
+
+    return xr, yr

{pyedb-0.26.0 → pyedb-0.26.2}/src/pyedb/siwave.py

@@ -11,6 +11,7 @@ from __future__ import absolute_import  # noreorder
 import os
 from pathlib import Path
 import pkgutil
+import shutil
 import sys
 import tempfile
 import time
@@ -19,7 +20,7 @@ import warnings
 from pyedb import Edb
 from pyedb.dotnet.clr_module import _clr
 from pyedb.edb_logger import pyedb_logger
-from pyedb.generic.general_methods import _pythonver, is_windows
+from pyedb.generic.general_methods import _pythonver, generate_unique_name, is_windows
 from pyedb.misc.misc import list_installed_ansysem
 from pyedb.siwave_core.icepak import Icepak
 
@@ -63,6 +64,11 @@ class Siwave(object):  # pragma no cover
 
     """
 
+    @property
+    def version(self):
+        ver = self.oSiwave.GetVersion()
+        return ".".join(ver.split(".")[:-1])
+
     @property
     def version_keys(self):
         """Version keys for AEDT."""
@@ -330,6 +336,7 @@ class Siwave(object):  # pragma no cover
 
         """
         self._main.oSiwave.Quit()
+        self._main.oSiwave = None
         return True
 
     def export_element_data(self, simulation_name, file_path, data_type="Vias"):
@@ -509,16 +516,17 @@ class Siwave(object):  # pragma no cover
         # temp_folder = tempfile.TemporaryDirectory(suffix=".ansys")
         # temp_edb = os.path.join(temp_folder.name, "temp.aedb")
 
-        temp_edb = os.path.join(self.file_dir, "temp.aedb")
+        temp_edb = os.path.join(tempfile.gettempdir(), generate_unique_name("temp") + ".aedb")
 
         self.export_edb(temp_edb)
         self.oproject.ScrCloseProject()
-        edbapp = Edb(temp_edb, edbversion=self.current_version)
+        edbapp = Edb(temp_edb, edbversion=self.version)
         edbapp.configuration.load(file_path)
         edbapp.configuration.run()
         edbapp.save()
         edbapp.close()
         self.import_edb(temp_edb)
+        shutil.rmtree(Path(temp_edb), ignore_errors=True)
 
     def export_configuration(self, file_path: str):
         """Export layout information into a configuration file.

pyedb-0.26.0/src/pyedb/misc/utilities.py

@@ -1,27 +0,0 @@
-from distutils.dir_util import copy_tree
-
-
-class file_tools:
-    def __init__(self):
-        pass
-
-    @staticmethod
-    def copy_folder(source_folder, destination_folder):
-        """
-
-        Parameters
-        ----------
-        source_folder : str
-            source folder
-
-        destination_folder : str
-            destination folder.
-
-
-        Returns
-        -------
-
-        """
-
-        copy_tree(source_folder, destination_folder)
-        return True