Merge branch 'refs/heads/main' into feat/flux_lines_plot

Author: anur7

doc/changelog.d/6599.added.md

@@ -0,0 +1 @@
+Added offset to page port creation during connect_to_component.

doc/changelog.d/6600.fixed.md

@@ -0,0 +1 @@
+Circuit config fixes

src/ansys/aedt/core/generic/configurations.py

@@ -21,11 +21,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.
-
 from collections import defaultdict
 import copy
 from datetime import datetime
 import json
+import math
 import os
 from pathlib import Path
 import tempfile
@@ -2216,7 +2216,7 @@ def export_config(self, config_file=None, overwrite=False):
                 getattr(self, key)(dict_out)  # Call private export method to update dict_out.
 
         pin_mapping = defaultdict(list)
-        data_refdes = {}
+        data_instance = {}
         data_models = {}
         pin_nets = {}
         skip_list = [
@@ -2242,21 +2242,22 @@ def export_config(self, config_file=None, overwrite=False):
             "IBIS_Model_Text",
             "aminetlist_example_model_rx",
             "CoSimulator",
+            "source_name",
         ]
         for comp in list(self._app.modeler.schematic.components.values()):
+            if not comp.component_info:
+                continue
+            else:
+                component = comp.component_info["Component"]
             properties = {}
             num_terminals = None
-            refdes = comp.refdes
+            instance = comp.parameters["InstanceName"]
             position = comp.location
             angle = comp.angle
             mirror = comp.mirror
             parameters = comp.parameters
-            if not comp.component_info:
-                continue
-            else:
-                component = comp.component_info["Component"]
             path = comp.component_path
-            port_names = None
+            port_names = []
             if not path:
                 component_type = "Nexxim Component"
                 path = ""
@@ -2283,9 +2284,9 @@ def export_config(self, config_file=None, overwrite=False):
             elif path[-4:] == ".sss":
                 component_type = "nexxim state space"
                 num_terminals = comp.model_data.props["numberofports"]
-                port_names = comp.model_data.props["PortNames"]
 
             for pin in comp.pins:
+                port_names.append(pin.name)
                 if pin.net == "0":
                     net = "gnd"
                 else:
