From 1482fc4d4c23343c78e9b8af86392dcba83ea604 Mon Sep 17 00:00:00 2001
From: HaiwenZhang <haiwensummer@gmail.com>
Date: Tue, 9 Jul 2024 14:01:26 +0800
Subject: [PATCH 1/7] FEAT: change symbol pin locations
(cherry picked from commit 4c763e9e13a92219ed20e52d134d5f679bb12ed1)
---
pyaedt/modeler/circuits/object3dcircuit.py | 167 +++++++++++++++++++++
1 file changed, 167 insertions(+)
diff --git a/pyaedt/modeler/circuits/object3dcircuit.py b/pyaedt/modeler/circuits/object3dcircuit.py
index 911c78c8ab8..0e2cbdbc57e 100644
--- a/pyaedt/modeler/circuits/object3dcircuit.py
+++ b/pyaedt/modeler/circuits/object3dcircuit.py
@@ -955,6 +955,173 @@ def enforce_touchstone_model_passive(self):
self.model_data.props = props
return self.model_data.update()
+ @pyaedt_function_handler()
+ def change_symbol_pin_locations(self, pin_locations):
+ """ Change symbol pin locations in Designer.
+
+ Parameters
+ ----------
+ pin_locations : dict
+ A dictionary consisting of a list of pin names on the left and a list of pin names on the right.
+
+ Returns
+ -------
+ bool
+
+ References
+ ---------
+ >>> oSymbolManager.EditSymbolAndUpdateComps
+
+ Examples
+ --------
+
+ >>> from pyaedt import Circuit
+ >>> cir = Circuit(my_project)
+ >>> cir.modeler.schematic_units = "mil"
+ >>> ts_path = os.path.join(current_path, "ch3_dq.s4p")
+ >>> ts_component = cir.modeler.schematic.create_touchstone_component(ts_path, show_bitmap=False)
+ >>> pin_locations = {
+ >>> "left": [
+ >>> 'DDR_CH3_DM_DBI0_BGA_BE47',
+ >>> 'DDR_CH3_DM_DBI1_BGA_BJ50',
+ >>> 'DDR_CH3_DM_DBI0_DIE_7976'
+ >>> ],
+ >>> "right": [
+ >>> 'DDR_CH3_DM_DBI1_DIE_12471'
+ >>> ]
+ >>> }
+ >>> ts_component.change_symbol_pin_locations(pin_locations)
+
+ """
+
+ y_spacing = 0.00254
+
+ left_pins = pin_locations["left"]
+ right_pins = pin_locations["right"]
+
+ left_pins_length = len(left_pins)
+ right_pins_length = len(right_pins)
+
+ max_pins_length = max(left_pins_length, right_pins_length)
+ h = int(max_pins_length / 2)
+
+ x1 = 0
+ x2 = 0.00254 * 4
+ y1 = 0
+ y2 = y_spacing * (max_pins_length + 1)
+
+ pin_left_x = -0.00254 * 2
+ pin_left_angle = 0
+
+ pin_right_x = 0.00254 * 6
+ pin_right_angle = math.pi
+
+ text_spacing = 0.024765
+
+ arg = [
+ "NAME:{}".format(self.model_name),
+ "ModTime:=" , int(time.time()),
+ "Library:=" , "",
+ "ModSinceLib:=" , False,
+ "LibLocation:=" , "Project",
+ "HighestLevel:=" , 1,
+ "Normalize:=" , False,
+ "InitialLevels:=" , [0 ,1],
+ ]
+ terminals_arg = [
+ "NAME:Terminals",
+ ]
+ yp = y_spacing * max_pins_length
+
+ for left_pin in left_pins:
+ pin_def = [left_pin, pin_left_x, yp, pin_left_angle, "N", 0, 0.00254 * 2, False, 0, True, "", True, False, left_pin, True]
+ pin_name_rect = [1, 0, 0, 0, pin_left_x, yp + 0.00176388888889594 / 2,
+ 0.00111403508 * len(left_pin),
+ 0.00176388888889594,
+ 0, 0, 0]
+ pin_text = [
+ pin_left_x, yp + 0.00176388888889594 / 2, 0, 4, 5, False, "Arial", 0, left_pin, False, False,
+ "ExtentRect:=",
+ pin_name_rect
+ ]
+ pin_name = [
+ 2, 5, 1,
+ "Text:=" ,
+ pin_text
+ ]
+ props_display_map = [
+ "NAME:PropDisplayMap",
+ "PinName:=",
+ pin_name
+ ]
+ pin_local_arg = [
+ "NAME:PinDef",
+ "Pin:=",
+ pin_def,
+ props_display_map
+ ]
+ arg.append(pin_local_arg)
+ terminals_arg.append("TermAttributes:=")
+ terminals_arg.append([left_pin, left_pin, 0, 0, -1, ""])
+ yp = yp - y_spacing
+
+ yp = y_spacing * max_pins_length
+ for right_pin in right_pins:
+ pin_def = [right_pin, pin_right_x, yp, pin_right_angle, "N", 0, 0.00254 * 2, False, 0, True, "", True, False,
+ right_pin, True]
+ pin_name_rect = [1, 0, 0, 0, pin_right_x,
+ yp + 0.00176388888889594 / 2,
+ 0.00111403508 * len(right_pin),
+ 0.00176388888889594,
+ 0, 0, 0]
+ pin_text = [
+ pin_right_x, yp + 0.00176388888889594 / 2, 0, 4, 5, False, "Arial", 0, right_pin, False, False,
+ "ExtentRect:=",
+ pin_name_rect
+ ]
+ pin_name = [
+ 2, 5, 1,
+ "Text:=" ,
+ pin_text
+ ]
+ props_display_map = [
+ "NAME:PropDisplayMap",
+ "PinName:=",
+ pin_name
+ ]
+ pin_local_arg = [
+ "NAME:PinDef",
+ "Pin:=",
+ pin_def,
+ props_display_map
+ ]
+ arg.append(pin_local_arg)
+ terminals_arg.append("TermAttributes:=")
+ terminals_arg.append([right_pin, right_pin, 1, 0, -1, ""])
+ yp = yp - y_spacing
+
+ arg.append(
+ [
+ "NAME:Graphics",
+ "Rect:=" , [0, 0, 0, 0, (x1 + x2) / 2, (y1 + y2) / 2, x2 - x1, y2 - y1, 0, 0, 0],
+ "Rect:=" , [0 ,1 ,0 ,0 ,(x1 + x2) / 2 , (y1 + y2) / 2 ,0.000423333333333333 ,0.000423333333333331 ,0 ,0 ,0]
+ ]
+ )
+
+ edit_context_arg = [
+ "NAME:EditContext",
+ "RefPinOption:=", 2,
+ "CompName:=" , self.model_name,
+ terminals_arg
+ ]
+
+ self._circuit_components.o_symbol_manager.EditSymbolAndUpdateComps(self.model_name, arg, [], edit_context_arg)
+ self._circuit_components.oeditor.MovePins(self.composed_name,-0,-0,0,0,
+ [
+ "NAME:PinMoveData"
+ ]
+ )
+ return True
class Wire(object):
"""Creates and manipulates a wire."""
From 040b7c907f7d310dd9630bfe987e436617a7d6df Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
<66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Tue, 9 Jul 2024 06:40:44 +0000
Subject: [PATCH 2/7] [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
(cherry picked from commit bca38cca4052110d6084eab656600610aa1fb22d)
---
pyaedt/modeler/circuits/object3dcircuit.py | 181 +++++++++++++--------
1 file changed, 112 insertions(+), 69 deletions(-)
diff --git a/pyaedt/modeler/circuits/object3dcircuit.py b/pyaedt/modeler/circuits/object3dcircuit.py
index 0e2cbdbc57e..62d4f20c3dc 100644
--- a/pyaedt/modeler/circuits/object3dcircuit.py
+++ b/pyaedt/modeler/circuits/object3dcircuit.py
@@ -957,7 +957,7 @@ def enforce_touchstone_model_passive(self):
@pyaedt_function_handler()
def change_symbol_pin_locations(self, pin_locations):
- """ Change symbol pin locations in Designer.
+ """Change symbol pin locations in Designer.
Parameters
----------
@@ -1020,13 +1020,20 @@ def change_symbol_pin_locations(self, pin_locations):
arg = [
"NAME:{}".format(self.model_name),
- "ModTime:=" , int(time.time()),
- "Library:=" , "",
- "ModSinceLib:=" , False,
- "LibLocation:=" , "Project",
- "HighestLevel:=" , 1,
- "Normalize:=" , False,
- "InitialLevels:=" , [0 ,1],
+ "ModTime:=",
+ int(time.time()),
+ "Library:=",
+ "",
+ "ModSinceLib:=",
+ False,
+ "LibLocation:=",
+ "Project",
+ "HighestLevel:=",
+ 1,
+ "Normalize:=",
+ False,
+ "InitialLevels:=",
+ [0, 1],
]
terminals_arg = [
"NAME:Terminals",
@@ -1034,32 +1041,54 @@ def change_symbol_pin_locations(self, pin_locations):
yp = y_spacing * max_pins_length
for left_pin in left_pins:
- pin_def = [left_pin, pin_left_x, yp, pin_left_angle, "N", 0, 0.00254 * 2, False, 0, True, "", True, False, left_pin, True]
- pin_name_rect = [1, 0, 0, 0, pin_left_x, yp + 0.00176388888889594 / 2,
- 0.00111403508 * len(left_pin),
- 0.00176388888889594,
- 0, 0, 0]
- pin_text = [
- pin_left_x, yp + 0.00176388888889594 / 2, 0, 4, 5, False, "Arial", 0, left_pin, False, False,
- "ExtentRect:=",
- pin_name_rect
+ pin_def = [
+ left_pin,
+ pin_left_x,
+ yp,
+ pin_left_angle,
+ "N",
+ 0,
+ 0.00254 * 2,
+ False,
+ 0,
+ True,
+ "",
+ True,
+ False,
+ left_pin,
+ True,
]
- pin_name = [
- 2, 5, 1,
- "Text:=" ,
- pin_text
+ pin_name_rect = [
+ 1,
+ 0,
+ 0,
+ 0,
+ pin_left_x,
+ yp + 0.00176388888889594 / 2,
+ 0.00111403508 * len(left_pin),
+ 0.00176388888889594,
+ 0,
+ 0,
+ 0,
]
- props_display_map = [
- "NAME:PropDisplayMap",
- "PinName:=",
- pin_name
- ]
- pin_local_arg = [
- "NAME:PinDef",
- "Pin:=",
- pin_def,
- props_display_map
+ pin_text = [
+ pin_left_x,
+ yp + 0.00176388888889594 / 2,
+ 0,
+ 4,
+ 5,
+ False,
+ "Arial",
+ 0,
+ left_pin,
+ False,
+ False,
+ "ExtentRect:=",
+ pin_name_rect,
]
+ pin_name = [2, 5, 1, "Text:=", pin_text]
+ props_display_map = ["NAME:PropDisplayMap", "PinName:=", pin_name]
+ pin_local_arg = ["NAME:PinDef", "Pin:=", pin_def, props_display_map]
arg.append(pin_local_arg)
terminals_arg.append("TermAttributes:=")
terminals_arg.append([left_pin, left_pin, 0, 0, -1, ""])
@@ -1067,34 +1096,54 @@ def change_symbol_pin_locations(self, pin_locations):
yp = y_spacing * max_pins_length
for right_pin in right_pins:
- pin_def = [right_pin, pin_right_x, yp, pin_right_angle, "N", 0, 0.00254 * 2, False, 0, True, "", True, False,
- right_pin, True]
- pin_name_rect = [1, 0, 0, 0, pin_right_x,
- yp + 0.00176388888889594 / 2,
- 0.00111403508 * len(right_pin),
- 0.00176388888889594,
- 0, 0, 0]
- pin_text = [
- pin_right_x, yp + 0.00176388888889594 / 2, 0, 4, 5, False, "Arial", 0, right_pin, False, False,
- "ExtentRect:=",
- pin_name_rect
- ]
- pin_name = [
- 2, 5, 1,
- "Text:=" ,
- pin_text
+ pin_def = [
+ right_pin,
+ pin_right_x,
+ yp,
+ pin_right_angle,
+ "N",
+ 0,
+ 0.00254 * 2,
+ False,
+ 0,
+ True,
+ "",
+ True,
+ False,
+ right_pin,
+ True,
]
- props_display_map = [
- "NAME:PropDisplayMap",
- "PinName:=",
- pin_name
+ pin_name_rect = [
+ 1,
+ 0,
+ 0,
+ 0,
+ pin_right_x,
+ yp + 0.00176388888889594 / 2,
+ 0.00111403508 * len(right_pin),
+ 0.00176388888889594,
+ 0,
+ 0,
+ 0,
]
- pin_local_arg = [
- "NAME:PinDef",
- "Pin:=",
- pin_def,
- props_display_map
+ pin_text = [
+ pin_right_x,
+ yp + 0.00176388888889594 / 2,
+ 0,
+ 4,
+ 5,
+ False,
+ "Arial",
+ 0,
+ right_pin,
+ False,
+ False,
+ "ExtentRect:=",
+ pin_name_rect,
]
+ pin_name = [2, 5, 1, "Text:=", pin_text]
+ props_display_map = ["NAME:PropDisplayMap", "PinName:=", pin_name]
+ pin_local_arg = ["NAME:PinDef", "Pin:=", pin_def, props_display_map]
arg.append(pin_local_arg)
terminals_arg.append("TermAttributes:=")
terminals_arg.append([right_pin, right_pin, 1, 0, -1, ""])
@@ -1103,26 +1152,20 @@ def change_symbol_pin_locations(self, pin_locations):
arg.append(
[
"NAME:Graphics",
- "Rect:=" , [0, 0, 0, 0, (x1 + x2) / 2, (y1 + y2) / 2, x2 - x1, y2 - y1, 0, 0, 0],
- "Rect:=" , [0 ,1 ,0 ,0 ,(x1 + x2) / 2 , (y1 + y2) / 2 ,0.000423333333333333 ,0.000423333333333331 ,0 ,0 ,0]
+ "Rect:=",
+ [0, 0, 0, 0, (x1 + x2) / 2, (y1 + y2) / 2, x2 - x1, y2 - y1, 0, 0, 0],
+ "Rect:=",
+ [0, 1, 0, 0, (x1 + x2) / 2, (y1 + y2) / 2, 0.000423333333333333, 0.000423333333333331, 0, 0, 0],
]
)
- edit_context_arg = [
- "NAME:EditContext",
- "RefPinOption:=", 2,
- "CompName:=" , self.model_name,
- terminals_arg
- ]
+ edit_context_arg = ["NAME:EditContext", "RefPinOption:=", 2, "CompName:=", self.model_name, terminals_arg]
self._circuit_components.o_symbol_manager.EditSymbolAndUpdateComps(self.model_name, arg, [], edit_context_arg)
- self._circuit_components.oeditor.MovePins(self.composed_name,-0,-0,0,0,
- [
- "NAME:PinMoveData"
- ]
- )
+ self._circuit_components.oeditor.MovePins(self.composed_name, -0, -0, 0, 0, ["NAME:PinMoveData"])
return True
+
class Wire(object):
"""Creates and manipulates a wire."""
From 7679d584775de920672aa958c5c2523919081dfc Mon Sep 17 00:00:00 2001
From: HaiwenZhang <haiwensummer@gmail.com>
Date: Sun, 14 Jul 2024 10:26:33 +0800
Subject: [PATCH 3/7] optimize code
(cherry picked from commit 514b6adbec56b26a21ea42f69da84b60920eb8e7)
---
pyaedt/modeler/circuits/object3dcircuit.py | 212 ++++++---------------
1 file changed, 57 insertions(+), 155 deletions(-)
diff --git a/pyaedt/modeler/circuits/object3dcircuit.py b/pyaedt/modeler/circuits/object3dcircuit.py
index 62d4f20c3dc..b394a6fcc99 100644
--- a/pyaedt/modeler/circuits/object3dcircuit.py
+++ b/pyaedt/modeler/circuits/object3dcircuit.py
@@ -954,218 +954,120 @@ def enforce_touchstone_model_passive(self):
props["ModTime"] = int(time.time())
self.model_data.props = props
return self.model_data.update()
-
+
@pyaedt_function_handler()
def change_symbol_pin_locations(self, pin_locations):
- """Change symbol pin locations in Designer.
+ """Change the locations of symbol pins in Designer.
Parameters
----------
pin_locations : dict
- A dictionary consisting of a list of pin names on the left and a list of pin names on the right.
+ A dictionary with two keys: "left" and "right", each containing a list of pin names to be placed on the left and right sides of the symbol, respectively.
Returns
-------
bool
+ True if the pin locations were successfully changed, False otherwise.
References
- ---------
+ ----------
>>> oSymbolManager.EditSymbolAndUpdateComps
Examples
--------
-
>>> from pyaedt import Circuit
>>> cir = Circuit(my_project)
>>> cir.modeler.schematic_units = "mil"
- >>> ts_path = os.path.join(current_path, "ch3_dq.s4p")
+ >>> ts_path = os.path.join(current_path, "connector_model.s4p")
>>> ts_component = cir.modeler.schematic.create_touchstone_component(ts_path, show_bitmap=False)
>>> pin_locations = {
>>> "left": [
>>> 'DDR_CH3_DM_DBI0_BGA_BE47',
>>> 'DDR_CH3_DM_DBI1_BGA_BJ50',
- >>> 'DDR_CH3_DM_DBI0_DIE_7976'
+ >>> 'DDR_CH3_DM_DBI1_DIE_12471'
>>> ],
>>> "right": [
- >>> 'DDR_CH3_DM_DBI1_DIE_12471'
+ >>> 'DDR_CH3_DM_DBI0_DIE_7976'
>>> ]
>>> }
>>> ts_component.change_symbol_pin_locations(pin_locations)
-
"""
-
- y_spacing = 0.00254
+ base_spacing = 0.00254
+ symbol_pin_name_list = self.model_data.props.get("PortNames", [])
+ pin_name_str_max_length = max(len(s) for s in symbol_pin_name_list)
left_pins = pin_locations["left"]
right_pins = pin_locations["right"]
-
left_pins_length = len(left_pins)
right_pins_length = len(right_pins)
-
max_pins_length = max(left_pins_length, right_pins_length)
- h = int(max_pins_length / 2)
+
+ # Ensure the total number of pins matches the symbol pin names
+ if (right_pins_length + left_pins_length) != len(symbol_pin_name_list):
+ self._circuit_components._app.logger.error("The number of pins in the input pin_locations does not match the number of pins in the Symbol.")
+ return False
+
+ x_factor = int(pin_name_str_max_length / 3)
x1 = 0
- x2 = 0.00254 * 4
+ x2 = base_spacing * x_factor
y1 = 0
- y2 = y_spacing * (max_pins_length + 1)
+ y2 = base_spacing * (max_pins_length + 1)
- pin_left_x = -0.00254 * 2
+ pin_left_x = -base_spacing
pin_left_angle = 0
-
- pin_right_x = 0.00254 * 6
+ pin_right_x = base_spacing * (x_factor + 1)
pin_right_angle = math.pi
- text_spacing = 0.024765
-
- arg = [
- "NAME:{}".format(self.model_name),
- "ModTime:=",
- int(time.time()),
- "Library:=",
- "",
- "ModSinceLib:=",
- False,
- "LibLocation:=",
- "Project",
- "HighestLevel:=",
- 1,
- "Normalize:=",
- False,
- "InitialLevels:=",
- [0, 1],
- ]
- terminals_arg = [
- "NAME:Terminals",
- ]
- yp = y_spacing * max_pins_length
-
- for left_pin in left_pins:
+ def create_pin_def(pin_name, x, y, angle):
pin_def = [
- left_pin,
- pin_left_x,
- yp,
- pin_left_angle,
- "N",
- 0,
- 0.00254 * 2,
- False,
- 0,
- True,
- "",
- True,
- False,
- left_pin,
- True,
+ pin_name, x, y, angle, "N", 0, base_spacing * 2, False, 0, True, "", True, False, pin_name, True
]
pin_name_rect = [
- 1,
- 0,
- 0,
- 0,
- pin_left_x,
- yp + 0.00176388888889594 / 2,
- 0.00111403508 * len(left_pin),
- 0.00176388888889594,
- 0,
- 0,
- 0,
+ 1, 0, 0, 0, x, y + 0.00176388888889594 / 2, 0.00111403508 * len(pin_name), 0.00176388888889594, 0, 0, 0
]
pin_text = [
- pin_left_x,
- yp + 0.00176388888889594 / 2,
- 0,
- 4,
- 5,
- False,
- "Arial",
- 0,
- left_pin,
- False,
- False,
- "ExtentRect:=",
- pin_name_rect,
+ x, y + 0.00176388888889594 / 2, 0, 4, 5, False, "Arial", 0, pin_name, False, False, "ExtentRect:=",
+ pin_name_rect
]
- pin_name = [2, 5, 1, "Text:=", pin_text]
- props_display_map = ["NAME:PropDisplayMap", "PinName:=", pin_name]
- pin_local_arg = ["NAME:PinDef", "Pin:=", pin_def, props_display_map]
- arg.append(pin_local_arg)
- terminals_arg.append("TermAttributes:=")
- terminals_arg.append([left_pin, left_pin, 0, 0, -1, ""])
- yp = yp - y_spacing
+ pin_name_def = [2, 5, 1, "Text:=", pin_text]
+ props_display_map = ["NAME:PropDisplayMap", "PinName:=", pin_name_def]
+ return ["NAME:PinDef", "Pin:=", pin_def, props_display_map]
- yp = y_spacing * max_pins_length
- for right_pin in right_pins:
- pin_def = [
- right_pin,
- pin_right_x,
- yp,
- pin_right_angle,
- "N",
- 0,
- 0.00254 * 2,
- False,
- 0,
- True,
- "",
- True,
- False,
- right_pin,
- True,
- ]
- pin_name_rect = [
- 1,
- 0,
- 0,
- 0,
- pin_right_x,
- yp + 0.00176388888889594 / 2,
- 0.00111403508 * len(right_pin),
- 0.00176388888889594,
- 0,
- 0,
- 0,
- ]
- pin_text = [
- pin_right_x,
- yp + 0.00176388888889594 / 2,
- 0,
- 4,
- 5,
- False,
- "Arial",
- 0,
- right_pin,
- False,
- False,
- "ExtentRect:=",
- pin_name_rect,
- ]
- pin_name = [2, 5, 1, "Text:=", pin_text]
- props_display_map = ["NAME:PropDisplayMap", "PinName:=", pin_name]
- pin_local_arg = ["NAME:PinDef", "Pin:=", pin_def, props_display_map]
- arg.append(pin_local_arg)
+ args = [
+ "NAME:{}".format(self.model_name), "ModTime:=", int(time.time()), "Library:=", "", "ModSinceLib:=", False,
+ "LibLocation:=", "Project", "HighestLevel:=", 1, "Normalize:=", False, "InitialLevels:=", [0, 1],
+ ]
+ terminals_arg = ["NAME:Terminals"]
+
+ yp = base_spacing * max_pins_length
+ for pin_name in left_pins:
+ args.append(create_pin_def(pin_name, pin_left_x, yp, pin_left_angle))
+ yp -= base_spacing
+
+ yp = base_spacing * max_pins_length
+ for pin_name in right_pins:
+ args.append(create_pin_def(pin_name, pin_right_x, yp, pin_right_angle))
+ yp -= base_spacing
+
+ args.append([
+ "NAME:Graphics",
+ "Rect:=",
+ [0, 0, 0, 0, (x1 + x2) / 2, (y1 + y2) / 2, x2 - x1, y2 - y1, 0, 0, 0],
+ "Rect:=",
+ [0, 1, 0, 0, (x1 + x2) / 2, (y1 + y2) / 2, 0.000423333333333333, 0.000423333333333333, 0, 0, 0],
+ ])
+
+ for pin_name in self.model_data.props.get("PortNames", []):
terminals_arg.append("TermAttributes:=")
- terminals_arg.append([right_pin, right_pin, 1, 0, -1, ""])
- yp = yp - y_spacing
-
- arg.append(
- [
- "NAME:Graphics",
- "Rect:=",
- [0, 0, 0, 0, (x1 + x2) / 2, (y1 + y2) / 2, x2 - x1, y2 - y1, 0, 0, 0],
- "Rect:=",
- [0, 1, 0, 0, (x1 + x2) / 2, (y1 + y2) / 2, 0.000423333333333333, 0.000423333333333331, 0, 0, 0],
- ]
- )
+ terminals_arg.append([pin_name, pin_name, 0 if pin_name in left_pins else 1, 0, -1, ""])
edit_context_arg = ["NAME:EditContext", "RefPinOption:=", 2, "CompName:=", self.model_name, terminals_arg]
- self._circuit_components.o_symbol_manager.EditSymbolAndUpdateComps(self.model_name, arg, [], edit_context_arg)
+ self._circuit_components.o_symbol_manager.EditSymbolAndUpdateComps(self.model_name, args, [], edit_context_arg)
self._circuit_components.oeditor.MovePins(self.composed_name, -0, -0, 0, 0, ["NAME:PinMoveData"])
return True
-
class Wire(object):
"""Creates and manipulates a wire."""
From a734a8e52ba697a8fdc788c613edb3cbabfd5f14 Mon Sep 17 00:00:00 2001
From: HaiwenZhang <haiwensummer@gmail.com>
Date: Sun, 14 Jul 2024 10:33:50 +0800
Subject: [PATCH 4/7] Fix line 955 too long
(cherry picked from commit 2d57f9014fb6befb2181dd4ddc86515878028688)
---
pyaedt/modeler/circuits/object3dcircuit.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/pyaedt/modeler/circuits/object3dcircuit.py b/pyaedt/modeler/circuits/object3dcircuit.py
index b394a6fcc99..47058ea2d12 100644
--- a/pyaedt/modeler/circuits/object3dcircuit.py
+++ b/pyaedt/modeler/circuits/object3dcircuit.py
@@ -962,7 +962,9 @@ def change_symbol_pin_locations(self, pin_locations):
Parameters
----------
pin_locations : dict
- A dictionary with two keys: "left" and "right", each containing a list of pin names to be placed on the left and right sides of the symbol, respectively.
+ A dictionary with two keys: "left" and "right",
+ each containing a list of pin names to be placed on the left and
+ right sides of the symbol, respectively.
Returns
-------
From 23f07a53288674072e669c8b11a86d9095aab265 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
<66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Sun, 14 Jul 2024 02:35:57 +0000
Subject: [PATCH 5/7] [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
(cherry picked from commit e0119583c5bda8850976e7a6fc2ec4339ad05e00)
---
pyaedt/modeler/circuits/object3dcircuit.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pyaedt/modeler/circuits/object3dcircuit.py b/pyaedt/modeler/circuits/object3dcircuit.py
index 47058ea2d12..241d23fcdb0 100644
--- a/pyaedt/modeler/circuits/object3dcircuit.py
+++ b/pyaedt/modeler/circuits/object3dcircuit.py
@@ -962,7 +962,7 @@ def change_symbol_pin_locations(self, pin_locations):
Parameters
----------
pin_locations : dict
- A dictionary with two keys: "left" and "right",
+ A dictionary with two keys: "left" and "right",
each containing a list of pin names to be placed on the left and
right sides of the symbol, respectively.
From 1d9554d59752ca72ea3e3581915e9a65f91488a3 Mon Sep 17 00:00:00 2001
From: Samuelopez-ansys <samuel.lopez@ansys.com>
Date: Fri, 26 Jul 2024 12:22:10 +0200
Subject: [PATCH 6/7] Fix docstring
---
pyaedt/modeler/circuits/object3dcircuit.py | 75 ++++++++++++++++------
1 file changed, 56 insertions(+), 19 deletions(-)
diff --git a/pyaedt/modeler/circuits/object3dcircuit.py b/pyaedt/modeler/circuits/object3dcircuit.py
index 241d23fcdb0..7c11450a0f4 100644
--- a/pyaedt/modeler/circuits/object3dcircuit.py
+++ b/pyaedt/modeler/circuits/object3dcircuit.py
@@ -954,10 +954,10 @@ def enforce_touchstone_model_passive(self):
props["ModTime"] = int(time.time())
self.model_data.props = props
return self.model_data.update()
-
+
@pyaedt_function_handler()
def change_symbol_pin_locations(self, pin_locations):
- """Change the locations of symbol pins in Designer.
+ """Change the locations of symbol pins.
Parameters
----------
@@ -969,7 +969,7 @@ def change_symbol_pin_locations(self, pin_locations):
Returns
-------
bool
- True if the pin locations were successfully changed, False otherwise.
+ ``True`` if pin locations were successfully changed, ``False`` otherwise.
References
----------
@@ -1006,7 +1006,9 @@ def change_symbol_pin_locations(self, pin_locations):
# Ensure the total number of pins matches the symbol pin names
if (right_pins_length + left_pins_length) != len(symbol_pin_name_list):
- self._circuit_components._app.logger.error("The number of pins in the input pin_locations does not match the number of pins in the Symbol.")
+ self._circuit_components._app.logger.error(
+ "The number of pins in the input pin_locations does not match the number of pins in the Symbol."
+ )
return False
x_factor = int(pin_name_str_max_length / 3)
@@ -1022,23 +1024,55 @@ def change_symbol_pin_locations(self, pin_locations):
pin_right_angle = math.pi
def create_pin_def(pin_name, x, y, angle):
- pin_def = [
- pin_name, x, y, angle, "N", 0, base_spacing * 2, False, 0, True, "", True, False, pin_name, True
- ]
+ pin_def = [pin_name, x, y, angle, "N", 0, base_spacing * 2, False, 0, True, "", True, False, pin_name, True]
pin_name_rect = [
- 1, 0, 0, 0, x, y + 0.00176388888889594 / 2, 0.00111403508 * len(pin_name), 0.00176388888889594, 0, 0, 0
+ 1,
+ 0,
+ 0,
+ 0,
+ x,
+ y + 0.00176388888889594 / 2,
+ 0.00111403508 * len(pin_name),
+ 0.00176388888889594,
+ 0,
+ 0,
+ 0,
]
pin_text = [
- x, y + 0.00176388888889594 / 2, 0, 4, 5, False, "Arial", 0, pin_name, False, False, "ExtentRect:=",
- pin_name_rect
+ x,
+ y + 0.00176388888889594 / 2,
+ 0,
+ 4,
+ 5,
+ False,
+ "Arial",
+ 0,
+ pin_name,
+ False,
+ False,
+ "ExtentRect:=",
+ pin_name_rect,
]
pin_name_def = [2, 5, 1, "Text:=", pin_text]
props_display_map = ["NAME:PropDisplayMap", "PinName:=", pin_name_def]
return ["NAME:PinDef", "Pin:=", pin_def, props_display_map]
args = [
- "NAME:{}".format(self.model_name), "ModTime:=", int(time.time()), "Library:=", "", "ModSinceLib:=", False,
- "LibLocation:=", "Project", "HighestLevel:=", 1, "Normalize:=", False, "InitialLevels:=", [0, 1],
+ "NAME:{}".format(self.model_name),
+ "ModTime:=",
+ int(time.time()),
+ "Library:=",
+ "",
+ "ModSinceLib:=",
+ False,
+ "LibLocation:=",
+ "Project",
+ "HighestLevel:=",
+ 1,
+ "Normalize:=",
+ False,
+ "InitialLevels:=",
+ [0, 1],
]
terminals_arg = ["NAME:Terminals"]
@@ -1052,13 +1086,15 @@ def create_pin_def(pin_name, x, y, angle):
args.append(create_pin_def(pin_name, pin_right_x, yp, pin_right_angle))
yp -= base_spacing
- args.append([
- "NAME:Graphics",
- "Rect:=",
- [0, 0, 0, 0, (x1 + x2) / 2, (y1 + y2) / 2, x2 - x1, y2 - y1, 0, 0, 0],
- "Rect:=",
- [0, 1, 0, 0, (x1 + x2) / 2, (y1 + y2) / 2, 0.000423333333333333, 0.000423333333333333, 0, 0, 0],
- ])
+ args.append(
+ [
+ "NAME:Graphics",
+ "Rect:=",
+ [0, 0, 0, 0, (x1 + x2) / 2, (y1 + y2) / 2, x2 - x1, y2 - y1, 0, 0, 0],
+ "Rect:=",
+ [0, 1, 0, 0, (x1 + x2) / 2, (y1 + y2) / 2, 0.000423333333333333, 0.000423333333333333, 0, 0, 0],
+ ]
+ )
for pin_name in self.model_data.props.get("PortNames", []):
terminals_arg.append("TermAttributes:=")
@@ -1070,6 +1106,7 @@ def create_pin_def(pin_name, x, y, angle):
self._circuit_components.oeditor.MovePins(self.composed_name, -0, -0, 0, 0, ["NAME:PinMoveData"])
return True
+
class Wire(object):
"""Creates and manipulates a wire."""
From 35b7269ec2d555a56c616f5e5b8c484e6aa3ad1f Mon Sep 17 00:00:00 2001
From: Samuelopez-ansys <samuel.lopez@ansys.com>
Date: Fri, 26 Jul 2024 12:35:14 +0200
Subject: [PATCH 7/7] Add UT
---
_unittest/test_21_Circuit.py | 13 +++++++++++++
pyaedt/modeler/circuits/object3dcircuit.py | 13 +++----------
2 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/_unittest/test_21_Circuit.py b/_unittest/test_21_Circuit.py
index b7a7adf1f31..87891b71668 100644
--- a/_unittest/test_21_Circuit.py
+++ b/_unittest/test_21_Circuit.py
@@ -963,3 +963,16 @@ def test_50_enforce_touchstone_passive(self):
assert not nexxim_customization["Reciprocal"]
assert "" == nexxim_customization["ModelOption"]
assert 2 == nexxim_customization["DataType"]
+
+ def test_51_change_symbol_pin_location(self):
+ self.aedtapp.insert_design("Pin_location")
+ self.aedtapp.modeler.schematic_units = "mil"
+ ts_component = self.aedtapp.modeler.schematic.create_touchstone_component(self.touchstone_file)
+ pins = ts_component.pins
+ pin_locations = {
+ "left": [pins[0].name, pins[1].name, pins[2].name, pins[3].name, pins[4].name],
+ "right": [pins[5].name],
+ }
+ assert ts_component.change_symbol_pin_locations(pin_locations)
+ pin_locations = {"left": [pins[0].name, pins[1].name, pins[2].name], "right": [pins[5].name]}
+ assert not ts_component.change_symbol_pin_locations(pin_locations)
diff --git a/pyaedt/modeler/circuits/object3dcircuit.py b/pyaedt/modeler/circuits/object3dcircuit.py
index 7c11450a0f4..4e5516321f5 100644
--- a/pyaedt/modeler/circuits/object3dcircuit.py
+++ b/pyaedt/modeler/circuits/object3dcircuit.py
@@ -982,16 +982,9 @@ def change_symbol_pin_locations(self, pin_locations):
>>> cir.modeler.schematic_units = "mil"
>>> ts_path = os.path.join(current_path, "connector_model.s4p")
>>> ts_component = cir.modeler.schematic.create_touchstone_component(ts_path, show_bitmap=False)
- >>> pin_locations = {
- >>> "left": [
- >>> 'DDR_CH3_DM_DBI0_BGA_BE47',
- >>> 'DDR_CH3_DM_DBI1_BGA_BJ50',
- >>> 'DDR_CH3_DM_DBI1_DIE_12471'
- >>> ],
- >>> "right": [
- >>> 'DDR_CH3_DM_DBI0_DIE_7976'
- >>> ]
- >>> }
+ >>> pin_locations = {"left":
+ ... ['DDR_CH3_DM_DBI0_BGA_BE47', 'DDR_CH3_DM_DBI1_BGA_BJ50','DDR_CH3_DM_DBI1_DIE_12471'],
+ ... "right": ['DDR_CH3_DM_DBI0_DIE_7976']}
>>> ts_component.change_symbol_pin_locations(pin_locations)
"""
base_spacing = 0.00254