Skip to content

Commit

Permalink
REFACTOR: Update format
Browse files Browse the repository at this point in the history
  • Loading branch information
SMoraisAnsys committed Jan 13, 2025
1 parent 4c6f319 commit e085736
Show file tree
Hide file tree
Showing 3 changed files with 217 additions and 205 deletions.
159 changes: 101 additions & 58 deletions src/ansys/aedt/core/modeler/cad/primitives.py
Original file line number Diff line number Diff line change
Expand Up @@ -2843,18 +2843,26 @@ def mirror(self, assignment, origin, vector, duplicate=False, is_3d_comp=False,
x_pos, y_pos, z_pos = self._pos_with_arg(origin)
x_norm, y_norm, z_norm = self._pos_with_arg(vector)

Check warning on line 2844 in src/ansys/aedt/core/modeler/cad/primitives.py

View check run for this annotation

Codecov / codecov/patch

src/ansys/aedt/core/modeler/cad/primitives.py#L2843-L2844

Added lines #L2843 - L2844 were not covered by tests
if duplicate:
vArg1 = ["NAME:Selections", "Selections:=", selections, "NewPartsModelFlag:=", "Model"]
vArg2 = ["NAME:DuplicateToMirrorParameters"]
vArg2.append("DuplicateMirrorBaseX:="), vArg2.append(x_pos)
vArg2.append("DuplicateMirrorBaseY:="), vArg2.append(y_pos)
vArg2.append("DuplicateMirrorBaseZ:="), vArg2.append(z_pos)
vArg2.append("DuplicateMirrorNormalX:="), vArg2.append(x_norm)
vArg2.append("DuplicateMirrorNormalY:="), vArg2.append(y_norm)
vArg2.append("DuplicateMirrorNormalZ:="), vArg2.append(z_norm)
vArg3 = ["NAME:Options", "DuplicateAssignments:=", duplicate_assignment]
arg_1 = ["NAME:Selections", "Selections:=", selections, "NewPartsModelFlag:=", "Model"]
arg_2 = [

Check warning on line 2847 in src/ansys/aedt/core/modeler/cad/primitives.py

View check run for this annotation

Codecov / codecov/patch

src/ansys/aedt/core/modeler/cad/primitives.py#L2846-L2847

Added lines #L2846 - L2847 were not covered by tests
"NAME:DuplicateToMirrorParameters",
"DuplicateMirrorBaseX:=",
x_pos,
"DuplicateMirrorBaseY:=",
y_pos,
"DuplicateMirrorBaseZ:=",
z_pos,
"DuplicateMirrorNormalX:=",
x_norm,
"DuplicateMirrorNormalY:=",
y_norm,
"DuplicateMirrorNormalZ:=",
z_norm,
]
arg_3 = ["NAME:Options", "DuplicateAssignments:=", duplicate_assignment]

Check warning on line 2862 in src/ansys/aedt/core/modeler/cad/primitives.py

View check run for this annotation

Codecov / codecov/patch

src/ansys/aedt/core/modeler/cad/primitives.py#L2862

Added line #L2862 was not covered by tests
if is_3d_comp:
orig_3d = [i for i in self.user_defined_component_names]
added_objs = self.oeditor.DuplicateMirror(vArg1, vArg2, vArg3)
added_objs = self.oeditor.DuplicateMirror(arg_1, arg_2, arg_3)

Check warning on line 2865 in src/ansys/aedt/core/modeler/cad/primitives.py

View check run for this annotation

Codecov / codecov/patch

src/ansys/aedt/core/modeler/cad/primitives.py#L2865

Added line #L2865 was not covered by tests
self.add_new_objects()
if is_3d_comp:
added_3d_comps = [i for i in self.user_defined_component_names if i not in orig_3d]
Expand All @@ -2863,16 +2871,23 @@ def mirror(self, assignment, origin, vector, duplicate=False, is_3d_comp=False,
return added_3d_comps
return added_objs
else:
vArg1 = ["NAME:Selections", "Selections:=", selections, "NewPartsModelFlag:=", "Model"]
vArg2 = ["NAME:MirrorParameters"]
vArg2.append("MirrorBaseX:="), vArg2.append(x_pos)
vArg2.append("MirrorBaseY:="), vArg2.append(y_pos)
vArg2.append("MirrorBaseZ:="), vArg2.append(z_pos)
vArg2.append("MirrorNormalX:="), vArg2.append(x_norm)
vArg2.append("MirrorNormalY:="), vArg2.append(y_norm)
vArg2.append("MirrorNormalZ:="), vArg2.append(z_norm)

self.oeditor.Mirror(vArg1, vArg2)
arg_1 = ["NAME:Selections", "Selections:=", selections, "NewPartsModelFlag:=", "Model"]
arg_2 = [

Check warning on line 2875 in src/ansys/aedt/core/modeler/cad/primitives.py

View check run for this annotation

Codecov / codecov/patch

src/ansys/aedt/core/modeler/cad/primitives.py#L2874-L2875

Added lines #L2874 - L2875 were not covered by tests
"NAME:MirrorParameters",
"MirrorBaseX:=",
x_pos,
"MirrorBaseY:=",
y_pos,
"MirrorBaseZ:=",
z_pos,
"MirrorNormalX:=",
x_norm,
"MirrorNormalY:=",
y_norm,
"MirrorNormalZ:=",
z_norm,
]
self.oeditor.Mirror(arg_1, arg_2)

Check warning on line 2890 in src/ansys/aedt/core/modeler/cad/primitives.py

View check run for this annotation

Codecov / codecov/patch

src/ansys/aedt/core/modeler/cad/primitives.py#L2890

Added line #L2890 was not covered by tests
return True

@pyaedt_function_handler(objid="assignment")
Expand All @@ -2899,14 +2914,19 @@ def move(self, assignment, vector):
x_vec, y_vec, z_vec = self._pos_with_arg(vector)
selections = self.convert_to_selections(assignment)

Check warning on line 2915 in src/ansys/aedt/core/modeler/cad/primitives.py

View check run for this annotation

Codecov / codecov/patch

src/ansys/aedt/core/modeler/cad/primitives.py#L2914-L2915

Added lines #L2914 - L2915 were not covered by tests

vArg1 = ["NAME:Selections", "Selections:=", selections, "NewPartsModelFlag:=", "Model"]
vArg2 = ["NAME:TranslateParameters"]
vArg2.append("TranslateVectorX:="), vArg2.append(x_vec)
vArg2.append("TranslateVectorY:="), vArg2.append(y_vec)
vArg2.append("TranslateVectorZ:="), vArg2.append(z_vec)
arg_1 = ["NAME:Selections", "Selections:=", selections, "NewPartsModelFlag:=", "Model"]
arg_2 = [

Check warning on line 2918 in src/ansys/aedt/core/modeler/cad/primitives.py

View check run for this annotation

Codecov / codecov/patch

src/ansys/aedt/core/modeler/cad/primitives.py#L2917-L2918

Added lines #L2917 - L2918 were not covered by tests
"NAME:TranslateParameters",
"TranslateVectorX:=",
x_vec,
"TranslateVectorY:=",
y_vec,
"TranslateVectorZ:=",
z_vec,
]

if self.oeditor is not None:
self.oeditor.Move(vArg1, vArg2)
self.oeditor.Move(arg_1, arg_2)

Check warning on line 2929 in src/ansys/aedt/core/modeler/cad/primitives.py

View check run for this annotation

Codecov / codecov/patch

src/ansys/aedt/core/modeler/cad/primitives.py#L2929

Added line #L2929 was not covered by tests
return True

@pyaedt_function_handler(objid="assignment", cs_axis="axis", nclones="clones")
Expand Down Expand Up @@ -3023,16 +3043,23 @@ def duplicate_along_line(
selections = self.convert_to_selections(assignment)
x_pos, y_pos, z_pos = self._pos_with_arg(vector)

Check warning on line 3044 in src/ansys/aedt/core/modeler/cad/primitives.py

View check run for this annotation

Codecov / codecov/patch

src/ansys/aedt/core/modeler/cad/primitives.py#L3044

Added line #L3044 was not covered by tests

vArg1 = ["NAME:Selections", "Selections:=", selections, "NewPartsModelFlag:=", "Model"]
vArg2 = ["NAME:DuplicateToAlongLineParameters"]
vArg2.append("CreateNewObjects:="), vArg2.append(not attach)
vArg2.append("XComponent:="), vArg2.append(x_pos)
vArg2.append("YComponent:="), vArg2.append(y_pos)
vArg2.append("ZComponent:="), vArg2.append(z_pos)
vArg2.append("Numclones:="), vArg2.append(str(clones))
vArg3 = ["NAME:Options", "DuplicateAssignments:=", duplicate_assignment]
arg_1 = ["NAME:Selections", "Selections:=", selections, "NewPartsModelFlag:=", "Model"]
arg_2 = [

Check warning on line 3047 in src/ansys/aedt/core/modeler/cad/primitives.py

View check run for this annotation

Codecov / codecov/patch

src/ansys/aedt/core/modeler/cad/primitives.py#L3046-L3047

Added lines #L3046 - L3047 were not covered by tests
"NAME:DuplicateToAlongLineParameters",
"CreateNewObjects:=",
not attach,
"XComponent:=",
x_pos,
"YComponent:=",
y_pos,
"ZComponent:=",
z_pos,
"Numclones:=",
str(clones),
]
arg_3 = ["NAME:Options", "DuplicateAssignments:=", duplicate_assignment]

Check warning on line 3060 in src/ansys/aedt/core/modeler/cad/primitives.py

View check run for this annotation

Codecov / codecov/patch

src/ansys/aedt/core/modeler/cad/primitives.py#L3060

Added line #L3060 was not covered by tests
self.add_new_objects()
self.oeditor.DuplicateAlongLine(vArg1, vArg2, vArg3)
self.oeditor.DuplicateAlongLine(arg_1, arg_2, arg_3)

Check warning on line 3062 in src/ansys/aedt/core/modeler/cad/primitives.py

View check run for this annotation

Codecov / codecov/patch

src/ansys/aedt/core/modeler/cad/primitives.py#L3062

Added line #L3062 was not covered by tests
if is_3d_comp:
return self._duplicate_added_components_tuple()
if attach:
Expand Down Expand Up @@ -3640,12 +3667,11 @@ def unite(self, assignment, purge=False, keep_originals=False):
while remaining > 1:
objs = assignment[:slice]
selections = self.convert_to_selections(objs)
vArg1 = ["NAME:Selections", "Selections:=", selections]
vArg2 = ["NAME:UniteParameters", "KeepOriginals:=", keep_originals]
arg_1 = ["NAME:Selections", "Selections:=", selections]
arg_2 = ["NAME:UniteParameters", "KeepOriginals:=", keep_originals]

Check warning on line 3671 in src/ansys/aedt/core/modeler/cad/primitives.py

View check run for this annotation

Codecov / codecov/patch

src/ansys/aedt/core/modeler/cad/primitives.py#L3669-L3671

Added lines #L3669 - L3671 were not covered by tests
if settings.aedt_version > "2022.2":
vArg2.append("TurnOnNBodyBoolean:=")
vArg2.append(True)
self.oeditor.Unite(vArg1, vArg2)
arg_2 += ["TurnOnNBodyBoolean:=", True]
self.oeditor.Unite(arg_1, arg_2)

Check warning on line 3674 in src/ansys/aedt/core/modeler/cad/primitives.py

View check run for this annotation

Codecov / codecov/patch

src/ansys/aedt/core/modeler/cad/primitives.py#L3673-L3674

Added lines #L3673 - L3674 were not covered by tests
if selections.split(",")[0] in self.unclassified_names: # pragma: no cover
self.logger.error("Error in uniting objects.")
self._odesign.Undo()
Expand Down Expand Up @@ -3954,13 +3980,19 @@ def check_plane(self, assignment, face_location, offset=1):
i = 0
while not found:
off1, off2, off3 = self._offset_on_plane(i, offset)
vArg1 = ["NAME:FaceParameters"]
vArg1.append("BodyName:="), vArg1.append(assignment)
vArg1.append("XPosition:="), vArg1.append(x_vec + "+" + self._arg_with_dim(off1))
vArg1.append("YPosition:="), vArg1.append(y_vec + "+" + self._arg_with_dim(off2))
vArg1.append("ZPosition:="), vArg1.append(z_vec + "+" + self._arg_with_dim(off3))
arg_1 = [

Check warning on line 3983 in src/ansys/aedt/core/modeler/cad/primitives.py

View check run for this annotation

Codecov / codecov/patch

src/ansys/aedt/core/modeler/cad/primitives.py#L3983

Added line #L3983 was not covered by tests
"NAME:FaceParameters",
"BodyName:=",
assignment,
"XPosition:=",
x_vec + "+" + self._arg_with_dim(off1),
"YPosition:=",
y_vec + "+" + self._arg_with_dim(off2),
"ZPosition:=",
z_vec + "+" + self._arg_with_dim(off3),
]
try:
face_id = self.oeditor.GetFaceByPosition(vArg1)
_ = self.oeditor.GetFaceByPosition(arg_1)

Check warning on line 3995 in src/ansys/aedt/core/modeler/cad/primitives.py

View check run for this annotation

Codecov / codecov/patch

src/ansys/aedt/core/modeler/cad/primitives.py#L3995

Added line #L3995 was not covered by tests
if i < 4:
plane = "XY"
elif i < 8:
Expand Down Expand Up @@ -7898,11 +7930,16 @@ def get_bodynames_from_position(self, position, units=None, include_non_model=Tr
# self.logger.error("A list of point has to be provided")
return []
x_center, y_center, z_center = self._pos_with_arg(position, units)
vArg1 = ["NAME:Parameters"]
vArg1.append("XPosition:="), vArg1.append(x_center)
vArg1.append("YPosition:="), vArg1.append(y_center)
vArg1.append("ZPosition:="), vArg1.append(z_center)
list_of_bodies = list(self.oeditor.GetBodyNamesByPosition(vArg1))
arg_1 = [

Check warning on line 7933 in src/ansys/aedt/core/modeler/cad/primitives.py

View check run for this annotation

Codecov / codecov/patch

src/ansys/aedt/core/modeler/cad/primitives.py#L7932-L7933

Added lines #L7932 - L7933 were not covered by tests
"NAME:Parameters",
"XPosition:=",
x_center,
"YPosition:=",
y_center,
"ZPosition:=",
z_center,
]
list_of_bodies = list(self.oeditor.GetBodyNamesByPosition(arg_1))

Check warning on line 7942 in src/ansys/aedt/core/modeler/cad/primitives.py

View check run for this annotation

Codecov / codecov/patch

src/ansys/aedt/core/modeler/cad/primitives.py#L7942

Added line #L7942 was not covered by tests
if not include_non_model:
non_models = [i for i in self.non_model_objects]
list_of_bodies = [i for i in list_of_bodies if i not in non_models]
Expand Down Expand Up @@ -7936,15 +7973,21 @@ def get_edgeid_from_position(self, position, assignment=None, units=None):
edge_id = -1
x_center, y_center, z_center = self._pos_with_arg(position, units)

Check warning on line 7974 in src/ansys/aedt/core/modeler/cad/primitives.py

View check run for this annotation

Codecov / codecov/patch

src/ansys/aedt/core/modeler/cad/primitives.py#L7973-L7974

Added lines #L7973 - L7974 were not covered by tests

vArg1 = ["NAME:EdgeParameters"]
vArg1.append("BodyName:="), vArg1.append("")
vArg1.append("XPosition:="), vArg1.append(x_center)
vArg1.append("YPosition:="), vArg1.append(y_center)
vArg1.append("ZPosition:="), vArg1.append(z_center)
arg_1 = [

Check warning on line 7976 in src/ansys/aedt/core/modeler/cad/primitives.py

View check run for this annotation

Codecov / codecov/patch

src/ansys/aedt/core/modeler/cad/primitives.py#L7976

Added line #L7976 was not covered by tests
"NAME:EdgeParameters",
"BodyName:=",
"",
"XPosition:=",
x_center,
"YPosition:=",
y_center,
"ZPosition:=",
z_center,
]
for obj in object_list:
vArg1[2] = obj
arg_1[2] = obj

Check warning on line 7988 in src/ansys/aedt/core/modeler/cad/primitives.py

View check run for this annotation

Codecov / codecov/patch

src/ansys/aedt/core/modeler/cad/primitives.py#L7988

Added line #L7988 was not covered by tests
try:
edge_id = int(self.oeditor.GetEdgeByPosition(vArg1))
edge_id = int(self.oeditor.GetEdgeByPosition(arg_1))
return edge_id

Check warning on line 7991 in src/ansys/aedt/core/modeler/cad/primitives.py

View check run for this annotation

Codecov / codecov/patch

src/ansys/aedt/core/modeler/cad/primitives.py#L7990-L7991

Added lines #L7990 - L7991 were not covered by tests
except Exception:
self.logger.debug(f"Cannot retrieve edge id from {obj}")

Check warning on line 7993 in src/ansys/aedt/core/modeler/cad/primitives.py

View check run for this annotation

Codecov / codecov/patch

src/ansys/aedt/core/modeler/cad/primitives.py#L7993

Added line #L7993 was not covered by tests
Expand Down
2 changes: 1 addition & 1 deletion src/ansys/aedt/core/modeler/cad/primitives_2d.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ def create_circle(
"WhichAxis:=",
axis,
"NumSegments:=",
num_sides,
f"{num_sides}",
]
arg_2 = self._default_object_attributes(name=name, material=material, flags="NonModel#" if non_model else "")
new_object_name = self.oeditor.CreateCircle(arg_1, arg_2)

Check warning on line 126 in src/ansys/aedt/core/modeler/cad/primitives_2d.py

View check run for this annotation

Codecov / codecov/patch

src/ansys/aedt/core/modeler/cad/primitives_2d.py#L125-L126

Added lines #L125 - L126 were not covered by tests
Expand Down
Loading

0 comments on commit e085736

Please sign in to comment.