Skip to content

Commit 26cd128

Browse files
eblanco-ansyspre-commit-ci[bot]pyansys-ci-bot
authored
FEAT: Add oDesktop logging to installer and automation tab functions (#6821)
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: pyansys-ci-bot <[email protected]>
1 parent def0152 commit 26cd128

File tree

5 files changed

+27
-6
lines changed

5 files changed

+27
-6
lines changed

doc/changelog.d/6821.added.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Add oDesktop logging to installer and automation tab functions

doc/source/Resources/pyaedt_installer_from_aedt.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,15 +172,15 @@ def run_pyinstaller_from_c_python(oDesktop):
172172
if version <= "231":
173173
f.write("from pyaedt.extensions.installer.pyaedt_installer import add_pyaedt_to_aedt\n")
174174
f.write(
175-
'add_pyaedt_to_aedt(aedt_version="{}", personallib=r"{}")\n'.format(
176-
oDesktop.GetVersion()[:6], oDesktop.GetPersonalLibDirectory()
175+
'add_pyaedt_to_aedt(aedt_version="{}", personallib=r"{}", odesktop={})\n'.format(
176+
oDesktop.GetVersion()[:6], oDesktop.GetPersonalLibDirectory(), oDesktop
177177
)
178178
)
179179
else:
180180
f.write("from ansys.aedt.core.extensions.installer.pyaedt_installer import add_pyaedt_to_aedt\n")
181181
f.write(
182-
'add_pyaedt_to_aedt(aedt_version="{}", personal_lib=r"{}")\n'.format(
183-
oDesktop.GetVersion()[:6], oDesktop.GetPersonalLibDirectory()
182+
'add_pyaedt_to_aedt(aedt_version="{}", personal_lib=r"{}", odesktop={})\n'.format(
183+
oDesktop.GetVersion()[:6], oDesktop.GetPersonalLibDirectory(), oDesktop
184184
)
185185
)
186186

src/ansys/aedt/core/extensions/customize_automation_tab.py

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ def add_automation_tab(
7070
overwrite=False,
7171
panel="Panel_PyAEDT_Extensions",
7272
is_custom=False, # new argument for custom flag
73+
odesktop=None,
7374
):
7475
"""Add an automation tab in AEDT.
7576
@@ -90,6 +91,10 @@ def add_automation_tab(
9091
which case is adding new tabs to the existing ones.
9192
panel : str, optional
9293
Panel name. The default is ``"Panel_PyAEDT_Extensions"``.
94+
is_custom : bool, optional
95+
Whether the automation tab is for custom extensions. The default is ``False``.
96+
odesktop : oDesktop, optional
97+
Desktop session. The default is ``None``.
9398
9499
Returns
95100
-------
@@ -154,6 +159,10 @@ def add_automation_tab(
154159
logging.getLogger("Global").warning(
155160
f"Could not create symlink from {images_source} to {images_target}"
156161
)
162+
if odesktop:
163+
odesktop.AddMessage(
164+
"", "", 0, str(f"Could not create symlink from {images_source} to {images_target}")
165+
)
157166
icon_relative = f"images/{icon_file.name}"
158167
button_kwargs = dict(
159168
label=name,
@@ -313,6 +322,7 @@ def add_script_to_menu(
313322
personal_lib=None,
314323
aedt_version="",
315324
is_custom=False,
325+
odesktop=None,
316326
):
317327
"""Add a script to the ribbon menu.
318328
@@ -344,6 +354,7 @@ def add_script_to_menu(
344354
personal_lib : str, optional
345355
aedt_version : str, optional
346356
is_custom : bool, optional
357+
odesktop : oDesktop, optional
347358
348359
Returns
349360
-------
@@ -437,8 +448,11 @@ def add_script_to_menu(
437448
template=template_file,
438449
panel=panel,
439450
is_custom=is_custom,
451+
odesktop=odesktop,
440452
)
441453
logger.info(f"{name} installed")
454+
if odesktop:
455+
odesktop.AddMessage("", "", 0, str(f"{name} installed"))
442456
return True
443457

444458

src/ansys/aedt/core/extensions/installer/pyaedt_installer.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ def add_pyaedt_to_aedt(
3434
aedt_version,
3535
personal_lib,
3636
skip_version_manager=False,
37+
odesktop=None,
3738
):
3839
"""Add PyAEDT tabs in AEDT.
3940
@@ -45,6 +46,8 @@ def add_pyaedt_to_aedt(
4546
AEDT personal library folder.
4647
skip_version_manager : bool, optional
4748
Skip the version manager tab. The default is ``False``.
49+
odesktop : oDesktop, optional
50+
Desktop session. The default is ``None``.
4851
"""
4952
logger = logging.getLogger("Global")
5053
if not personal_lib or not aedt_version:
@@ -60,10 +63,10 @@ def add_pyaedt_to_aedt(
6063
extensions_dir = os.path.join(personal_lib, "Toolkits")
6164
os.makedirs(extensions_dir, exist_ok=True)
6265

63-
__add_pyaedt_tabs(personal_lib, aedt_version, skip_version_manager)
66+
__add_pyaedt_tabs(personal_lib, aedt_version, skip_version_manager, odesktop)
6467

6568

66-
def __add_pyaedt_tabs(personal_lib, aedt_version, skip_version_manager):
69+
def __add_pyaedt_tabs(personal_lib, aedt_version, skip_version_manager, odesktop=None):
6770
"""Add PyAEDT tabs in AEDT."""
6871
if skip_version_manager:
6972
pyaedt_tabs = ["Console", "Jupyter", "Run_Script", "ExtensionManager"]
@@ -94,4 +97,5 @@ def __add_pyaedt_tabs(personal_lib, aedt_version, skip_version_manager):
9497
panel="Panel_PyAEDT_Installer",
9598
personal_lib=personal_lib,
9699
aedt_version=aedt_version,
100+
odesktop=odesktop,
97101
)

tests/unit/extensions/test_customize_automation_tab.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,7 @@ def test_add_script_to_menu_success(
355355
template="run_pyaedt_toolkit_script",
356356
panel="Panel_PyAEDT_Extensions",
357357
is_custom=False,
358+
odesktop=None,
358359
)
359360

360361
# Verify the generated script content
@@ -416,4 +417,5 @@ def test_add_script_to_menu_is_custom(mock_copy, mock_add_automation_tab, mock_d
416417
template="run_pyaedt_toolkit_script",
417418
panel="Panel_PyAEDT_Extensions",
418419
is_custom=True,
420+
odesktop=None,
419421
)

0 commit comments

Comments
 (0)