@@ -2294,15 +2295,15 @@ def export_config(self, config_file=None, overwrite=False):
                 pin_nets.update(temp_dict)
 
             temp_dict2 = {
-                refdes: {
+                instance: {
                     "component": component,
                     "properties": properties,
                     "position": position,
                     "angle": angle,
                     "mirror": mirror,
                 }
             }
-            data_refdes.update(temp_dict2)
+            data_instance.update(temp_dict2)
             if "$PROJECTDIR" in path:
                 path = path.replace("$PROJECTDIR", self._app.project_path)
             elif "<Project>" in path:
@@ -2322,10 +2323,10 @@ def export_config(self, config_file=None, overwrite=False):
         for key, values in pin_mapping.items():
             temp_dict3 = {}
             for value in values:
-                if value._circuit_comp.refdes in temp_dict3:
-                    temp_dict3[value._circuit_comp.refdes].append(value.name)
+                if value._circuit_comp.parameters["InstanceName"] in temp_dict3:
+                    temp_dict3[value._circuit_comp.parameters["InstanceName"]].append(value.name)
                 else:
-                    temp_dict3.update({value._circuit_comp.refdes: [value.name]})
+                    temp_dict3.update({value._circuit_comp.parameters["InstanceName"]: [value.name]})
             pin_mapping[key] = temp_dict3
 
         port_dict = {}
@@ -2339,7 +2340,7 @@ def export_config(self, config_file=None, overwrite=False):
                 del pin_mapping[key]
 
         dict_out.update(
-            {"models": data_models, "refdes": data_refdes, "pin_mapping": pin_mapping, "ports": port_dict}
+            {"models": data_models, "instance": data_instance, "pin_mapping": pin_mapping, "ports": port_dict}
         )  # Call private export method to update dict_out.
 
         # update the json if it exists already
@@ -2385,7 +2386,10 @@ def import_config(self, config_file, *args):
         self.results._reset_results()
 
         data = read_configuration_file(config_file)
-
+        try:
+            offset = data["general"]["port_offset"]
+        except KeyError:
+            offset = 0
         if self.options.import_variables:
             try:
                 for k, v in data["general"]["variables"].items():
@@ -2402,7 +2406,7 @@ def import_config(self, config_file, *args):
             else:
                 self.results.import_postprocessing_variables = True
 
-        for i, j in data["refdes"].items():
+        for i, j in data["instance"].items():
             for key, value in data["models"].items():
                 if key == j["component"]:
                     component_type = value["component_type"]
@@ -2441,6 +2445,8 @@ def import_config(self, config_file, *args):
                         new_comp = self._app.modeler.schematic.create_touchstone_component(
                             value["file_path"], location=j["position"], angle=j["angle"]
                         )
+                        for pin in new_comp.pins:
+                            pin.name = value["port_names"][pin.pin_number - 1]
                     elif component_type == "spice":
                         new_comp = self._app.modeler.schematic.create_component_from_spicemodel(
                             input_file=value["file_path"], location=j["position"]
@@ -2455,6 +2461,8 @@ def import_config(self, config_file, *args):
                         )
                     if not new_comp:  # pragma: no cover
                         continue
+                    else:
+                        new_comp.parameters["InstanceName"] = i
                     # reorder pin positions for spice or nexxim state space components or touchstone components
                     if (
                         value.get("pin_locations", {})
@@ -2474,7 +2482,7 @@ def import_config(self, config_file, *args):
             pins = []
             for key, value in j.items():
                 for comp in comp_list:
-                    if comp.refdes == key:
+                    if comp.parameters["InstanceName"] == key:
                         for pin in comp.pins:
                             if pin.name in value:
                                 pins.append(pin)
@@ -2483,15 +2491,29 @@ def import_config(self, config_file, *args):
                     location = [x - y for x, y in zip(gnd_pin.location, [0, 0.00254])]
                     self._app.modeler.schematic.create_gnd(location, page=i)
             elif len(pins) > 1:
-                pins[0].connect_to_component(pins[1:], page_name=i)
+                pins[0].connect_to_component(pins[1:], page_name=i, offset=offset)
 
         for i, j in data["ports"].items():
+            created = False
             for key, value in j.items():
                 for comp in comp_list:
-                    if comp.refdes == key:
+                    if comp.parameters["InstanceName"] == key:
                         for pin in comp.pins:
                             if pin.name in value:
-                                self._app.modeler.schematic.create_interface_port(name=i, location=pin.location)
+                                location = [
+                                    pin.location[0] - offset * math.cos(pin.total_angle * math.pi / 180),
+                                    pin.location[1] - offset * math.sin(pin.total_angle * math.pi / 180),
+                                ]
+
+                                if not created:
+                                    self._app.modeler.schematic.create_interface_port(name=i, location=location)
+                                    created = True
+                                else:
+                                    self._app.modeler.schematic.create_page_port(
+                                        name=i, location=location, angle=pin.total_angle
+                                    )
+                                if offset != 0:
+                                    self._app.modeler.schematic.create_wire([location, pin.location])
 
         if self.options.import_setups and data.get("setups", None):
             self.results.import_setup = True

src/ansys/aedt/core/modeler/circuits/object_3d_circuit.py

@@ -31,6 +31,7 @@
 from ansys.aedt.core.generic.general_methods import pyaedt_function_handler
 from ansys.aedt.core.generic.numbers_utils import decompose_variable_value
 from ansys.aedt.core.generic.settings import settings
+from ansys.aedt.core.modeler.geometry_operators import GeometryOperators
 from ansys.aedt.core.modeler.geometry_operators import GeometryOperators as go
 
 
@@ -48,6 +49,11 @@ def units(self):
         """Length units."""
         return self._circuit_comp.units
 
+    @property
+    def total_angle(self):
+        """Return the pin orientation in the schematic."""
+        return int(self.angle + self._circuit_comp.angle)
+
     @property
     def location(self):
         """Pin Position in [x,y] format.
@@ -152,7 +158,14 @@ def _get_deltas(self, point, move_x=True, move_y=True, positive=True, units=1):
 
     @pyaedt_function_handler(component_pin="assignment")
     def connect_to_component(
-        self, assignment, page_name=None, use_wire=False, wire_name="", clearance_units=1, page_port_angle=None
+        self,
+        assignment,
+        page_name=None,
+        use_wire=False,
+        wire_name="",
+        clearance_units=1,
+        page_port_angle=None,
+        offset=0,
     ):
         """Connect schematic components.
 
@@ -174,6 +187,8 @@ def connect_to_component(
         page_port_angle : int, optional
             Page port angle on the source pin. The default is ``None``, in which case
             the angle is automatically computed.
+        offset : float, optional
+            Page port offset in the direction of the pin. The default is ``0``.
 
         Returns
         -------
@@ -274,11 +289,7 @@ def connect_to_component(
         if page_name is None:
             page_name = f"{self._circuit_comp.composed_name.replace('CompInst@', '').replace(';', '_')}_{self.name}"
 
-        if (
-            len(assignment) == 1
-            and (abs(self.location[1] - assignment[0].location[1]) + abs(self.location[0] - assignment[0].location[0]))
-            < 0.01524
-        ):
+        if len(assignment) == 1 and GeometryOperators.points_distance(self.location, assignment[0].location) < 0.01524:
             self._circuit_comp._circuit_components.create_wire([self.location, assignment[0].location], name=page_name)
             return True
         if "Port" in self._circuit_comp.composed_name:
@@ -296,19 +307,25 @@ def connect_to_component(
                         self._component._circuit_components.logger.debug(
                             "Cannot parse page name from circuit component name"
                         )
-        if self.location[0] > self._circuit_comp.location[0]:
-            angle = 180
-        else:
-            angle = 0
-        ret1 = self._circuit_comp._circuit_components.create_page_port(page_name, self.location, angle=angle)
+        angle = page_port_angle if page_port_angle else self.total_angle
+        location = [
+            self.location[0] - offset * math.cos(self.total_angle * math.pi / 180),
+            self.location[1] - offset * math.sin(self.total_angle * math.pi / 180),
+        ]
+        ret1 = self._circuit_comp._circuit_components.create_page_port(page_name, location, angle=angle)
+        if offset != 0:
+            self._circuit_comp._circuit_components.create_wire([self.location, location])
         for cmp in assignment:
-            if cmp.location[0] > cmp._circuit_comp.location[0]:
-                angle = 180
-            else:
-                angle = 0
+            location = [
+                cmp.location[0] - offset * math.cos(cmp.total_angle * math.pi / 180),
+                cmp.location[1] - offset * math.sin(cmp.total_angle * math.pi / 180),
+            ]
+
             ret2 = self._circuit_comp._circuit_components.create_page_port(
-                page_name, location=cmp.location, angle=angle
+                page_name, location=location, angle=cmp.total_angle
             )
+            if offset != 0:
+                self._circuit_comp._circuit_components.create_wire([cmp.location, location])
         if ret1 and ret2:
             return True, ret1, ret2
         else:

src/ansys/aedt/core/modeler/circuits/primitives_circuit.py

@@ -529,7 +529,7 @@ def create_model_from_touchstone(self, input_file, model_name=None, show_bitmap=
             bmp_file_name = Path(image_subcircuit_path).name
 
         if not port_names:
-            port_names = ["Port" + str(i + 1) for i in range(num_terminal)]
+            port_names = [str(i + 1) for i in range(num_terminal)]
         arg = [
             "NAME:" + model_name,
             "Name:=",

tests/system/extensions/example_models/T45/circuit_config.json

@@ -57,7 +57,7 @@
             "file_path": ""
         }
     },
-    "refdes": {
+    "instance": {
         "L1": {
             "component": "IND_",
             "properties": {

tests/system/general/test_21_Circuit.py

@@ -823,7 +823,7 @@ def test_44_auto_wire(self, aedtapp):
         l2 = aedtapp.modeler.schematic.create_inductor(value=1e-9, location=[1400, 4000], angle=0)
         aedtapp.modeler.schematic.create_resistor(value=50, location=[3100, 3200])
 
-        assert p1.pins[0].connect_to_component(r1.pins[1], use_wire=True)
+        assert p1.pins[0].connect_to_component(r1.pins[1], use_wire=True, offset=0.0512)
         assert l1.pins[0].connect_to_component(l2.pins[0], use_wire=True)
         assert l3.pins[0].connect_to_component(l2.pins[1], use_wire=True, clearance_units=2)
         assert l4.pins[1].connect_to_component(l3.pins[0], use_wire=True, clearance_units=2)