pyedb 0.37.0__py3-none-any.whl → 0.39.0__py3-none-any.whl

pyedb/dotnet/{edb_core → database}/edb_data/control_file.py

@@ -279,7 +279,7 @@ class ControlFileStackup:
 
         Returns
         -------
-        list of :class:`pyedb.dotnet.edb_core.edb_data.control_file.ControlFileVia`
+        list of :class:`pyedb.dotnet.database.edb_data.control_file.ControlFileVia`
 
         """
         return self._vias
@@ -290,7 +290,7 @@ class ControlFileStackup:
 
         Returns
         -------
-        list of :class:`pyedb.dotnet.edb_core.edb_data.control_file.ControlFileMaterial`
+        list of :class:`pyedb.dotnet.database.edb_data.control_file.ControlFileMaterial`
 
         """
         return self._materials
@@ -301,7 +301,7 @@ class ControlFileStackup:
 
         Returns
         -------
-        list of :class:`pyedb.dotnet.edb_core.edb_data.control_file.ControlFileLayer`
+        list of :class:`pyedb.dotnet.database.edb_data.control_file.ControlFileLayer`
 
         """
         return self._dielectrics
@@ -312,7 +312,7 @@ class ControlFileStackup:
 
         Returns
         -------
-        list of :class:`pyedb.dotnet.edb_core.edb_data.control_file.ControlFileLayer`
+        list of :class:`pyedb.dotnet.database.edb_data.control_file.ControlFileLayer`
 
         """
         return self._layers
@@ -346,7 +346,7 @@ class ControlFileStackup:
 
         Returns
         -------
-        :class:`pyedb.dotnet.edb_core.edb_data.control_file.ControlFileMaterial`
+        :class:`pyedb.dotnet.database.edb_data.control_file.ControlFileMaterial`
         """
         if isinstance(properties, dict):
             self._materials[material_name] = ControlFileMaterial(material_name, properties)
@@ -400,7 +400,7 @@ class ControlFileStackup:
 
         Returns
         -------
-        :class:`pyedb.dotnet.edb_core.edb_data.control_file.ControlFileLayer`
+        :class:`pyedb.dotnet.database.edb_data.control_file.ControlFileLayer`
         """
         if isinstance(properties, dict):
             self._layers.append(ControlFileLayer(layer_name, properties))
@@ -453,7 +453,7 @@ class ControlFileStackup:
 
         Returns
         -------
-        :class:`pyedb.dotnet.edb_core.edb_data.control_file.ControlFileDielectric`
+        :class:`pyedb.dotnet.database.edb_data.control_file.ControlFileDielectric`
         """
         if isinstance(properties, dict):
             self._dielectrics.append(ControlFileDielectric(layer_name, properties))
@@ -531,7 +531,7 @@ class ControlFileStackup:
 
         Returns
         -------
-        :class:`pyedb.dotnet.edb_core.edb_data.control_file.ControlFileVia`
+        :class:`pyedb.dotnet.database.edb_data.control_file.ControlFileVia`
         """
         if isinstance(properties, dict):
             self._vias.append(ControlFileVia(layer_name, properties))
@@ -817,7 +817,7 @@ class ControlFileBoundaries:
 
         Returns
         -------
-        :class:`pyedb.dotnet.edb_core.edb_data.control_file.ControlCircuitPt`
+        :class:`pyedb.dotnet.database.edb_data.control_file.ControlCircuitPt`
         """
         self.ports[name] = ControlCircuitPt(name, str(x1), str(y1), layer1, str(x2), str(y2), layer2, str(z0))
         return self.ports[name]
@@ -1004,7 +1004,7 @@ class ControlFileSetup:
 
         Returns
         -------
-        :class:`pyedb.dotnet.edb_core.edb_data.control_file.ControlFileSweep`
+        :class:`pyedb.dotnet.database.edb_data.control_file.ControlFileSweep`
         """
         self.sweeps.append(ControlFileSweep(name, start, stop, step, sweep_type, step_type, use_q3d))
         return self.sweeps[-1]
@@ -1025,7 +1025,7 @@ class ControlFileSetup:
 
         Returns
         -------
