Merge branch 'main' into create_circuit_schematics

Author: maxcapodi78

_unittest/test_01_3dlayout_edb.py

@@ -307,7 +307,7 @@ def test_15_3dplacement(self):
 
     def test_16_differential_ports(self):
         self.aedtapp.set_active_design(self.design_name)
-        pins = self.aedtapp.modeler.components["R3"].pins
+        pins = list(self.aedtapp.modeler.components["R3"].pins.keys())
         assert self.aedtapp.create_differential_port(pins[0], pins[1], "test_differential", deembed=True)
         assert "test_differential" in self.aedtapp.port_list
 
@@ -376,3 +376,15 @@ def test_22_change_design_settings(self):
         assert (
             self.aedtapp.get_oo_property_value(self.aedtapp.odesign, "Design Settings", "DCExtrapolation") == "Advanced"
         )
+
+    def test_23_dissolve_element(self):
+        comp = self.aedtapp.modeler.components["D1"]
+        pins = {name: pin for name, pin in comp.pins.items() if name in ["D1-1", "D1-2", "D1-7"]}
+        self.aedtapp.dissolve_component("D1")
+        comp = self.aedtapp.modeler.create_components_on_pins(list(pins.keys()))
+        nets = [
+            list(pins.values())[0].net_name,
+            list(pins.values())[1].net_name,
+        ]
+        assert self.aedtapp.create_ports_on_component_by_nets(comp.name, nets)
+        assert self.aedtapp.create_pec_on_component_by_nets(comp.name, "GND")

_unittest/test_03_Materials.py

@@ -92,14 +92,18 @@ def test_02_create_material(self):
         assert mat1.get_curve_coreloss_type() == "Power Ferrite"
         assert isinstance(mat1.material_appearance, list)
 
-        mat1.material_appearance = [11, 22, 0]
-        assert mat1.material_appearance == [11, 22, 0]
-        mat1.material_appearance = ["11", "22", "10"]
-        assert mat1.material_appearance == [11, 22, 10]
+        mat1.material_appearance = [11, 22, 0, 0.5]
+        assert mat1.material_appearance == [11, 22, 0, 0.5]
+        mat1.material_appearance = ["11", "22", "10", "0.5"]
+        assert mat1.material_appearance == [11, 22, 10, 0.5]
         with pytest.raises(ValueError):
-            mat1.material_appearance = [11, 22, 300]
+            mat1.material_appearance = [11, 22, 300, 0.5]
         with pytest.raises(ValueError):
-            mat1.material_appearance = [11, -22, 0]
+            mat1.material_appearance = [11, 22, 100, 1.5]
+        with pytest.raises(ValueError):
+            mat1.material_appearance = [11, -22, 0, 0.5]
+        with pytest.raises(ValueError):
+            mat1.material_appearance = [11, 22, 0, -1]
         with pytest.raises(ValueError):
             mat1.material_appearance = [11, 22]
 

examples/02-HFSS/HFSS_Choke.py

@@ -12,7 +12,7 @@
 import os
 import pyaedt
 
-project_name = pyaedt.generate_unique_project_name(project_name="choke")
+project_name = pyaedt.generate_unique_project_name(rootname=r"C:\Data\Support\Test", folder_name="choke", project_name="choke")
 
 ##########################################################
 # Set AEDT version

examples/02-HFSS/Probe_Fed_Patch.py

@@ -64,6 +64,7 @@
                    solution_type="Terminal",
                    designname="patch",
                    non_graphical=non_graphical,
+                   new_desktop_session=True,
                    specified_version=aedt_version)
 
 hfss.modeler.model_units = length_units

pyaedt/hfss3dlayout.py

