pyedb 0.36.0__tar.gz → 0.37.0__tar.gz

{pyedb-0.36.0 → pyedb-0.37.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pyedb
-Version: 0.36.0
+Version: 0.37.0
 Summary: Higher-Level Pythonic Ansys Electronics Data Base
 Author-email: "ANSYS, Inc." <pyansys.core@ansys.com>
 Maintainer-email: PyEDB developers <simon.vandenbrouck@ansys.com>

{pyedb-0.36.0 → pyedb-0.37.0}/src/pyedb/__init__.py

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

{pyedb-0.36.0 → pyedb-0.37.0}/src/pyedb/configuration/cfg_ports_sources.py

@@ -33,6 +33,9 @@ class CfgTerminalInfo(CfgBase):
         self._pedb = pedb
         self.type = list(kwargs.keys())[0]
         self.value = kwargs[self.type]
+        self.contact_radius = kwargs.get("contact_radius", None)
+        self.num_of_contact = kwargs.get("num_of_contact", 1)
+        self.inline = kwargs.get("inline", False)
 
     def export_properties(self):
         return {self.type: self.value}
@@ -46,7 +49,6 @@ class CfgCoordianteTerminalInfo(CfgTerminalInfo):
         self.point_x = self.value["point"][0]
         self.point_y = self.value["point"][1]
         self.net = self.value["net"]
-        self.contact_radius = self.value.get("contact_radius", None)
 
     def export_properties(self):
         return {"coordinates": {"layer": self.layer, "point": [self.point_x, self.point_y], "net": self.net}}
@@ -245,8 +247,6 @@ class CfgCircuitElement(CfgBase):
             point = [self.positive_terminal_info.point_x, self.positive_terminal_info.point_y]
             net_name = self.positive_terminal_info.net
             pos_coor_terminal[self.name] = self._pedb.get_point_terminal(self.name, net_name, point, layer)
-            if self.positive_terminal_info.contact_radius:
-                pos_coor_terminal[self.name].contact_radius = self.positive_terminal_info.contact_radius
 
         elif pos_type == "pin_group":
             if self.distributed:
@@ -406,20 +406,24 @@ class CfgSource(CfgCircuitElement):
             if self.equipotential:
                 terms = [terminal, terminal.ref_terminal] if terminal.ref_terminal else [terminal]
                 for t in terms:
+                    if not t.is_reference_terminal:
+                        radius = self.positive_terminal_info.contact_radius
+                        num_of_contact = self.positive_terminal_info.num_of_contact
+                        inline = self.positive_terminal_info.inline
+                    else:
+                        radius = self.negative_terminal_info.contact_radius
+                        num_of_contact = self.negative_terminal_info.num_of_contact
+                        inline = self.negative_terminal_info.inline
+
                     pads = []
                     if t.terminal_type == "PadstackInstanceTerminal":
                         pads.append(t.reference_object)
-                        t._edb_object.dcir_equipotential_region = True
                     elif t.terminal_type == "PinGroupTerminal":
                         name = t._edb_object.GetPinGroup().GetName()
                         pg = self._pedb.siwave.pin_groups[name]
                         pads.extend([i for _, i in pg.pins.items()])
-                    elif t.terminal_type == "PointTerminal":
+                    elif t.terminal_type == "PointTerminal" and radius:
                         temp = [i for i in self._pedb.layout.terminals if i.name == t.name][0]
-                        if not temp.is_reference_terminal:
-                            radius = self.positive_terminal_info.contact_radius
-                        else:
-                            radius = self.negative_terminal_info.contact_radius
                         if radius is not None:
                             prim = self._pedb.modeler.create_circle(
                                 temp.layer.name, temp.location[0], temp.location[1], radius, temp.net_name
@@ -427,7 +431,7 @@ class CfgSource(CfgCircuitElement):
                             prim.dcir_equipotential_region = True
 
                     for i in pads:
-                        i._set_equipotential()
+                        i._set_equipotential(contact_radius=radius, inline=inline, num_of_contact=num_of_contact)
 
         return circuit_elements
 

{pyedb-0.36.0 → pyedb-0.37.0}/src/pyedb/dotnet/edb_core/cell/layout.py

@@ -220,7 +220,7 @@ class Layout(ObjBase):
         -------
         """
 
-        return [EDBNetsData(net, self._pedb) for net in self._edb_object.Nets]
+        return [EDBNetsData(net, self._pedb) for net in self._edb_object.Nets if net]
 
     @property
     def primitives(self):
@@ -230,7 +230,7 @@ class Layout(ObjBase):
         -------
         list of :class:`dotnet.edb_core.dotnet.primitive.PrimitiveDotNet` cast objects.
         """
-        return [primitive_cast(self._pedb, p) for p in self._edb_object.Primitives]
+        return [primitive_cast(self._pedb, p) for p in self._edb_object.Primitives if p]
 
     @property
     def bondwires(self):
@@ -331,16 +331,32 @@ class Layout(ObjBase):
         obj = self._pedb._edb.Cell.Hierarchy.Component.FindByName(self._edb_object, value)
         return EDBComponent(self._pedb, obj) if obj is not None else None
 
-    def find_primitive(self, layer_name: Union[str, list]) -> list:
+    def find_primitive(
+        self, layer_name: Union[str, list] = None, name: Union[str, list] = None, net_name: Union[str, list] = None
+    ) -> list:
         """Find a primitive objects by layer name.
 
         Parameters
         ----------
-        layer_name : str, list
+        layer_name : str, list, optional
             Name of the layer.
+        name : str, list, optional
+            Name of the primitive
+        net_name : str, list, optional
+            Name of the primitive
         Returns
         -------
         list
         """
-        layer_name = layer_name if isinstance(layer_name, list) else [layer_name]
-        return [i for i in self.primitives if i.layer_name in layer_name]
+        if layer_name is not None:
+            layer_name = layer_name if isinstance(layer_name, list) else [layer_name]
+        if name is not None:
+            name = name if isinstance(name, list) else [name]
+        if net_name is not None:
+            net_name = net_name if isinstance(net_name, list) else [net_name]
+
+        prims = self.primitives
+        prims = [i for i in prims if i.aedt_name in name] if name is not None else prims
+        prims = [i for i in prims if i.layer_name in layer_name] if layer_name is not None else prims
+        prims = [i for i in prims if i.net_name in net_name] if net_name is not None else prims
+        return prims

{pyedb-0.36.0 → pyedb-0.37.0}/src/pyedb/dotnet/edb_core/edb_data/nets_data.py

@@ -59,7 +59,7 @@ class EDBNetsData(NetDotNet):
         """
         from pyedb.dotnet.edb_core.cell.layout import primitive_cast
 
-        return [primitive_cast(self._app, i) for i in self.net_object.Primitives]
+        return [primitive_cast(self._app, i) for i in self.net_object.Primitives if i]
         # return [self._app.layout.find_object_by_id(i.GetId()) for i in self.net_object.Primitives]
 
     @property

{pyedb-0.36.0 → pyedb-0.37.0}/src/pyedb/dotnet/edb_core/edb_data/padstacks_data.py

@@ -24,6 +24,8 @@ from collections import OrderedDict
 import math
 import warnings
 
+import numpy as np
+
 from pyedb.dotnet.clr_module import String
 from pyedb.dotnet.edb_core.cell.primitive.primitive import Primitive
 from pyedb.dotnet.edb_core.dotnet.database import PolygonDataDotNet
@@ -1247,10 +1249,50 @@ class EDBPadstackInstance(Primitive):
 
         return self._pedb.create_port(terminal, ref_terminal, is_circuit_port)
 
-    def _set_equipotential(self):
+    def _set_equipotential(self, contact_radius=None, inline=False, num_of_contact=1):
         """Workaround solution. Remove when EDBAPI bug is fixed for dcir_equipotential_region."""
         pad = self.definition.pad_by_layer[self.start_layer]
-        if pad.shape.lower() == "circle":
+
+        pos_x, pos_y = self.position
+        comp_rotation = self._pedb.edb_value(self.component.rotation).ToDouble() % 3.141592653589793
+
+        if contact_radius is not None:
+            if num_of_contact == 1:
+                prim = self._pedb.modeler.create_circle(pad.layer_name, pos_x, pos_y, contact_radius, self.net_name)
+                prim.dcir_equipotential_region = True
+            else:
+                if pad.shape.lower() in ["rectangle", "oval"]:
+                    width, height = pad.parameters_values[0:2]
+                    radius = self._pedb.edb_value(contact_radius).ToDouble()
+                else:
+                    return
+
+                if inline is False:
+                    x_offset = width / 2 - radius if comp_rotation == 0 else height / 2 - radius
+                    y_offset = height / 2 - radius if comp_rotation == 0 else width / 2 - radius
+                    positions = []
+                    for x, y in [[1, 1], [-1, 1], [1, -1], [-1, -1]]:
+                        positions.append([x_offset * x, y_offset * y])
+                else:
+                    if width > height:
+                        offset = (width - radius * 2) / (num_of_contact - 1)
+                    else:
+                        offset = (height - radius * 2) / (num_of_contact - 1)
+
+                    start_pos = (num_of_contact - 1) / 2
+                    offset = [offset * i for i in np.arange(start_pos * -1, start_pos + 1)]
+
+                    if (width > height and comp_rotation == 0) or (width < height and comp_rotation != 0):
+                        positions = list(zip(offset, [0] * num_of_contact))
+                    else:
+                        positions = list(zip([0] * num_of_contact, offset))
+
+                for x, y in positions:
+                    prim = self._pedb.modeler.create_circle(pad.layer_name, pos_x + x, pos_y + y, radius, self.net_name)
+                    prim.dcir_equipotential_region = True
+            return
+
+        elif pad.shape.lower() == "circle":
             ra = self._pedb.edb_value(pad.parameters_values[0] / 2)
             pos = self.position
             prim = self._pedb.modeler.create_circle(pad.layer_name, pos[0], pos[1], ra, self.net_name)
@@ -1265,9 +1307,16 @@ class EDBPadstackInstance(Primitive):
                 center_point=self.position,
                 rotation=self.component.rotation,
             )
-
+        elif pad.shape.lower() == "oval":
+            width, height, _ = pad.parameters_values
+            prim = self._pedb.modeler.create_circle(
+                pad.layer_name, self.position[0], self.position[1], height / 2, self.net_name
+            )
         elif pad.polygon_data:
-            prim = self._pedb.modeler.create_polygon(pad.polygon_data, self.start_layer, net_name=self.net_name)
+            prim = self._pedb.modeler.create_polygon(
+                pad.polygon_data._edb_object, self.start_layer, net_name=self.net_name
+            )
+            prim.move(self.position)
         else:
             return
         prim.dcir_equipotential_region = True
@@ -1579,7 +1628,7 @@ class EDBPadstackInstance(Primitive):
         layer_list = []
         start_layer_name = start_layer.GetName()
         stop_layer_name = stop_layer.GetName()
-        for layer_name in list(self._pedb.stackup.layers.keys()):
+        for layer_name in list(self._pedb.stackup.signal_layers.keys()):
             if started:
                 layer_list.append(layer_name)
                 if layer_name == stop_layer_name or layer_name == start_layer_name:

{pyedb-0.36.0 → pyedb-0.37.0}/src/pyedb/dotnet/edb_core/geometry/polygon_data.py

@@ -19,6 +19,7 @@
 # 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.
+from typing import Union
 
 from pyedb.dotnet.edb_core.general import convert_py_list_to_net_list
 from pyedb.dotnet.edb_core.geometry.point_data import PointData
@@ -128,3 +129,7 @@ class PolygonData:
             arcs = convert_py_list_to_net_list(arcs)
         poly = self._edb_object.CreateFromArcs(arcs, flag)
         return PolygonData(self._pedb, poly)
+
+    def point_in_polygon(self, x: Union[str, float], y: Union[str, float]) -> bool:
+        """Determines whether a point is inside the polygon."""
+        return self._edb_object.PointInPolygon(self._pedb.point_data(x, y))

{pyedb-0.36.0 → pyedb-0.37.0}/src/pyedb/dotnet/edb_core/modeler.py

@@ -661,8 +661,7 @@ class Modeler(object):
         else:
             polygonData = main_shape
         if not polygonData or polygonData.IsNull():
-            self._logger.error("Failed to create main shape polygon data")
-            return False
+            raise RuntimeError("Failed to create main shape polygon data")
         for void in voids:
             if isinstance(void, list):
                 void = self.Shape("polygon", points=void)