-        :class:`pyedb.dotnet.edb_core.edb_data.control_file.ControlFileMeshOp`
+        :class:`pyedb.dotnet.database.edb_data.control_file.ControlFileMeshOp`
 
         """
         mop = ControlFileMeshOp(name, region, type, nets_layers)
@@ -1099,7 +1099,7 @@ class ControlFileSetups:
 
         Returns
         -------
-        :class:`pyedb.dotnet.edb_core.edb_data.control_file.ControlFileSetup`
+        :class:`pyedb.dotnet.database.edb_data.control_file.ControlFileSetup`
         """
         setup = ControlFileSetup(name, adapt_freq, maxdelta, maxpasses)
         self.setups.append(setup)

pyedb/dotnet/{edb_core → database}/edb_data/hfss_extent_info.py

@@ -20,9 +20,9 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-from pyedb.dotnet.edb_core.edb_data.edbvalue import EdbValue
-from pyedb.dotnet.edb_core.edb_data.primitives_data import cast
-from pyedb.dotnet.edb_core.general import convert_pytuple_to_nettuple, pascal_to_snake
+from pyedb.dotnet.database.edb_data.edbvalue import EdbValue
+from pyedb.dotnet.database.edb_data.primitives_data import cast
+from pyedb.dotnet.database.general import convert_pytuple_to_nettuple, pascal_to_snake
 
 
 class HfssExtentInfo:
@@ -75,7 +75,7 @@ class HfssExtentInfo:
         """Size of horizontal extent for the air box.
 
         Returns:
-        dotnet.edb_core.edb_data.edbvalue.EdbValue
+        dotnet.database.edb_data.edbvalue.EdbValue
         """
         return self._edb_hfss_extent_info.AirBoxHorizontalExtent.Item1
 
@@ -141,7 +141,7 @@ class HfssExtentInfo:
 
         Returns
         -------
-        :class:`dotnet.edb_core.edb_data.primitives_data.EDBPrimitive`
+        :class:`dotnet.database.edb_data.primitives_data.EDBPrimitive`
         """
         return cast(self._edb_hfss_extent_info.BasePolygon, self._pedb)
 
@@ -157,7 +157,7 @@ class HfssExtentInfo:
 
         Returns
         -------
-        :class:`dotnet.edb_core.edb_data.primitives_data.EDBPrimitive`
+        :class:`dotnet.database.edb_data.primitives_data.EDBPrimitive`
         """
         return cast(self._edb_hfss_extent_info.DielectricBasePolygon, self._pedb)
 
@@ -251,7 +251,7 @@ class HfssExtentInfo:
 
         Returns
         -------
-        pyedb.dotnet.edb_core.edb_data.edbvalue.EdbValue
+        pyedb.dotnet.database.edb_data.edbvalue.EdbValue
         """
         return EdbValue(self._edb_hfss_extent_info.OperatingFreq)
 

pyedb/dotnet/{edb_core → database}/edb_data/nets_data.py

@@ -19,13 +19,13 @@
 # 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 pyedb.dotnet.edb_core.dotnet.database import (
+from pyedb.dotnet.database.dotnet.database import (
     DifferentialPairDotNet,
     ExtendedNetDotNet,
     NetClassDotNet,
     NetDotNet,
 )
-from pyedb.dotnet.edb_core.edb_data.padstacks_data import EDBPadstackInstance
+from pyedb.dotnet.database.edb_data.padstacks_data import EDBPadstackInstance
 
 
 class EDBNetsData(NetDotNet):
@@ -55,9 +55,9 @@ class EDBNetsData(NetDotNet):
 
         Returns
         -------
-        list of :class:`pyedb.dotnet.edb_core.edb_data.primitives_data.EDBPrimitives`
+        list of :class:`pyedb.dotnet.database.edb_data.primitives_data.EDBPrimitives`
         """
-        from pyedb.dotnet.edb_core.cell.layout import primitive_cast
+        from pyedb.dotnet.database.cell.layout import primitive_cast
 
         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]
@@ -68,7 +68,7 @@ class EDBNetsData(NetDotNet):
 
         Returns
         -------
