pyedb 0.25.0__tar.gz → 0.26.1__tar.gz

{pyedb-0.25.0 → pyedb-0.26.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyedb
-Version: 0.25.0
+Version: 0.26.1
 Summary: Higher-Level Pythonic Ansys Electronics Data Base
 Author-email: "ANSYS, Inc." <pyansys.core@ansys.com>
 Maintainer-email: PyEDB developers <simon.vandenbrouck@ansys.com>
@@ -15,7 +15,7 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Requires-Dist: cffi>=1.16.0,<1.17; platform_system=='Linux'
+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'
@@ -26,14 +26,14 @@ Requires-Dist: Rtree >= 1.2.0
 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.35 ; extra == "doc"
+Requires-Dist: imageio>=2.30.0,<2.36 ; extra == "doc"
 Requires-Dist: ipython>=8.13.0,<8.27 ; 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"
 Requires-Dist: nbsphinx>=0.9.0,<0.10 ; extra == "doc"
 Requires-Dist: nbconvert < 7.17 ; extra == "doc"
-Requires-Dist: numpydoc>=1.5.0,<1.8 ; extra == "doc"
+Requires-Dist: numpydoc>=1.5.0,<1.9 ; extra == "doc"
 Requires-Dist: pypandoc>=1.10.0,<1.14 ; extra == "doc"
 Requires-Dist: recommonmark ; extra == "doc"
 Requires-Dist: Sphinx>=7.1.0,<8.1 ; extra == "doc"

{pyedb-0.25.0 → pyedb-0.26.1}/pyproject.toml

@@ -25,7 +25,7 @@ classifiers = [
 ]
 
 dependencies = [
-    "cffi>=1.16.0,<1.17; platform_system=='Linux'",
+    "cffi>=1.16.0,<1.18; platform_system=='Linux'",
     "pywin32 >= 303;platform_system=='Windows'",
     "ansys-pythonnet >= 3.1.0rc3",
     "dotnetcore2 ==3.1.23;platform_system=='Linux'",
@@ -48,14 +48,14 @@ tests = [
 ]
 doc = [
     "ansys-sphinx-theme>=0.10.0,<1.1",
-    "imageio>=2.30.0,<2.35",
+    "imageio>=2.30.0,<2.36",
     "ipython>=8.13.0,<8.27",
     "jupyterlab>=4.0.0,<4.3",
     "jupytext>=1.16.0,<1.17",
     "matplotlib>=3.5.0,<3.10",
     "nbsphinx>=0.9.0,<0.10",
     "nbconvert < 7.17",
-    "numpydoc>=1.5.0,<1.8",
+    "numpydoc>=1.5.0,<1.9",
     "pypandoc>=1.10.0,<1.14",
     # NOTE: Remove recommonmark once examples are reworked.
     "recommonmark",

{pyedb-0.25.0 → pyedb-0.26.1}/src/pyedb/__init__.py

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

{pyedb-0.25.0 → pyedb-0.26.1}/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
 
 
@@ -113,8 +113,11 @@ class Primitive(Connectable):
     @property
     def layer(self):
         """Get the primitive edb layer object."""
-        layer_name = self._edb_object.GetLayer().GetName()
-        return self._pedb.stackup.all_layers[layer_name]
+        obj = self._edb_object.GetLayer()
+        if obj.IsNull():
+            return None
+        else:
+            return self._pedb.stackup.find_layer_by_name(obj.GetName())
 
     @property
     def layer_name(self):
@@ -199,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.
@@ -292,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.25.0 → pyedb-0.26.1}/src/pyedb/dotnet/edb_core/cell/terminal/padstack_instance_terminal.py

@@ -84,8 +84,13 @@ class PadstackInstanceTerminal(Terminal):
             isRef=is_ref,
         )
         terminal = PadstackInstanceTerminal(self._pedb, terminal)
-
-        return terminal if not terminal.is_null else False
+        if terminal.is_null:
+            msg = f"Failed to create terminal. "
+            if name in self._pedb.terminals:
+                msg += f"Terminal {name} already exists."
+            raise Exception(msg)
+        else:
+            return terminal
 
     def _get_parameters(self):
         """Gets the parameters of the padstack instance terminal."""

{pyedb-0.25.0 → pyedb-0.26.1}/src/pyedb/dotnet/edb_core/cell/terminal/pingroup_terminal.py

@@ -56,7 +56,13 @@ class PinGroupTerminal(Terminal):
             is_ref,
         )
         term = PinGroupTerminal(self._pedb, term)
-        return term if not term.is_null else False
+        if term.is_null:
+            msg = f"Failed to create terminal. "
+            if name in self._pedb.terminals:
+                msg += f"Terminal {name} already exists."
+            raise Exception(msg)
+        else:
+            return term
 
     def pin_group(self):
         """Gets the pin group the terminal refers to."""

{pyedb-0.25.0 → pyedb-0.26.1}/src/pyedb/dotnet/edb_core/cell/terminal/point_terminal.py

@@ -59,4 +59,10 @@ class PointTerminal(Terminal):
             is_ref,
         )
         terminal = PointTerminal(self._pedb, terminal)
