From 92973fa3032450aa1f7311775e17d5811f15a66c Mon Sep 17 00:00:00 2001 From: mcapodif Date: Thu, 6 Feb 2025 11:37:48 +0100 Subject: [PATCH] added suggestion --- src/ansys/aedt/core/desktop.py | 2 +- .../aedt/core/modules/setup_templates.py | 29 ++++++++++--------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/ansys/aedt/core/desktop.py b/src/ansys/aedt/core/desktop.py index 159c19ac584..14a9957d3e5 100644 --- a/src/ansys/aedt/core/desktop.py +++ b/src/ansys/aedt/core/desktop.py @@ -121,7 +121,7 @@ def launch_desktop_on_port(): timeout = settings.desktop_launch_timeout k = 0 - while not _is_port_occupied(port): + while not port in grpc_active_sessions(non_graphical=non_graphical): if k > timeout: # pragma: no cover active_s = active_sessions(student_version=student_version) for pid in active_s: diff --git a/src/ansys/aedt/core/modules/setup_templates.py b/src/ansys/aedt/core/modules/setup_templates.py index 6da44b03488..1fb9c4773cd 100644 --- a/src/ansys/aedt/core/modules/setup_templates.py +++ b/src/ansys/aedt/core/modules/setup_templates.py @@ -1959,20 +1959,21 @@ def get_setup_templates(): from ansys.aedt.core.generic.general_methods import settings template = SetupKeys.SetupTemplates - if settings.aedt_version is not None and settings.aedt_version >= "2025.1": - template = SetupKeys._add_to_template(SetupKeys.SetupTemplates, SetupKeys.SetupTemplates_231) - template = SetupKeys._add_to_template(template, SetupKeys.SetupTemplates_232) - template = SetupKeys._add_to_template(template, SetupKeys.SetupTemplates_241) - template = SetupKeys._add_to_template(template, SetupKeys.SetupTemplates_251) - elif settings.aedt_version is not None and settings.aedt_version >= "2024.1": - template = SetupKeys._add_to_template(SetupKeys.SetupTemplates, SetupKeys.SetupTemplates_231) - template = SetupKeys._add_to_template(template, SetupKeys.SetupTemplates_232) - template = SetupKeys._add_to_template(template, SetupKeys.SetupTemplates_241) - elif settings.aedt_version is not None and settings.aedt_version >= "2023.2": - template = SetupKeys._add_to_template(SetupKeys.SetupTemplates, SetupKeys.SetupTemplates_231) - template = SetupKeys._add_to_template(template, SetupKeys.SetupTemplates_232) - elif settings.aedt_version is not None and settings.aedt_version >= "2023.1": - template = SetupKeys._add_to_template(SetupKeys.SetupTemplates, SetupKeys.SetupTemplates_231) + if settings.aedt_version is not None: + if settings.aedt_version >= "2025.1": + template = SetupKeys._add_to_template(SetupKeys.SetupTemplates, SetupKeys.SetupTemplates_231) + template = SetupKeys._add_to_template(template, SetupKeys.SetupTemplates_232) + template = SetupKeys._add_to_template(template, SetupKeys.SetupTemplates_241) + template = SetupKeys._add_to_template(template, SetupKeys.SetupTemplates_251) + elif settings.aedt_version >= "2024.1": + template = SetupKeys._add_to_template(SetupKeys.SetupTemplates, SetupKeys.SetupTemplates_231) + template = SetupKeys._add_to_template(template, SetupKeys.SetupTemplates_232) + template = SetupKeys._add_to_template(template, SetupKeys.SetupTemplates_241) + elif settings.aedt_version >= "2023.2": + template = SetupKeys._add_to_template(SetupKeys.SetupTemplates, SetupKeys.SetupTemplates_231) + template = SetupKeys._add_to_template(template, SetupKeys.SetupTemplates_232) + elif settings.aedt_version >= "2023.1": + template = SetupKeys._add_to_template(SetupKeys.SetupTemplates, SetupKeys.SetupTemplates_231) return template def get_default_icepak_template(self, default_type):