-        list of :class:`pyedb.dotnet.edb_core.edb_data.padstacks_data.EDBPadstackInstance`"""
+        list of :class:`pyedb.dotnet.database.edb_data.padstacks_data.EDBPadstackInstance`"""
         # name = self.name
         # return [
         # EDBPadstackInstance(i, self._app) for i in self.net_object.PadstackInstances if i.GetNet().GetName() == name
@@ -81,7 +81,7 @@ class EDBNetsData(NetDotNet):
 
         Returns
         -------
-        dict[str, :class:`pyedb.dotnet.edb_core.cell.hierarchy.component.EDBComponent`]
+        dict[str, :class:`pyedb.dotnet.database.cell.hierarchy.component.EDBComponent`]
         """
         comps = {}
         for p in self.padstack_instances:
@@ -113,9 +113,8 @@ class EDBNetsData(NetDotNet):
         show_legend=True,
         save_plot=None,
         outline=None,
-        size=(6000, 3000),
+        size=(2000, 1000),
         show=True,
-        plot_vias=True,
     ):
         """Plot a net to Matplotlib 2D chart.
 
@@ -135,9 +134,6 @@ class EDBNetsData(NetDotNet):
             Image size in pixel (width, height).
         show : bool, optional
             Whether to show the plot or not. Default is `True`.
-        plot_vias : bool, optional
-            Whether to plot vias or not. It may impact on performances.
-            Default is `True`.
         """
 
         return self._app.nets.plot(
@@ -148,7 +144,8 @@ class EDBNetsData(NetDotNet):
             outline=outline,
             size=size,
             show=show,
-            plot_vias=plot_vias,
+            plot_vias=True,
+            plot_components=True,
         )
 
     def get_smallest_trace_width(self):
@@ -173,7 +170,7 @@ class EDBNetsData(NetDotNet):
 
         Returns
         -------
-        :class:` :class:`pyedb.dotnet.edb_core.edb_data.nets_data.EDBExtendedNetData`
+        :class:` :class:`pyedb.dotnet.database.edb_data.nets_data.EDBExtendedNetData`
 
         Examples
         --------

pyedb/dotnet/{edb_core → database}/edb_data/padstacks_data.py

@@ -24,18 +24,17 @@ 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
-from pyedb.dotnet.edb_core.edb_data.edbvalue import EdbValue
-from pyedb.dotnet.edb_core.general import (
+from pyedb.dotnet.database.cell.primitive.primitive import Primitive
+from pyedb.dotnet.database.dotnet.database import PolygonDataDotNet
+from pyedb.dotnet.database.edb_data.edbvalue import EdbValue
+from pyedb.dotnet.database.general import (
     PadGeometryTpe,
     convert_py_list_to_net_list,
     pascal_to_snake,
     snake_to_pascal,
 )
+from pyedb.dotnet.database.geometry.polygon_data import PolygonData
 from pyedb.generic.general_methods import generate_unique_name
 from pyedb.modeler.geometry_operators import GeometryOperators
 
@@ -157,6 +156,24 @@ class EDBPadProperties(object):
     def polygon_data(self):
         """Parameters.
 
+        Returns
+        -------
+        list
+            List of parameters.
+        """
+
+        flag, edb_object, _, _, _ = self._edb_padstack.GetData().GetPolygonalPadParameters(
+            self.layer_name, self.int_to_pad_type(self.pad_type)
+        )
+        if flag:
+            return PolygonData(self._edb._app, edb_object)
+        else:  # pragma no cover
+            raise AttributeError("No polygon data.")
+
+    @property
+    def _polygon_data_dotnet(self):
+        """Parameters.
+
         Returns
         -------
         list
@@ -782,7 +799,7 @@ class EDBPadstack(object):
         pdef_data.SetHoleRange(getattr(self._edb.definition.PadstackHoleRange, snake_to_pascal(value)))
         self._padstack_def_data = pdef_data
 
