pyedb 0.27.0__py3-none-any.whl → 0.29.0__py3-none-any.whl

pyedb/dotnet/edb_core/nets.py

@@ -444,6 +444,7 @@ class EdbNets(object):
             codes.append(79)
             objects_lists.append([vertices, codes, "b", "Outline", 1.0, 1.5, "contour"])
             n_label += 1
+        layer_colors = {i: k.color for i, k in self._pedb.stackup.layers.items()}
         top_layer = list(self._pedb.stackup.signal_layers.keys())[0]
         bottom_layer = list(self._pedb.stackup.signal_layers.keys())[-1]
         if plot_components_on_top or plot_components_on_bottom:
@@ -481,206 +482,186 @@ class EdbNets(object):
                     objects_lists.append([vertices, codes, label_colors[label], None, 1.0, 2.0, "contour"])
                 nc += 1
             self._logger.debug("Plotted {} component(s)".format(nc))
-
-        for path in self._pedb.modeler.paths:
-            if path.is_void:
+        for prim in self._pedb.modeler.primitives:
+            if prim.is_void:
                 continue
-            net_name = path.net_name
-            layer_name = path.layer_name
+            net_name = prim.net_name
+            layer_name = prim.layer_name
             if nets and (net_name not in nets or layer_name not in layers):
                 continue
-            try:
-                x, y = path.points()
-            except ValueError:
-                x = None
-            if not x:
-                continue
-            create_label = False
-            if not color_by_net:
-                label = "Layer " + layer_name
-                if label not in label_colors:
-                    try:
-                        color = path.layer.GetColor()
-                        c = (
-                            float(color.Item1 / 255),
-                            float(color.Item2 / 255),
-                            float(color.Item3 / 255),
-                        )
-                    except:
-                        c = list(CSS4_COLORS.keys())[color_index]
+            prim_type = prim.primitive_type
+            if prim_type == "path":
+                try:
+                    x, y = prim.points()
+                except ValueError:
+                    x = None
+                if not x:
+                    continue
+                create_label = False
+                if not color_by_net:
+                    label = "Layer " + layer_name
+                    if label not in label_colors:
+                        try:
+                            color = layer_colors[layer_name]
+                            c = (
+                                float(color[0] / 255),
+                                float(color[1] / 255),
+                                float(color[2] / 255),
+                            )
+                        except:
+                            c = list(CSS4_COLORS.keys())[color_index]
+                            color_index += 1
+                            if color_index >= len(CSS4_COLORS):
+                                color_index = 0
+                        label_colors[label] = c
+                        create_label = True
+                else:
+                    label = "Net " + net_name
+                    if label not in label_colors:
+                        label_colors[label] = list(CSS4_COLORS.keys())[color_index]
                         color_index += 1
                         if color_index >= len(CSS4_COLORS):
                             color_index = 0
-                    label_colors[label] = c
-                    create_label = True
-            else:
-                label = "Net " + net_name
-                if label not in label_colors:
-                    label_colors[label] = list(CSS4_COLORS.keys())[color_index]
-                    color_index += 1
-                    if color_index >= len(CSS4_COLORS):
-                        color_index = 0
-                    create_label = True
-
-            if create_label and n_label <= max_labels:
-                objects_lists.append([x, y, label_colors[label], label, 0.4, "fill"])
-                n_label += 1
-            else:
-                objects_lists.append([x, y, label_colors[label], None, 0.4, "fill"])
+                        create_label = True
 
-        for poly in self._pedb.modeler.polygons:
-            if poly.is_void:
-                continue
-            net_name = poly.net_name
-            layer_name = poly.layer_name
-            if nets and (net_name != "" and net_name not in nets or layer_name not in layers):
-                continue
-            xt, yt = poly.points()
-            if not xt:
-                continue
-            x, y = GeometryOperators.orient_polygon(xt, yt, clockwise=True)
-            vertices = [(i, j) for i, j in zip(x, y)]
-            codes = [2 for _ in vertices]
-            codes[0] = 1
-            vertices.append((0, 0))
-            codes.append(79)
+                if create_label and n_label <= max_labels:
+                    objects_lists.append([x, y, label_colors[label], label, 0.4, "fill"])
+                    n_label += 1
+                else:
+                    objects_lists.append([x, y, label_colors[label], None, 0.4, "fill"])
+            elif prim_type == "polygon":
+                xt, yt = prim.points()
+                if not xt:
+                    continue
+                x, y = GeometryOperators.orient_polygon(xt, yt, clockwise=True)
+                vertices = [(i, j) for i, j in zip(x, y)]
+                codes = [2 for _ in vertices]
+                codes[0] = 1
+                vertices.append((0, 0))
+                codes.append(79)
 