-        return terminal if not terminal.is_null else False
+        if terminal.is_null:
+            msg = f"Failed to create terminal. "
+            if name in self._pedb.terminals:
+                msg += f"Terminal {name} already exists."
+            raise Exception(msg)
+        else:
+            return terminal

{pyedb-0.25.0 → pyedb-0.26.1}/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.25.0 → pyedb-0.26.1}/src/pyedb/dotnet/edb_core/edb_data/layer_data.py

@@ -23,6 +23,13 @@
 from __future__ import absolute_import
 
 
+def layer_cast(pedb, edb_object):
+    if edb_object.IsStackupLayer():
+        return StackupLayerEdbClass(pedb, edb_object.Clone(), name=edb_object.GetName())
+    else:
+        return LayerEdbClass(pedb, edb_object.Clone(), name=edb_object.GetName())
+
+
 class LayerEdbClass(object):
     """Manages Edb Layers. Replaces EDBLayer."""
 

{pyedb-0.25.0 → pyedb-0.26.1}/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.25.0 → pyedb-0.26.1}/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.25.0 → pyedb-0.26.1}/src/pyedb/dotnet/edb_core/stackup.py

@@ -36,6 +36,7 @@ import warnings
 from pyedb.dotnet.edb_core.edb_data.layer_data import (
     LayerEdbClass,
     StackupLayerEdbClass,
+    layer_cast,
 )
 from pyedb.dotnet.edb_core.general import convert_py_list_to_net_list
 from pyedb.generic.general_methods import ET, generate_unique_name
@@ -284,10 +285,7 @@ class LayerCollection(object):
         layer_list = list(self._edb_object.Layers(self._pedb.edb_api.cell.layer_type_set.AllLayerSet))
         temp = dict()
         for i in layer_list:
-            if i.IsStackupLayer():
-                obj = StackupLayerEdbClass(self._pedb, i.Clone(), name=i.GetName())
-            else:
-                obj = LayerEdbClass(self._pedb, i.Clone(), name=i.GetName())
+            obj = layer_cast(self._pedb, i)
             temp[obj.name] = obj
         return temp
 
@@ -306,12 +304,20 @@ class LayerCollection(object):
         """
         return {name: obj for name, obj in self.all_layers.items() if obj.is_stackup_layer}
 
+    def find_layer_by_name(self, name: str):
+        """Finds a layer with the given name."""
+        obj = self._pedb.edb_api.cell._cell.Layer.FindByName(self._edb_object, name)
+        if obj.IsNull():
+            raise ValueError("Layer with name '{}' was not found.".format(name))
+        else:
+            return layer_cast(self._pedb, obj.Clone())
+
 
 class Stackup(LayerCollection):
     """Manages EDB methods for stackup accessible from `Edb.stackup` property."""
 
     def __getitem__(self, item):
-        return self.all_layers[item]
+        return self.find_layer_by_name(item)
 
     def __init__(self, pedb, edb_object=None):
         super().__init__(pedb, edb_object)
@@ -1800,7 +1806,7 @@ class Stackup(LayerCollection):
         temp_data = {name: 0 for name, _ in self.signal_layers.items()}
         outline_area = 0
         for i in self._pedb.modeler.primitives:
-            layer_name = i.layer.name
+            layer_name = i._edb_object.GetLayer().GetName()
             if layer_name.lower() == "outline":
                 if i.area() > outline_area:
                     outline_area = i.area()

pyedb-0.26.1/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.25.0 → pyedb-0.26.1}/src/pyedb/siwave.py

@@ -266,6 +266,16 @@ class Siwave(object):  # pragma no cover
         else:
             return False
 
+    @property
+    def file_dir(self) -> str:
+        """Directory path of the open project."""
+        return self.oproject.GetFileDir()
+
+    @property
+    def file_path(self) -> str:
+        """Path of the open project file."""
+        return self.oproject.GetFilePath()
+
     def save_project(self, projectpath=None, projectName=None):
         """Save the project.
 
@@ -283,7 +293,9 @@ class Siwave(object):  # pragma no cover
 
         """
         if projectName and projectpath:
-            self.oproject.ScrSaveProjectAs(os.path.join(projectpath, projectName + ".siw"))
+            if not projectName.endswith(".siw"):
+                projectName = projectName + ".siw"
+            self.oproject.ScrSaveProjectAs(os.path.join(projectpath, projectName))
         else:
             self.oproject.Save()
         return True
@@ -476,6 +488,7 @@ class Siwave(object):  # pragma no cover
         if isinstance(file_path, Path):
             file_path = str(file_path)
         flag = self.oproject.ScrImportEDB(file_path)
+        # self.save_project(self.di)
         if flag == 0:
             self._logger.info(f"Importing EDB to {file_path}.")
             return True
@@ -493,11 +506,12 @@ class Siwave(object):  # pragma no cover
         if isinstance(file_path, Path):
             file_path = str(file_path)
 
-        temp_folder = tempfile.TemporaryDirectory(suffix=".ansys")
-        temp_edb = os.path.join(temp_folder.name, "temp.aedb")
+        # 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")
 
         self.export_edb(temp_edb)
-        self.save_project()
         self.oproject.ScrCloseProject()
         edbapp = Edb(temp_edb, edbversion=self.current_version)
         edbapp.configuration.load(file_path)

pyedb-0.25.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