-    def convert_to_3d_microvias(self, convert_only_signal_vias=True, hole_wall_angle=15, delete_padstack_def=True):
+    def convert_to_3d_microvias(self, convert_only_signal_vias=True, hole_wall_angle=75, delete_padstack_def=True):
         """Convert actual padstack instance to microvias 3D Objects with a given aspect ratio.
 
         Parameters
@@ -814,22 +831,9 @@ class EDBPadstack(object):
         layer_names = [i for i in list(layers.keys())]
         if convert_only_signal_vias:
             signal_nets = [i for i in list(self._ppadstack._pedb.nets.signal_nets.keys())]
-        topl, topz, bottoml, bottomz = self._ppadstack._pedb.stackup.limits(True)
-        if self.via_start_layer in layers:
-            start_elevation = layers[self.via_start_layer].lower_elevation
-        else:
-            start_elevation = layers[self.instances[0].start_layer].lower_elevation
-        if self.via_stop_layer in layers:
-            stop_elevation = layers[self.via_stop_layer].upper_elevation
-        else:
-            stop_elevation = layers[self.instances[0].stop_layer].upper_elevation
 
-        diel_thick = abs(start_elevation - stop_elevation)
-        rad1 = self.hole_properties[0] / 2 - math.tan(hole_wall_angle * diel_thick * math.pi / 180)
-        rad2 = self.hole_properties[0] / 2
+        layer_count = len(self._ppadstack._pedb.stackup.signal_layers)
 
-        if start_elevation < (topz + bottomz) / 2:
-            rad1, rad2 = rad2, rad1
         i = 0
         for via in list(self.padstack_instances.values()):
             if convert_only_signal_vias and via.net_name in signal_nets or not convert_only_signal_vias:
@@ -865,18 +869,33 @@ class EDBPadstack(object):
                         self._get_edb_value(pos[1]),
                         self._get_edb_value(self.pad_by_layer[self.via_stop_layer].parameters_values[0] / 2),
                     )
-                for layer_name in layer_names:
+                for layer_idx, layer_name in enumerate(layer_names):
                     stop = ""
                     if layer_name == via.start_layer or started:
                         start = layer_name
                         stop = layer_names[layer_names.index(layer_name) + 1]
+
+                        start_elevation = layers[start].lower_elevation
+                        stop_elevation = layers[stop].upper_elevation
+                        diel_thick = abs(start_elevation - stop_elevation)
+
+                        rad_large = self.hole_diameter / 2
+                        rad_small = rad_large - diel_thick * 1 / math.tan(math.radians(hole_wall_angle))
+
+                        if layer_idx + 1 < layer_count / 2:  # upper half of stack
+                            rad_u = rad_large
+                            rad_l = rad_small
+                        else:
+                            rad_u = rad_small
+                            rad_l = rad_large
+
                         cloned_circle = self._edb.cell.primitive.circle.create(
                             layout,
                             start,
                             via._edb_padstackinstance.GetNet(),
                             self._get_edb_value(pos[0]),
                             self._get_edb_value(pos[1]),
-                            self._get_edb_value(rad1),
+                            self._get_edb_value(rad_u),
                         )
                         cloned_circle2 = self._edb.cell.primitive.circle.create(
                             layout,
@@ -884,7 +903,7 @@ class EDBPadstack(object):
                             via._edb_padstackinstance.GetNet(),
                             self._get_edb_value(pos[0]),
                             self._get_edb_value(pos[1]),
-                            self._get_edb_value(rad2),
+                            self._get_edb_value(rad_l),
                         )
                         s3d = self._edb.cell.hierarchy._hierarchy.Structure3D.Create(
                             layout, generate_unique_name("via3d_" + via.aedt_name.replace("via_", ""), n=3)
@@ -912,7 +931,7 @@ class EDBPadstack(object):
 
         Returns
         -------
-        List of :class:`pyedb.dotnet.edb_core.padstackEDBPadstack`
+        List of :class:`pyedb.dotnet.database.padstackEDBPadstack`
         """
         if self.via_start_layer == self.via_stop_layer:
             self._ppadstack._pedb.logger.error("Microvias cannot be applied when Start and Stop Layers are the same.")
@@ -1181,13 +1200,13 @@ class EDBPadstackInstance(Primitive):
 
         Returns
         -------