@@ -363,6 +363,25 @@ def create_wave_port_from_two_conductors(self, primivitivenames=[""], edgenumber
         else:
             return False
 
+    @pyaedt_function_handler()
+    def dissolve_component(self, component_name):
+        """Dissolve a component and remove it from 3D Layout.
+
+        Parameters
+        ----------
+        component_name : str
+            Name of the component.
+
+        Returns
+        -------
+        bool
+            ``True`` when successful, ``False`` when failed.
+
+
+        """
+        self.oeditor.DissolveComponents(["NAME:elements", component_name])
+        return True
+
     @pyaedt_function_handler()
     def create_ports_on_component_by_nets(
         self,
@@ -407,9 +426,43 @@ def create_ports_on_component_by_nets(
                     ports.append(bound)
         return ports
 
+    @pyaedt_function_handler()
+    def create_pec_on_component_by_nets(
+        self,
+        component_name,
+        nets,
+    ):
+        """Create a PEC connection on a component for a list of nets.
+
+        Parameters
+        ----------
+        component_name : str
+            Component name.
+        nets : str, list
+            Nets to include.
+
+
+        Returns
+        -------
+        bool
+            ``True`` when successful, ``False`` when failed.
+
+        References
+        ----------
+
+        >>> oEditor.CreateEdgePort
+        """
+        if isinstance(nets, list):
+            pass
+        else:
+            nets = [nets]
+        net_array = ["NAME:Nets"] + nets
+        self.oeditor.CreatePortsOnComponentsByNet(["NAME:Components", component_name], net_array, "PEC", "0", "0", "0")
+        return True
+
     @pyaedt_function_handler()
     def create_differential_port(self, via_signal, via_reference, port_name, deembed=True):
-        """Create a new differential port.
+        """Create a differential port.
 
         Parameters
         ----------

pyaedt/modeler/cad/Primitives.py

@@ -6233,10 +6233,8 @@ def create_region(self, pad_value=300, pad_type="Percentage Offset", region_name
                 is_percentage = True
             if kwarg.get("pad_percent", False):
                 pad_percent = kwarg["pad_percent"]
-            else:
-                pad_percent = 300
-            pad_value = pad_percent
-            if isinstance(pad_value, list):
+                pad_value = pad_percent
+            if isinstance(pad_value, list) and len(pad_value) < 6:
                 pad_value = [pad_value[i // 2 + 3 * (i % 2)] for i in range(6)]
             pad_type = ["Absolute Offset", "Percentage Offset"][int(is_percentage)]
 

pyaedt/modeler/cad/Primitives2D.py

@@ -281,17 +281,26 @@ def create_regular_polygon(
         return self._create_object(new_object_name, **kwargs)
 
     @pyaedt_function_handler()
-    def create_region(self, pad_percent=300, is_percentage=True):
+    def create_region(self, pad_value=300, pad_type="Percentage Offset", region_name="Region", **kwarg):
         """Create an air region.
 
         Parameters
         ----------
-        pad_percent : float, str, list of floats or list of str, optional
-            Same padding is applied if not a list. The default is ``300``.
-            If a list of floats or strings, interpret as adding ``["+X", "+Y", "-X", "-Y"]`` for XY geometry mode,
-            and ``["+R", "+Z", "-Z"]`` for RZ geometry mode.
-        is_percentage : bool, optional
-            Whether the region definition is a percentage or absolute value. The default is `True``.
+        pad_value : float, str, list of floats or list of str, optional
+            Padding values to apply. If a list is not provided, the same
+            value is applied to all padding directions. If a list of floats
+            or strings is provided, the values are
+            interpreted as padding for ``["+X", "-X", "+Y", "-Y", "+Z", "-Z"]``.
+        pad_type : str, optional
+            Padding definition. The default is ``"Percentage Offset"``.
+            Options are ``"Absolute Offset"``,
+            ``"Absolute Position"``, ``"Percentage Offset"``, and
+            ``"Transverse Percentage Offset"``. When using a list,
+            different padding types can be provided for different
+           directions.
+        region_name : str, optional
+            Region name. The default is ``None``, in which case the name
+            is generated automatically.
 
         Returns
         -------
@@ -303,19 +312,35 @@ def create_region(self, pad_percent=300, is_percentage=True):
 
         >>> oEditor.CreateRegion
         """
-        if not isinstance(pad_percent, list):
-            pad_percent = [pad_percent] * 4
+        # backward compatibility
+        if kwarg:
+            if "is_percentage" in kwarg.keys():
+                is_percentage = kwarg["is_percentage"]
+            else:
+                is_percentage = True
+            if kwarg.get("pad_percent", False):
+                pad_percent = kwarg["pad_percent"]
+                pad_value = pad_percent
+            if isinstance(pad_value, list) and len(pad_value) < 6:
+                pad_value = [pad_value[i // 2 + 3 * (i % 2)] for i in range(6)]
+            pad_type = ["Absolute Offset", "Percentage Offset"][int(is_percentage)]
+
+        if isinstance(pad_type, bool):
+            pad_type = ["Absolute Offset", "Percentage Offset"][int(pad_type)]
+
+        if not isinstance(pad_value, list):
+            pad_value = [pad_value] * 4
         if self._app.design_type == "2D Extractor" or (
             self._app.design_type == "Maxwell 2D" and self._app.odesign.GetGeometryMode() == "XY"
         ):
-            if len(pad_percent) != 4:
+            if len(pad_value) != 4:
                 self.logger.error("Wrong padding list provided. Four values have to be provided.")
                 return False
-            pad_percent = [pad_percent[0], pad_percent[2], pad_percent[1], pad_percent[3], 0, 0]
+            pad_value = [pad_value[0], pad_value[2], pad_value[1], pad_value[3], 0, 0]
         else:
-            if len(pad_percent) < 3:
+            if len(pad_value) < 3:
                 self.logger.error("Wrong padding list provided. Three values have to be provided for RZ geometry.")
                 return False
-            pad_percent = [pad_percent[0], 0, 0, 0, pad_percent[1], pad_percent[2]]
+            pad_value = [pad_value[0], 0, 0, 0, pad_value[1], pad_value[2]]
 
-        return self._create_region(pad_percent, ["Absolute Offset", "Percentage Offset"][int(is_percentage)])
+        return self._create_region(pad_value, pad_type, region_name, region_type="Region")

pyaedt/modeler/modelerpcb.py

@@ -914,7 +914,7 @@ def set_spice_model(self, component_name, model_path, model_name=None, subcircui
                     pinNames.remove(pinNames[0])
                     pinNames.remove(pinNames[0])
                     break
-        componentPins = self.components[component_name].pins
+        componentPins = list(self.components[component_name].pins.keys())
         componentPins.reverse()
         if not pin_map:
             pin_map = []

pyaedt/modeler/pcb/Primitives3DLayout.py

@@ -1489,6 +1489,60 @@ def place_3d_component(
             self.oeditor.CreatePortsOnComponentsByNet(["NAME:Components", comp.name], [], "Port", "0", "0", "0")
         return comp  #
 
+    @pyaedt_function_handler()
+    def create_components_on_pins(
+        self,
+        pins,
+        definition_name=None,
+        component_type="Other",
+        ref_des="U100",
+    ):
+        """Create a component based on a pin list.
+
+        Parameters
+        ----------
+        pins : list
+            Pins to include in the new component.
+        definition_name : str, optional
+            Name of the component definition. If no name is provided, a
+            name is automatically assigned.
+        component_type : str, optional
+            Component type. The default is ``"Other"``.
+        ref_des : str, optional
+            Reference designator. The default is ``"U100"``.
+
+        Returns
+        -------
+        :class:`pyaedt.modeler.cad.object3dlayout.Components3DLayout`
+
+        """
+        if not definition_name:
+            definition_name = generate_unique_name("COMP")
+        placement_layer = list(self.layers.signals.keys())[0]
+        for pin in self.pins.items():
+            if pin[0] == pins[0]:
+                placement_layer = pin[1].start_layer
+                break
+        comp_name = self.modeler.oeditor.CreateComponent(
+            [
+                "NAME:Contents",
+                "isRCS:=",
+                True,
+                "definition_name:=",
+                definition_name,
+                "type:=",
+                component_type,
+                "ref_des:=",
+                ref_des,
+                "placement_layer:=",
+                placement_layer,
+                "elements:=",
+                pins,
+            ]
+        )
+        comp = Components3DLayout(self, comp_name.split(";")[-1])
+        return comp
+
     def create_text(self, text, position, placement_layer="PostProcessing", angle=0, font_size=12):
         """Create a text primitive object.