NaxToPy 1.5.0__tar.gz → 1.5.2__tar.gz

{NaxToPy-1.5.0/src/NaxToPy.egg-info → NaxToPy-1.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: NaxToPy
-Version: 1.5.0
+Version: 1.5.2
 Summary: Package for postprocessing FEM results in Python
 Home-page: https://www.idaerosolutions.com/Home/NaxToPy
 Download-URL: https://apps.microsoft.com/detail/XP9MMH0KDKGRJN?hl=en-US&gl=US
@@ -129,7 +129,7 @@ Requires-Dist: setuptools>=67.8.0
 [![MicrosoftStore](https://img.shields.io/badge/Microsoft%20Store-NaxTo-blue?logo=microsoftstore&logoColor=blue&labelColor=lightgrey)](https://apps.microsoft.com/detail/XP9MMH0KDKGRJN?hl=en-US&gl=US)
 [![PyPi - Downloads](https://img.shields.io/pypi/dm/NaxToPy?color=dgreen)](https://pypi.org/project/NaxToPy/#files)
 
-![](https://idaerosolutions.com/images/external/NaxToPy/Logo%20NaxToPy_Black.png "NaxToPy")
+![](https://idaerosolutions.com/images/icons/Logo_NaxToPy_Black.svg "NaxToPy")
 
 # NaxToPy
 
@@ -228,6 +228,14 @@ To see previous version see the pre-release versions in https://test.pypi.org/pr
 1. A bug is fixed that prevented requesting results on global axes.
 2. The typing of some functions is improved.
 
+### v.1.5.1
+1. Bug Fix. If the name for a derivated load case is repeated for a second time, the name is changed. 
+2. Bug Fix. Now is possible to change the criteria for a new envelope load case.
+
+### v1.5.2
+1. Bug fix: A bug has been resolved that previously prevented the generation of a .log file while executing the N2PtoEXE module.
+2. Bug fix: An internal error related to finding the libraries has been resolved.
+3. The option to include a splash image in an executable has been added.
 
 # Documentation
 

{NaxToPy-1.5.0 → NaxToPy-1.5.2}/README.md

@@ -5,7 +5,7 @@
 [![MicrosoftStore](https://img.shields.io/badge/Microsoft%20Store-NaxTo-blue?logo=microsoftstore&logoColor=blue&labelColor=lightgrey)](https://apps.microsoft.com/detail/XP9MMH0KDKGRJN?hl=en-US&gl=US)
 [![PyPi - Downloads](https://img.shields.io/pypi/dm/NaxToPy?color=dgreen)](https://pypi.org/project/NaxToPy/#files)
 
-![](https://idaerosolutions.com/images/external/NaxToPy/Logo%20NaxToPy_Black.png "NaxToPy")
+![](https://idaerosolutions.com/images/icons/Logo_NaxToPy_Black.svg "NaxToPy")
 
 # NaxToPy
 
@@ -104,6 +104,14 @@ To see previous version see the pre-release versions in https://test.pypi.org/pr
 1. A bug is fixed that prevented requesting results on global axes.
 2. The typing of some functions is improved.
 
+### v.1.5.1
+1. Bug Fix. If the name for a derivated load case is repeated for a second time, the name is changed. 
+2. Bug Fix. Now is possible to change the criteria for a new envelope load case.
+
+### v1.5.2
+1. Bug fix: A bug has been resolved that previously prevented the generation of a .log file while executing the N2PtoEXE module.
+2. Bug fix: An internal error related to finding the libraries has been resolved.
+3. The option to include a splash image in an executable has been added.
 
 # Documentation
 

{NaxToPy-1.5.0 → NaxToPy-1.5.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "NaxToPy"
-version = "1.5.0"
+version = "1.5.2"
 license = {file = "LICENSE"}
 authors = [ { name = "Idaero Solutions", email = "manuel.sanchez@idaerosolutions.com" }, ]
 requires-python = ">=3.9"

{NaxToPy-1.5.0 → NaxToPy-1.5.2}/src/NaxToPy/Core/Constants/Constants.py

@@ -1,7 +1,7 @@
 """Constants of the NaxToPy package"""
 
 # NaxToPy Version
-VERSION = "1.5.0"
+VERSION = "1.5.2"
 
 # Supported for Naxto:
 NAXTO_VERSION = '2024R0'

{NaxToPy-1.5.0 → NaxToPy-1.5.2}/src/NaxToPy/Core/N2PModelContent.py

@@ -2,6 +2,8 @@ from VizzerClasses import N2ModelContent
 from VizzerClasses import N2LoadCase
 from VizzerClasses.Classes import N2AdjacencyFunctions
 from VizzerClasses.Classes import N2FreeEdges
+from VizzerClasses import EnvelopGroup
+from VizzerClasses import EnvelopCriteria
 from NaxToPy.Core.Classes.N2PLoadCase import N2PLoadCase
 from NaxToPy.Core.Classes.N2PIncrement import N2PIncrement
 from NaxToPy.Core.Classes.N2PElement import N2PElement
@@ -1079,10 +1081,17 @@ class N2PModelContent:
             N2PLoadCase -> Derived load case
         """
         # Comprobamos que el nombre no se repite:
-        if name in [lc.Name for lc in self.LoadCases]:
-            name += "-1"
+        i = 0
+        while name in [lc.Name for lc in self.LoadCases]:
+            i += 1
+            name += f"-{i}"
+
+        if i > 0:
             N2PLog.Warning.W301(name)
 
+        # Argumentos para N2LoadCase
+        envelopgroup = N2LoadCase
+
         # Genera una instancia de un N2LoadCase the VizzerClasses
         cs_lc = N2LoadCase(self.__vzmodel, name, formula)
 
@@ -1101,7 +1110,7 @@ class N2PModelContent:
 
         return py_lc
 
-    def new_envelope_loadcase(self, name: str, formula: str) -> N2PLoadCase:
+    def new_envelope_loadcase(self, name: str, formula: str, criteria: str="ExtremeMax") -> N2PLoadCase:
         """Method of N2PModelContent that generate a new N2PLoadCase that is the envelope of the load cases and increments
         selected.
 
@@ -1109,23 +1118,49 @@ class N2PModelContent:
         envelope load case use LCD1 in the formula instead of LC-1:
 
         Args:
-            name: str -> Name of the envelope load case. It mustn't be repeated.
-            formula: str -> formula that define the loadcases and increments must have this structure: <LCXX:FRYY>
+            name (str) -> Name of the envelope load case. It mustn't be repeated.
+
+            formula (str) -> formula that define the loadcases and increments must have this structure: <LCXX:FRYY>
                 exmaple: "<LC1:FR1>,<LCD2:FR1>,<LC2:FR10>"
 
+            criteria (str): Criteria for selecting the results to build the new derived load case. Possible values:
+
+                - 'ExtremeMax'
+                - 'ExtremeMin'
+                - 'Max'
+                - 'Min'
+                - 'Range'
+
         Returns:
             N2PLoadCase
         """
         # Comprobamos que el nombre no se repite:
-        if name in [lc.Name for lc in self.LoadCases]:
-            name += "-1"
+        i = 0
+        while name in [lc.Name for lc in self.LoadCases]:
+            i += 1
+            name += f"-{i}"
+
+        if i > 0:
             N2PLog.Warning.W301(name)
 
         # Comprobamos que la formula está bien:
         formula = formula.replace("-", "D").replace(" ", "")
 
+        # Arguments for the constructor
+        criteria_mapping = {
+            'Range': EnvelopCriteria.Range,
+            'ExtremeMin': EnvelopCriteria.ExtremeMin,
+            'Max': EnvelopCriteria.Max,
+            'Min': EnvelopCriteria.Min,
+            'ExtremeMax': EnvelopCriteria.ExtremeMax
+        }
+
+        envelopcriteria = criteria_mapping.get(criteria, EnvelopCriteria.ExtremeMax)
+
+        envelopgroup = EnvelopGroup.ByContour
+
         # Genera una instancia de un N2LoadCase the VizzerClasses
-        cs_lc = N2LoadCase(self.__vzmodel, name, formula, True)
+        cs_lc = N2LoadCase(self.__vzmodel, name, formula, True, envelopgroup, False, envelopcriteria)
 
         # Método de N2LoadCase que pone todoo en su sitio
         cs_lc.RecalculateLCInfo2Formule()

{NaxToPy-1.5.0 → NaxToPy-1.5.2}/src/NaxToPy/Core/Reference_Finder/__Reference_Finder.py

@@ -24,11 +24,11 @@ def py_ver_comp() -> None:
 def vizzer_libs() -> list[str, ...]:
     """Funcion que devuelve las rutas donde se encuentran las librerias de VizzerClasses. Si hay varias versiones
     puede haber varias rutas.
+
     ----------
     Returns: 
         vizzer_libs: str
             Ruta a las librerias de NaxTo
-    ----------
     """
     vizzer_libs = []
 
@@ -67,7 +67,7 @@ def vizzer_libs() -> list[str, ...]:
 
 # ---------------------------------------------------------------------------------------------
 def open_idaero_key() -> winreg.HKEYType:
-    """Returns the Windows Register Key for the IDAERO software (NAXTOVIEW)
+    """Returns the Windows Register Key for the IDAERO software (NAXTOVIEW) in CURRENT_USER
 
     Returns:
         naxto_key: winreg.HKEYType
@@ -85,35 +85,57 @@ def open_idaero_key() -> winreg.HKEYType:
     return naxto_key
 
 
+def open_localmachine_key() -> winreg.HKEYType:
+    """Returns the Windows Register Key for the IDAERO software (NAXTOVIEW) in LOCAL_MACHINE
+
+    Returns:
+        naxto_key: winreg.HKEYType
+
+    """
+    reg_path = r"SOFTWARE\IDAERO"
+
+    # Se crea o se abre la clave LOCAL_MACHINE\SOFTWARE\IDAERO\NAXTOVIEW_202XRY donde X e Y serán los que corresponda
+    naxto_key = winreg.CreateKey(winreg.HKEY_LOCAL_MACHINE, reg_path + r"\NAXTOVIEW_" + NAXTO_VERSION)
+
+    # Se devuelve la clave de NAXTOVIEW que es donde se busca el valor Path
+    return naxto_key
 # ---------------------------------------------------------------------------------------------
-def change_register() -> None:
-    """Function that changes or create a path variable in the register.
+
+
+def create_register() -> None:
+    """Function that creates a path variable in the register.
 
     By default, NaxToPy uses the NaxTo that is installed. If NaxToPy from .exe or from developer is used, the register
-    don't have the path variable, it must be created at Software/Idaero/NaxToView
+    don't have the path variable, and NaxTo is not installed it must be created at Software/Idaero/NaxToView
 
     Returns:
         None.
     """
     try:
         naxto_key = open_idaero_key()
-
-        # La ruta que vamos a meter es la de la carpeta en la que esta una carpeta llamada bin. En ella
-        # estan las bibliotecas de NaxTo. Debe funcionar esta carpeta para los ejecutables y para las
-        # versiones de desarrollo. En las salidas normales este path no debe estar.
-        naxtopy_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))
-
-        winreg.SetValueEx(naxto_key, "Path", 0, winreg.REG_SZ, naxtopy_path + "\\")
-
-        N2PLog.Warning.W102(naxtopy_path)
+        try:
+            path = winreg.QueryValueEx(naxto_key, "Path")
+
+        except FileNotFoundError:
+            try:
+                naxto_machine = open_localmachine_key()
+                path = winreg.QueryValueEx(naxto_machine, "Path")
+            except:
+                path = ""
+
+        if not path:
+            # La ruta que vamos a meter es la de la carpeta en la que esta una carpeta llamada bin. En ella
+            # estan las bibliotecas de NaxTo. Debe funcionar esta carpeta para los ejecutables y para las
+            # versiones de desarrollo. En las salidas normales este path no debe estar.
+            naxtopy_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))
+            winreg.SetValueEx(naxto_key, "Path", 0, winreg.REG_SZ, naxtopy_path + "\\")
+            N2PLog.Warning.W102(naxtopy_path)
 
     except Exception as e:
-
         N2PLog.Error.E112(e)
 # ----------------------------------------------------------------------------------------------------------------------
 
 
-# ----------------------------------------------------------------------------------------------------------------------
 def destroy_register() -> None:
     """Function that destroy the register path for developers or .exe files of NaxToPy.
 
@@ -147,6 +169,13 @@ def compatible_vizzer(vizzer_libs: list) -> str:
 # ---------------------------------------------------------------------------------------------
 
 
+def _naxto_gen(vizzer: str) -> str:
+    dir_viz = os.path.dirname(vizzer)
+    if "GIT_REPOSITORIES" in dir_viz:
+        return os.path.join(r"C:\GIT_REPOSITORIES\NAXTO\NAXTOLibsDebug\NAXLicense\v.3.0", "IdaeroLicense.dll")
+    return os.path.join(dir_viz, "IdaeroLicense.dll")
+
+
 # Inicializador para encontrar la libreria de VizzerClasses
 def __reference_finder():
     # La ruta cambia si se tiene el repositorio de NaxToView
@@ -155,14 +184,15 @@ def __reference_finder():
     # Si se crea un .exe queremos que encuentre unas nuevas librerias distribuibles, que estarán en la carpeta temporal que se
     # crea cuando se ejecuta el .exe. Tampoco se ejecutan los modulos del reference finder
     if getattr(sys, 'frozen', False):
-        change_register()
+        create_register()
         exe_dir = sys._MEIPASS
         vizzer_path = exe_dir + "\\libraries\\VizzerClasses.dll"
         N2PLog.Info.I107()
 
     elif os.path.isfile(developer_vizzer):
         if VERSION.split(".")[-1][0:3] == "dev":
-            change_register()
+            create_register()
+
         vizzer_path = developer_vizzer
         N2PLog.Info.I108()
 
@@ -180,7 +210,11 @@ def __reference_finder():
         clr.AddReference(vizzer_path)
         N2PLog.Info.I109()
         N2PLog.Debug.D101(vizzer_path)
+        naxto_c = _naxto_gen(vizzer_path)
+        clr.AddReference(naxto_c)
     except:
         N2PLog.Critical.C103()
         # sys.exit("C103: THE LIBRARY 'VizzerClasses.dll' COULDN'T BE LOADED CORRECTLY")
+
+    N2PLog.Info.I100()
 # ---------------------------------------------------------------------------------------------

{NaxToPy-1.5.0 → NaxToPy-1.5.2}/src/NaxToPy/Modules/N2PtoEXE/N2PtoEXE.py

@@ -16,7 +16,7 @@ def __ico_path() -> str:
             icon_path: str
     """
     try:
-        ico_path = resource_filename('mypackage', 'icon.ico')
+        ico_path = resource_filename('NaxToPy', 'NaxToPy.ico')
         N2PLog.Info.I200()
         return ico_path
 
@@ -112,7 +112,8 @@ def __list_ext_libs(libs_path, solver, abq_ver) -> list[str]:
 
 
 # Funcion principal que usa PyInstaller para generar el .exe -----------------------------------------------------------
-def n2ptoexe(path: str, console: bool = True, solver: str = "ALL", abaqusversion: list[str] = None) -> None:
+def n2ptoexe(path: str, console: bool = True, solver: str = "ALL", abaqusversion: list[str] = None,
+             splash: str="") -> None:
     """Function that creates .exe files of programs that use NaxToPy
 
     Args:
@@ -128,8 +129,16 @@ def n2ptoexe(path: str, console: bool = True, solver: str = "ALL", abaqusversion
                                           ABAQUS version are aviable. Posible abaqus versions:
                                           ['2016', '2017', '2018', '2019', '2020', '2021', '2022', '6.11', '6.12',
                                           '6.13', '6.14']
+        splash: str -> Optional. Path to the splash image. If used, the user must introduce pyi_splash.close() at the
+            beginning of the execution of the module. Import pyi_splash first. The splash image will appear during  the
+            .exe unpacking. Image should be png and smaller than 500x500 pixels.
     """
 
+    # 0 ) Genera el archivo .log y añade los logs de la importación ------------------------------------------------
+    # Configura el logger para que escriba automaticamente los logs ------------------------------------------------
+    N2PLog._N2PLog__fh.write_buffered_records()
+    N2PLog._N2PLog__fh.immediate_logging()
+
     # Paso todoo a mayusculas para que no haya errores
     solver.upper()
 
@@ -168,12 +177,14 @@ def n2ptoexe(path: str, console: bool = True, solver: str = "ALL", abaqusversion
         pyinstaller_cmd = [path] + [consl]
         pyinstaller_cmd += dll_list
         if icon == -1:
-            pyinstaller_cmd += ["--onefile", "--collect-all", "NaxToPy"]  # "--onefile",
+            pyinstaller_cmd += ["--onefile", "--collect-all", "NaxToPy"]
             # pyinstaller_cmd += ["--collect-all", "NaxToPy"]  # "--onefile",
             N2PLog.Warning.W200()
         else:
-            pyinstaller_cmd += ["--onefile", "--collect-all", "NaxToPy", '--icon', icon]  # "--onefile",
-            # pyinstaller_cmd += ["--collect-all", "NaxToPy", '--icon', icon]  # "--onefile",
+            pyinstaller_cmd += ["--onefile", "--collect-all", "NaxToPy", '--icon', icon]
+
+        if splash:
+            pyinstaller_cmd += ['--splash', splash]
 
         PyIns.run(pyinstaller_cmd)
         N2PLog.Info.I201(os.getcwd())

{NaxToPy-1.5.0 → NaxToPy-1.5.2/src/NaxToPy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: NaxToPy
-Version: 1.5.0
+Version: 1.5.2
 Summary: Package for postprocessing FEM results in Python
 Home-page: https://www.idaerosolutions.com/Home/NaxToPy
 Download-URL: https://apps.microsoft.com/detail/XP9MMH0KDKGRJN?hl=en-US&gl=US
@@ -129,7 +129,7 @@ Requires-Dist: setuptools>=67.8.0
 [![MicrosoftStore](https://img.shields.io/badge/Microsoft%20Store-NaxTo-blue?logo=microsoftstore&logoColor=blue&labelColor=lightgrey)](https://apps.microsoft.com/detail/XP9MMH0KDKGRJN?hl=en-US&gl=US)
 [![PyPi - Downloads](https://img.shields.io/pypi/dm/NaxToPy?color=dgreen)](https://pypi.org/project/NaxToPy/#files)
 
-![](https://idaerosolutions.com/images/external/NaxToPy/Logo%20NaxToPy_Black.png "NaxToPy")
+![](https://idaerosolutions.com/images/icons/Logo_NaxToPy_Black.svg "NaxToPy")
 
 # NaxToPy
 
@@ -228,6 +228,14 @@ To see previous version see the pre-release versions in https://test.pypi.org/pr
 1. A bug is fixed that prevented requesting results on global axes.
 2. The typing of some functions is improved.
 
+### v.1.5.1
+1. Bug Fix. If the name for a derivated load case is repeated for a second time, the name is changed. 
+2. Bug Fix. Now is possible to change the criteria for a new envelope load case.
+
+### v1.5.2
+1. Bug fix: A bug has been resolved that previously prevented the generation of a .log file while executing the N2PtoEXE module.
+2. Bug fix: An internal error related to finding the libraries has been resolved.
+3. The option to include a splash image in an executable has been added.
 
 # Documentation