-        :class:`pyedb.dotnet.edb_core.edb_data.terminals`
+        :class:`pyedb.dotnet.database.edb_data.terminals`
         """
         warnings.warn("Use new property :func:`terminal` instead.", DeprecationWarning)
         if create_new_terminal:
             term = self._create_terminal(name)
         else:
-            from pyedb.dotnet.edb_core.cell.terminal.padstack_instance_terminal import (
+            from pyedb.dotnet.database.cell.terminal.padstack_instance_terminal import (
                 PadstackInstanceTerminal,
             )
 
@@ -1198,7 +1217,7 @@ class EDBPadstackInstance(Primitive):
     @property
     def terminal(self):
         """Terminal."""
-        from pyedb.dotnet.edb_core.cell.terminal.padstack_instance_terminal import (
+        from pyedb.dotnet.database.cell.terminal.padstack_instance_terminal import (
             PadstackInstanceTerminal,
         )
 
@@ -1212,7 +1231,7 @@ class EDBPadstackInstance(Primitive):
 
     def create_terminal(self, name=None):
         """Create a padstack instance terminal"""
-        from pyedb.dotnet.edb_core.cell.terminal.padstack_instance_terminal import (
+        from pyedb.dotnet.database.cell.terminal.padstack_instance_terminal import (
             PadstackInstanceTerminal,
         )
 
@@ -1232,9 +1251,9 @@ class EDBPadstackInstance(Primitive):
         ----------
         name : str, optional
             Name of the port. The default is ``None``, in which case a name is automatically assigned.
-        reference : class:`pyedb.dotnet.edb_core.edb_data.nets_data.EDBNetsData`, \
-            class:`pyedb.dotnet.edb_core.edb_data.padstacks_data.EDBPadstackInstance`, \
-            class:`pyedb.dotnet.edb_core.edb_data.sources.PinGroup`, optional
+        reference : class:`pyedb.dotnet.database.edb_data.nets_data.EDBNetsData`, \
+            class:`pyedb.dotnet.database.edb_data.padstacks_data.EDBPadstackInstance`, \
+            class:`pyedb.dotnet.database.edb_data.sources.PinGroup`, optional
             Negative terminal of the port.
         is_circuit_port : bool, optional
             Whether it is a circuit port.
@@ -1249,47 +1268,15 @@ class EDBPadstackInstance(Primitive):
 
         return self._pedb.create_port(terminal, ref_terminal, is_circuit_port)
 
-    def _set_equipotential(self, contact_radius=None, inline=False, num_of_contact=1):
+    def _set_equipotential(self, contact_radius=None):
         """Workaround solution. Remove when EDBAPI bug is fixed for dcir_equipotential_region."""
         pad = self.definition.pad_by_layer[self.start_layer]
 
         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
+            prim = self._pedb.modeler.create_circle(pad.layer_name, pos_x, pos_y, contact_radius, self.net_name)
+            prim.dcir_equipotential_region = True
             return
 
         elif pad.shape.lower() == "circle":
@@ -1670,7 +1657,7 @@ class EDBPadstackInstance(Primitive):
     @property
     def component(self):
         """Component."""
-        from pyedb.dotnet.edb_core.cell.hierarchy.component import EDBComponent
+        from pyedb.dotnet.database.cell.hierarchy.component import EDBComponent
 
         comp = EDBComponent(self._pedb, self._edb_object.GetComponent())
         return comp if not comp.is_null else False
@@ -1940,7 +1927,7 @@ class EDBPadstackInstance(Primitive):
 
         Returns
         -------
-        bool, List,  :class:`pyedb.dotnet.edb_core.edb_data.primitives.EDBPrimitives`
+        bool, List,  :class:`pyedb.dotnet.database.edb_data.primitives.EDBPrimitives`
             Polygon when successful, ``False`` when failed, list of list if `return_points=True`.
 
         Examples
@@ -1970,7 +1957,7 @@ class EDBPadstackInstance(Primitive):
 
         pad_shape = padstack_pad.geometry_type
         params = padstack_pad.parameters_values
-        polygon_data = padstack_pad.polygon_data
+        polygon_data = padstack_pad._polygon_data_dotnet
 
         def _rotate(p):
             x = p[0] * math.cos(rotation) - p[1] * math.sin(rotation)
@@ -2087,8 +2074,8 @@ class EDBPadstackInstance(Primitive):
             # Polygon
             points = []
             i = 0
-            while i < polygon_data.edb_api.Count:
-                point = polygon_data.edb_api.GetPoint(i)
+            while i < polygon_data._edb_object.Count:
+                point = polygon_data._edb_object.GetPoint(i)
                 i += 1
                 if point.IsArc():
                     continue
@@ -2138,7 +2125,7 @@ class EDBPadstackInstance(Primitive):
         Returns
         -------
         list
-            List of :class:`dotnet.edb_core.edb_data.padstacks_data.EDBPadstackInstance`.
+            List of :class:`dotnet.database.edb_data.padstacks_data.EDBPadstackInstance`.
 
         Examples
         --------

pyedb/dotnet/{edb_core → database}/edb_data/ports.py

@@ -20,12 +20,12 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-from pyedb.dotnet.edb_core.cell.terminal.bundle_terminal import BundleTerminal
-from pyedb.dotnet.edb_core.cell.terminal.edge_terminal import EdgeTerminal
-from pyedb.dotnet.edb_core.cell.terminal.padstack_instance_terminal import (
+from pyedb.dotnet.database.cell.terminal.bundle_terminal import BundleTerminal
+from pyedb.dotnet.database.cell.terminal.edge_terminal import EdgeTerminal
+from pyedb.dotnet.database.cell.terminal.padstack_instance_terminal import (
     PadstackInstanceTerminal,
 )
-from pyedb.dotnet.edb_core.cell.terminal.terminal import Terminal
+from pyedb.dotnet.database.cell.terminal.terminal import Terminal
 
 
 class GapPort(EdgeTerminal):

pyedb/dotnet/{edb_core → database}/edb_data/primitives_data.py

@@ -22,14 +22,14 @@
 
 import math
 
-from pyedb.dotnet.edb_core.cell.primitive.primitive import Primitive
-from pyedb.dotnet.edb_core.dotnet.primitive import (
+from pyedb.dotnet.database.cell.primitive.primitive import Primitive
+from pyedb.dotnet.database.dotnet.primitive import (
     BondwireDotNet,
     CircleDotNet,
     RectangleDotNet,
     TextDotNet,
 )
-from pyedb.dotnet.edb_core.geometry.polygon_data import PolygonData
+from pyedb.dotnet.database.geometry.polygon_data import PolygonData
 from pyedb.modeler.geometry_operators import GeometryOperators
 
 
@@ -283,7 +283,7 @@ class EdbPolygon(Primitive):
     #
     #     Parameters
     #     ----------
-    #     point_list : list or  :class:`dotnet.edb_core.edb_data.primitives_data.Primitive` or EDB Primitive Object
+    #     point_list : list or  :class:`dotnet.database.edb_data.primitives_data.Primitive` or EDB Primitive Object
     #         Point list in the format of `[[x1,y1], [x2,y2],..,[xn,yn]]`.
     #
     #     Returns
@@ -308,7 +308,7 @@ class EdbPolygon(Primitive):
 
     @property
     def polygon_data(self):
-        """:class:`pyedb.dotnet.edb_core.dotnet.database.PolygonDataDotNet`: Outer contour of the Polygon object."""
+        """:class:`pyedb.dotnet.database.dotnet.database.PolygonDataDotNet`: Outer contour of the Polygon object."""
         return PolygonData(self._pedb, self._edb_object.GetPolygonData())
 
     @polygon_data.setter

pyedb/dotnet/{edb_core → database}/edb_data/raptor_x_simulation_setup_data.py

@@ -19,9 +19,9 @@
 # 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 pyedb.dotnet.edb_core.general import convert_py_list_to_net_list
-from pyedb.dotnet.edb_core.sim_setup_data.data.sweep_data import SweepData
-from pyedb.dotnet.edb_core.utilities.simulation_setup import SimulationSetup
+from pyedb.dotnet.database.general import convert_py_list_to_net_list
+from pyedb.dotnet.database.sim_setup_data.data.sweep_data import SweepData
+from pyedb.dotnet.database.utilities.simulation_setup import SimulationSetup
 from pyedb.generic.general_methods import generate_unique_name
 
 
@@ -80,7 +80,7 @@ class RaptorXSimulationSetup(SimulationSetup):
 
         Returns
         -------
-        :class:`pyedb.dotnet.edb_core.edb_data.simulation_setup.EdbFrequencySweep`
+        :class:`pyedb.dotnet.database.edb_data.simulation_setup.EdbFrequencySweep`
 
         Examples
         --------

pyedb/dotnet/{edb_core → database}/edb_data/simulation_configuration.py

@@ -25,8 +25,8 @@ import json
 import os
 
 from pyedb.dotnet.clr_module import Dictionary
-from pyedb.dotnet.edb_core.edb_data.sources import Source, SourceType
-from pyedb.dotnet.edb_core.utilities.simulation_setup import AdaptiveType
+from pyedb.dotnet.database.edb_data.sources import Source, SourceType
+from pyedb.dotnet.database.utilities.simulation_setup import AdaptiveType
 from pyedb.generic.constants import (
     BasisOrder,
     CutoutSubdesignType,
@@ -513,7 +513,7 @@ class SimulationConfigurationBatch(object):
 
         Returns
         -------
-        :class:`dotnet.edb_core.edb_data.sources.Source`
+        :class:`dotnet.database.edb_data.sources.Source`
         """
         return self._sources
 