-            for void in poly.voids:
-                xvt, yvt = void.points()
-                if xvt:
-                    xv, yv = GeometryOperators.orient_polygon(xvt, yvt, clockwise=False)
-                    tmpV = [(i, j) for i, j in zip(xv, yv)]
-                    vertices.extend(tmpV)
-                    tmpC = [2 for _ in tmpV]
-                    tmpC[0] = 1
-                    codes.extend(tmpC)
-                    vertices.append((0, 0))
-                    codes.append(79)
-
-            create_label = False
-            if not color_by_net:
-                label = "Layer " + layer_name
-                if label not in label_colors:
-                    try:
-                        color = poly.GetLayer().GetColor()
-                        c = (
-                            float(color.Item1 / 255),
-                            float(color.Item2 / 255),
-                            float(color.Item3 / 255),
-                        )
-                    except:
-                        c = list(CSS4_COLORS.keys())[color_index]
+                for void in prim.voids:
+                    xvt, yvt = void.points()
+                    if xvt:
+                        xv, yv = GeometryOperators.orient_polygon(xvt, yvt, clockwise=False)
+                        tmpV = [(i, j) for i, j in zip(xv, yv)]
+                        vertices.extend(tmpV)
+                        tmpC = [2 for _ in tmpV]
+                        tmpC[0] = 1
+                        codes.extend(tmpC)
+                        vertices.append((0, 0))
+                        codes.append(79)
+
+                create_label = False
+                if not color_by_net:
+                    label = "Layer " + layer_name
+                    if label not in label_colors:
+                        try:
+                            color = layer_colors[layer_name]
+                            c = (
+                                float(color[0] / 255),
+                                float(color[1] / 255),
+                                float(color[2] / 255),
+                            )
+                        except:
+                            c = list(CSS4_COLORS.keys())[color_index]
+                            color_index += 1
+                            if color_index >= len(CSS4_COLORS):
+                                color_index = 0
+                        label_colors[label] = c
+                        create_label = True
+                else:
+                    label = "Net " + net_name
+                    if label not in label_colors:
+                        label_colors[label] = list(CSS4_COLORS.keys())[color_index]
                         color_index += 1
                         if color_index >= len(CSS4_COLORS):
                             color_index = 0
-                    label_colors[label] = c
-                    create_label = True
-            else:
-                label = "Net " + net_name
-                if label not in label_colors:
-                    label_colors[label] = list(CSS4_COLORS.keys())[color_index]
-                    color_index += 1
-                    if color_index >= len(CSS4_COLORS):
-                        color_index = 0
-                    create_label = True
-
-            if create_label and n_label <= max_labels:
-                if layer_name == "Outline":
-                    objects_lists.append([vertices, codes, label_colors[label], label, 1.0, 2.0, "contour"])
+                        create_label = True
+
+                if create_label and n_label <= max_labels:
+                    if layer_name == "Outline":
+                        objects_lists.append([vertices, codes, label_colors[label], label, 1.0, 2.0, "contour"])
+                    else:
+                        objects_lists.append([vertices, codes, label_colors[label], label, 0.4, "path"])
+                    n_label += 1
                 else:
-                    objects_lists.append([vertices, codes, label_colors[label], label, 0.4, "path"])
-                n_label += 1
-            else:
-                if layer_name == "Outline":
-                    objects_lists.append([vertices, codes, label_colors[label], None, 1.0, 2.0, "contour"])
+                    if layer_name == "Outline":
+                        objects_lists.append([vertices, codes, label_colors[label], None, 1.0, 2.0, "contour"])
+                    else:
+                        objects_lists.append([vertices, codes, label_colors[label], None, 0.4, "path"])
+            elif prim_type == "circle":
+                x, y = prim.points()
+                if not x:
+                    continue
+                create_label = False
+                if not color_by_net:
+                    label = "Layer " + layer_name
+                    if label not in label_colors:
+                        try:
+                            color = layer_colors[layer_name]
+                            c = (
+                                float(color[0] / 255),
+                                float(color[1] / 255),
+                                float(color[2] / 255),
+                            )
+                        except:
+                            c = list(CSS4_COLORS.keys())[color_index]
+                            color_index += 1
+                            if color_index >= len(CSS4_COLORS):
+                                color_index = 0
+                        label_colors[label] = c
+                        create_label = True
                 else:
-                    objects_lists.append([vertices, codes, label_colors[label], None, 0.4, "path"])
-
-        for circle in self._pedb.modeler.circles:
-            if circle.is_void:
-                continue
-            net_name = circle.net_name
-            layer_name = circle.layer_name
-            if nets and (net_name not in nets or layer_name not in layers):
-                continue
-            x, y = circle.points()
-            if not x:
-                continue
-            create_label = False
-            if not color_by_net:
-                label = "Layer " + layer_name
-                if label not in label_colors:
-                    try:
-                        color = circle.layer.GetColor()
-                        c = (
-                            float(color.Item1 / 255),
-                            float(color.Item2 / 255),
-                            float(color.Item3 / 255),
-                        )
-                    except:
-                        c = list(CSS4_COLORS.keys())[color_index]
+                    label = "Net " + net_name
+                    if label not in label_colors:
+                        label_colors[label] = list(CSS4_COLORS.keys())[color_index]
                         color_index += 1
                         if color_index >= len(CSS4_COLORS):
                             color_index = 0
-                    label_colors[label] = c
-                    create_label = True
-            else:
-                label = "Net " + net_name
-                if label not in label_colors:
-                    label_colors[label] = list(CSS4_COLORS.keys())[color_index]
-                    color_index += 1
-                    if color_index >= len(CSS4_COLORS):
-                        color_index = 0
-                    create_label = True
-
-            if create_label and n_label <= max_labels:
-                objects_lists.append([x, y, label_colors[label], label, 0.4, "fill"])
-                n_label += 1
-            else:
-                objects_lists.append([x, y, label_colors[label], None, 0.4, "fill"])
+                        create_label = True
 
-        for rect in self._pedb.modeler.rectangles:
-            if rect.is_void:
-                continue
-            net_name = rect.net_name
-            layer_name = rect.layer_name
-            if nets and (net_name not in nets or layer_name not in layers):
-                continue
-            x, y = rect.points()
-            if not x:
-                continue
-            create_label = False
-            if not color_by_net:
-                label = "Layer " + layer_name
-                if label not in label_colors:
-                    try:
-                        color = rect.layer.GetColor()
-                        c = (
-                            float(color.Item1 / 255),
-                            float(color.Item2 / 255),
-                            float(color.Item3 / 255),
-                        )
-                    except:
-                        c = list(CSS4_COLORS.keys())[color_index]
+                if create_label and n_label <= max_labels:
+                    objects_lists.append([x, y, label_colors[label], label, 0.4, "fill"])
+                    n_label += 1
+                else:
+                    objects_lists.append([x, y, label_colors[label], None, 0.4, "fill"])
+            elif prim_type == "rectangle":
+                x, y = prim.points()
+                if not x:
+                    continue
+                create_label = False
+                if not color_by_net:
+                    label = "Layer " + layer_name
+                    if label not in label_colors:
+                        try:
+                            color = layer_colors[layer_name]
+                            c = (
+                                float(color[0] / 255),
+                                float(color[1] / 255),
+                                float(color[2] / 255),
+                            )
+                        except:
+                            c = list(CSS4_COLORS.keys())[color_index]
+                            color_index += 1
+                            if color_index >= len(CSS4_COLORS):
+                                color_index = 0
+                        label_colors[label] = c
+                        create_label = True
+                else:
+                    label = "Net " + net_name
+                    if label not in label_colors:
+                        label_colors[label] = list(CSS4_COLORS.keys())[color_index]
                         color_index += 1
                         if color_index >= len(CSS4_COLORS):
                             color_index = 0
-                    label_colors[label] = c
-                    create_label = True
-            else:
-                label = "Net " + net_name
-                if label not in label_colors:
-                    label_colors[label] = list(CSS4_COLORS.keys())[color_index]
-                    color_index += 1
-                    if color_index >= len(CSS4_COLORS):
-                        color_index = 0
-                    create_label = True
-
-            if create_label and n_label <= max_labels:
-                objects_lists.append([x, y, label_colors[label], label, 0.4, "fill"])
-                n_label += 1
-            else:
-                objects_lists.append([x, y, label_colors[label], None, 0.4, "fill"])
+                        create_label = True
+
+                if create_label and n_label <= max_labels:
+                    objects_lists.append([x, y, label_colors[label], label, 0.4, "fill"])
+                    n_label += 1
+                else:
+                    objects_lists.append([x, y, label_colors[label], None, 0.4, "fill"])
 
         end_time = time.time() - start_time
         self._logger.info("Nets Point Generation time %s seconds", round(end_time, 3))
@@ -782,7 +763,7 @@ class EdbNets(object):
             fig_size_y = board_size_y * fig_size_x / board_size_x
             size = (fig_size_x, fig_size_y)
 
