Skip to content

FIX: Improve the speed up of the cleanup of objects and delete of objects in modeler. #6170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
May 21, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions doc/changelog.d/6170.fixed.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Improve the speed up of the cleanup of objects and delete of objects in modeler.
3 changes: 2 additions & 1 deletion src/ansys/aedt/core/modeler/cad/object_3d.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ def __init__(self, primitives, name=None):
self._faces = []
self._face_ids = []
self._is_polyline = None
self._object_type = ""

@property
def is_polyline(self):
Expand Down Expand Up @@ -1854,7 +1855,7 @@ def delete(self):
"""
arg = ["NAME:Selections", "Selections:=", self._m_name]
self._oeditor.Delete(arg)
self._primitives.cleanup_objects()
del self._primitives.objects[self._m_name]
self.__dict__ = {}

@pyaedt_function_handler()
Expand Down
42 changes: 26 additions & 16 deletions src/ansys/aedt/core/modeler/cad/primitives.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,27 @@
else:
return len(self.__parent.user_defined_component_names)

def __delitem__(self, key):
try:
name = [i for i, k in self.__parent._object_names_to_ids.items() if k == key or i == key][0]
key = [k for i, k in self.__parent._object_names_to_ids.items() if k == key or i == key][0]
except IndexError:
try:
dict.__delitem__(self, key)
except KeyError:
pass

Check warning on line 120 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#L119-L120

Added lines #L119 - L120 were not covered by tests
return
try:
dict.__delitem__(self, key)
except KeyError:
pass

Check warning on line 125 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#L124-L125

Added lines #L124 - L125 were not covered by tests
if name:
try:
del self.__obj_names[name]
except KeyError:
pass

Check warning on line 130 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#L129-L130

Added lines #L129 - L130 were not covered by tests
del self.__parent._object_names_to_ids[name]

def __contains__(self, item):
if self.__refreshed:
return True if (item in dict.keys(self) or item in self.__obj_names) else False
Expand Down Expand Up @@ -1022,8 +1043,6 @@

"""
new_object_dict = {}
new_object_id_dict = {}

all_objects = self.object_names
all_unclassified = self._unclassified
all_objs = all_objects + all_unclassified
Expand All @@ -1032,7 +1051,6 @@
if obj.name in all_objs:
# Check if ID can change in boolean operations
# updated_id = obj.id # By calling the object property we get the new id
new_object_id_dict[obj.name] = old_id
new_object_dict[old_id] = obj
self._object_names_to_ids = {}
self.objects = Objects(self, "o", new_object_dict)
Expand Down Expand Up @@ -1099,22 +1117,15 @@
List of added objects.
"""
added_objects = []

for obj_name in self.object_names:
if obj_name not in self._object_names_to_ids:
try:
pid = self.oeditor.GetObjectIDByName(obj_name)
except Exception:
pid = 0
self._create_object(obj_name, pid=pid, use_cached=True)
added_objects.append(obj_name)
for obj_name in self.unclassified_names:
objs = self.oeditor.GetChildNames()
for obj_name in objs:
if obj_name not in self._object_names_to_ids:
try:
pid = self.oeditor.GetObjectIDByName(obj_name)
except Exception:
pid = 0
self._create_object(obj_name, pid=pid, use_cached=True)
self._object_names_to_ids[obj_name] = pid
added_objects.append(obj_name)

return added_objects
Expand Down Expand Up @@ -1502,8 +1513,8 @@

Examples
--------
>>> from ansys.aedt.core import Maxwell3D
>>> app = Maxwell3D()
>>> from ansys.aedt.core import Maxwell3d
>>> app = Maxwell3d()
>>> circle_1 = app.modeler.create_circle(cs_plane=0, position=[0, 0, 0], radius=3, name="Circle1")
>>> box_1 = app.modeler.create_box(origin=[-13.9 ,0 ,0],sizes=[27.8,-40,25.4], name="Box1")
>>> app.modeler.uncover_faces([circle_1.faces[0], [box_1.faces[0], box_1.faces[2]]])
Expand Down Expand Up @@ -6389,7 +6400,6 @@
name = o.name

del self.objects[self.objects_by_name[name].id]
del self._object_names_to_ids[name]
o = self._create_object(name)
return o

Expand Down
Loading