@@ -530,7 +530,7 @@ class SimulationConfigurationBatch(object):
 
         Parameters
         ----------
-        source : :class:`pyedb.dotnet.edb_core.edb_data.sources.Source`
+        source : :class:`pyedb.dotnet.database.edb_data.sources.Source`
 
         """
         if isinstance(source, Source):
@@ -1911,7 +1911,7 @@ class SimulationConfigurationAc(object):
 
         Returns
         -------
-        class: pyedb.dotnet.edb_core.edb_data.simulation_setup.AdaptiveType
+        class: pyedb.dotnet.database.edb_data.simulation_setup.AdaptiveType
         """
         return self._adaptive_type
 
@@ -2328,7 +2328,7 @@ class SimulationConfiguration(object):
 
         Returns
         -------
-        :class:`pyedb.dotnet.edb_core.edb_data.simulation_configuration.SimulationConfigurationDc`
+        :class:`pyedb.dotnet.database.edb_data.simulation_configuration.SimulationConfigurationDc`
         """
         return self._dc_settings
 
@@ -2339,7 +2339,7 @@ class SimulationConfiguration(object):
 
         Returns
         -------
-        :class:`pyedb.dotnet.edb_core.edb_data.simulation_configuration.SimulationConfigurationAc`
+        :class:`pyedb.dotnet.database.edb_data.simulation_configuration.SimulationConfigurationAc`
         """
         return self._ac_settings
 
@@ -2350,7 +2350,7 @@ class SimulationConfiguration(object):
 
         Returns
         -------
-        :class:`pyedb.dotnet.edb_core.edb_data.simulation_configuration.SimulationConfigurationBatch`
+        :class:`pyedb.dotnet.database.edb_data.simulation_configuration.SimulationConfigurationBatch`
         """
         return self._batch_solve_settings
 
@@ -2699,7 +2699,7 @@ class SimulationConfiguration(object):
         Examples
         --------
 
-        >>> from dotnet.edb_core.edb_data.simulation_configuration import SimulationConfiguration
+        >>> from dotnet.database.edb_data.simulation_configuration import SimulationConfiguration
         >>> config = SimulationConfiguration()
         >>> config.export_json(r"C:\Temp\test_json\test.json")
         """
@@ -2727,7 +2727,7 @@ class SimulationConfiguration(object):
 
         Examples
         --------
-        >>> from dotnet.edb_core.edb_data.simulation_configuration import SimulationConfiguration
+        >>> from dotnet.database.edb_data.simulation_configuration import SimulationConfiguration
         >>> test = SimulationConfiguration()
         >>> test.import_json(r"C:\Temp\test_json\test.json")
         """