NaxToPy 1.5.0__tar.gz → 1.5.1__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: NaxToPy
-Version: 1.5.0
+Version: 1.5.1
 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,9 @@ 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.
 
 # Documentation
 

{NaxToPy-1.5.0 → NaxToPy-1.5.1}/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,9 @@ 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.
 
 # Documentation
 

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

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

{NaxToPy-1.5.0 → NaxToPy-1.5.1}/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.1/src/NaxToPy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: NaxToPy
-Version: 1.5.0
+Version: 1.5.1
 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,9 @@ 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.
 
 # Documentation