-        plot_matplotlib(
+        return plot_matplotlib(
             plot_data=object_lists,
             size=size,
             show_legend=show_legend,

pyedb/edb_logger.py

@@ -417,7 +417,7 @@ class EdbLogger(object):
 
 logger = logging.getLogger("Global")
 if any("aedt_logger" in str(i) for i in logger.filters):
-    from pyaedt.generic.settings import settings as pyaedt_settings
+    from ansys.aedt.core.generic.settings import settings as pyaedt_settings
 
     from pyedb.generic.settings import settings as pyaedb_settings
 

pyedb/siwave.py

@@ -15,6 +15,7 @@ import shutil
 import sys
 import tempfile
 import time
+from typing import Optional, Union
 import warnings
 
 from pyedb import Edb
@@ -53,6 +54,15 @@ def wait_export_folder(flag, folder_path, time_sleep=0.5):
         time.sleep(time_sleep)
 
 
+def parser_file_path(file_path):
+    if isinstance(file_path, Path):
+        file_path = str(file_path)
+
+    if not Path(file_path).root:
+        file_path = str(Path().cwd() / file_path)
+    return file_path
+
+
 class Siwave(object):  # pragma no cover
     """Initializes SIwave based on the inputs provided and manages SIwave release and closing.
 
@@ -264,9 +274,9 @@ class Siwave(object):  # pragma no cover
             ``True`` when successful, ``False`` when failed.
 
         """
-
-        if os.path.exists(proj_path):
-            open_result = self.oSiwave.OpenProject(proj_path)
+        file_path = parser_file_path(proj_path)
+        if os.path.exists(file_path):
+            open_result = self.oSiwave.OpenProject(file_path)
             self._oproject = self.oSiwave.GetActiveProject()
             return open_result
         else:
@@ -306,6 +316,22 @@ class Siwave(object):  # pragma no cover
             self.oproject.Save()
         return True
 
+    def save(self, file_path: Optional[Union[str, Path]]):
+        """Save the project.
+
+        Parameters
+        ----------
+        file_path : str, optional
+            Full path to the project. The default is ``None``.
+        """
+
+        if file_path:
+            file_path = parser_file_path(file_path)
+            file_path = str(Path(file_path).with_suffix(".siw"))
+            self.oproject.ScrSaveProjectAs(file_path)
+        else:
+            self.oproject.Save()
+
     def close_project(self, save_project=False):
         """Close the project.
 
@@ -494,6 +520,8 @@ class Siwave(object):  # pragma no cover
         """
         if isinstance(file_path, Path):
             file_path = str(file_path)
+        if not Path(file_path).root:
+            file_path = str(Path().cwd() / file_path)
         flag = self.oproject.ScrImportEDB(file_path)
         # self.save_project(self.di)
         if flag == 0:
@@ -510,8 +538,7 @@ class Siwave(object):  # pragma no cover
         file_path : str
             Path to the configuration file.
         """
-        if isinstance(file_path, Path):
-            file_path = str(file_path)
+        file_path = parser_file_path(file_path)
 
         # temp_folder = tempfile.TemporaryDirectory(suffix=".ansys")
         # temp_edb = os.path.join(temp_folder.name, "temp.aedb")
@@ -536,8 +563,7 @@ class Siwave(object):  # pragma no cover
         file_path : str
             Path to the configuration file.
         """
-        if isinstance(file_path, Path):
-            file_path = str(file_path)
+        file_path = parser_file_path(file_path)
 
         temp_folder = tempfile.TemporaryDirectory(suffix=".ansys")
         temp_edb = os.path.join(temp_folder.name, "temp.aedb")

{pyedb-0.27.0.dist-info → pyedb-0.29.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyedb
-Version: 0.27.0
+Version: 0.29.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>
@@ -19,9 +19,9 @@ 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.2
+Requires-Dist: numpy>=1.20.0,<2
 Requires-Dist: pandas>=1.1.0,<2.3
-Requires-Dist: pydantic>=2.6.4,<2.9
+Requires-Dist: pydantic>=2.6.4,<2.10
 Requires-Dist: Rtree >= 1.2.0
 Requires-Dist: toml == 0.10.2
 Requires-Dist: scikit-rf
@@ -37,8 +37,8 @@ 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"
-Requires-Dist: sphinx-autobuild==2024.2.4 ; extra == "doc" and ( python_version == '3.8')
-Requires-Dist: sphinx-autobuild==2024.2.4 ; extra == "doc" and ( python_version > '3.8')
+Requires-Dist: sphinx-autobuild==2021.3.14 ; extra == "doc" and ( python_version == '3.8')
+Requires-Dist: sphinx-autobuild==2024.9.19 ; extra == "doc" and ( python_version > '3.8')
 Requires-Dist: sphinx-copybutton>=0.5.0,<0.6 ; extra == "doc"
 Requires-Dist: sphinx-gallery>=0.14.0,<0.18 ; extra == "doc"
 Requires-Dist: sphinx_design>=0.4.0,<0.7 ; extra == "doc"