Merge branch 'main' into fix-previous-setup-in-Icepak

pyaedt/application/Design.py

@@ -235,7 +235,8 @@ def __init__(
         ic_mode=None,
         remove_lock=False,
     ):
-
+        self._design_name = None
+        self._project_name = None
         self.__t = None
         if (
             not is_ironpython
@@ -639,11 +640,11 @@ def design_name(self):
 
         if not self.odesign:
             return None
-        name = _retry_ntimes(5, self.odesign.GetName)
-        if ";" in name:
-            return name.split(";")[1]
+        self._design_name = _retry_ntimes(5, self.odesign.GetName)
+        if ";" in self._design_name:
+            return self._design_name.split(";")[1]
         else:
-            return name
+            return self._design_name
 
     @design_name.setter
     def design_name(self, new_name):
@@ -666,6 +667,7 @@ def design_name(self, new_name):
                 timeout -= timestep
                 if timeout < 0:
                     raise RuntimeError("Timeout reached while checking design renaming.")
+        self._design_name = new_name
 
     @property
     def design_list(self):
@@ -722,7 +724,8 @@ def project_name(self):
         """
         if self.oproject:
             try:
-                return self.oproject.GetName()
+                self._project_name = self.oproject.GetName()
+                return self._project_name
             except Exception:
                 return None
         else:
@@ -1093,6 +1096,8 @@ def odesign(self):
         """
         if settings.use_multi_desktop:  # pragma: no cover
             self._desktop_class.grpc_plugin.recreate_application(True)
+            if self._design_name:
+                self._odesign = self.oproject.SetActiveDesign(self._design_name)
         return self._odesign
 
     @odesign.setter

pyaedt/desktop.py

@@ -472,8 +472,14 @@ class Desktop(object):
 
     def __new__(cls, *args, **kwargs):
         # The following commented lines will be useful when we will need to search among multiple saved desktop.
-        specified_version = kwargs.get("version") or None if (not args or len(args) < 1) else args[0]
-        new_desktop = kwargs.get("new_desktop") or False if (not args or len(args) < 3) else args[2]
+        specified_version = (
+            kwargs.get("specified_version") or kwargs.get("version") or None if (not args or len(args) < 1) else args[0]
+        )
+        new_desktop = (
+            kwargs.get("new_desktop_session") or kwargs.get("new_desktop") or False
+            if (not args or len(args) < 3)
+            else args[2]
+        )
         # student_version = kwargs.get("student_version") or False if (not args or len(args)<5) else args[4]
         # machine = kwargs.get("machine") or "" if (not args or len(args)<6) else args[5]
         specified_version = get_string_version(specified_version)
@@ -1605,7 +1611,8 @@ def release_desktop(self, close_projects=True, close_on_exit=True):
             self.logger.info("Desktop has been released and closed.")
         else:
             self.logger.info("Desktop has been released.")
-        del _desktop_sessions[self.aedt_process_id]
+        if self.aedt_process_id in _desktop_sessions:
+            del _desktop_sessions[self.aedt_process_id]
         props = [a for a in dir(self) if not a.startswith("__")]
         for a in props:
             self.__dict__.pop(a, None)