Merge pull request #357 from Dlubal-Software/heet-updateResultTables

Heet update result tables

Author: OndraMichal

RFEM/Results/resultTables.py

@@ -502,17 +502,39 @@ def MembersGlobalDeformations(
         loading_no: int = 1,
         object_no: int = 0,
         include_base: bool = False,
+        without_extremes: bool = False,
         model = Model):
 
         '''
          Args:
             loading_type (emun): Loading type (LC2 = E_OBJECT_TYPE_LOAD_CASE)
             loading_no (int): Loading Number (CO2 = 2)
             object_no (int): Object number
+            include_base (bool, optional): Include Base (include_base must be 'True' for without_extremes=True)
+            without_extremes (bool, optional): Without Extremes Option
             model (class, optional): Model instance
         '''
+        if without_extremes:
 
-        return ConvertResultsToListOfDct(model.clientModel.service.get_results_for_members_global_deformations(loading_type.name, loading_no, object_no), include_base)
+            results = ConvertResultsToListOfDct(model.clientModel.service.get_results_for_members_global_deformations(loading_type.name, loading_no, object_no), True)
+            result, combos, combo = [], [], ()
+
+            for item in results:
+                description = item.get('description')
+                location = item.get('location')
+                node = item.get('node_number')
+                if isinstance(description, float) or description == 'Extremes':
+                    if description == 'Extremes':
+                        description = results[results.index(item) - 1].get('description')
+                    if location != None: combo = (description, node, location)
+                    if combo not in combos:
+                        combos.append(combo)
+                        result.append(item)
+
+            return result
+
+        else:
+            return ConvertResultsToListOfDct(model.clientModel.service.get_results_for_members_global_deformations(loading_type.name, loading_no, object_no), include_base)
 
     @staticmethod
     def MembersHingeDeformations(
@@ -556,35 +578,80 @@ def MembersInternalForces(
         loading_no: int = 1,
         object_no: int = 0,
         include_base: bool = False,
+        without_extremes: bool = False,
         model = Model):
 
         '''
          Args:
             loading_type (emun): Loading type (LC2 = E_OBJECT_TYPE_LOAD_CASE)
             loading_no (int): Loading Number (CO2 = 2)
             object_no (int): Object number
+            include_base (bool, optional): Include Base (include_base must be 'True' for without_extremes=True)
+            without_extremes (bool, optional): Without Extremes Option
             model (class, optional): Model instance
         '''
+        if without_extremes:
+
+            results = ConvertResultsToListOfDct(model.clientModel.service.get_results_for_members_internal_forces(loading_type.name, loading_no, object_no), True)
+            result, combos, combo = [], [], ()
 
-        return ConvertResultsToListOfDct(model.clientModel.service.get_results_for_members_internal_forces(loading_type.name, loading_no, object_no), include_base)
+            for item in results:
+                description = item.get('description')
+                location = item.get('location')
+                node = item.get('node_number')
+                if isinstance(description, float) or description == 'Extremes':
+                    if description == 'Extremes':
+                        description = results[results.index(item) - 1].get('description')
+                    if location != None: combo = (description, node, location)
+                    if combo not in combos:
+                        combos.append(combo)
+                        result.append(item)
+
+            return result
+
+        else:
+            return ConvertResultsToListOfDct(model.clientModel.service.get_results_for_members_internal_forces(loading_type.name, loading_no, object_no), include_base)
 
     @staticmethod
     def MembersInternalForcesByMemberSet(
         loading_type: enum = CaseObjectType.E_OBJECT_TYPE_LOAD_CASE,
         loading_no: int = 1,
         object_no: int = 0,
         include_base: bool = False,
+        without_extremes: bool = False,
         model = Model):
 
         '''
          Args:
             loading_type (emun): Loading type (LC2 = E_OBJECT_TYPE_LOAD_CASE)
             loading_no (int): Loading Number (CO2 = 2)
             object_no (int): Object number
+            include_base (bool, optional): Include Base (include_base must be 'True' for without_extremes=True)
+            without_extremes (bool, optional): Without Extremes Option
             model (class, optional): Model instance
         '''
+        if without_extremes:
+
+            results = ConvertResultsToListOfDct(model.clientModel.service.get_results_for_members_internal_forces_by_member_set(loading_type.name, loading_no, object_no), True)
+            result, combos, combo = [], [], ()
+
+            for item in results:
+                description = item.get('description')
+                location = item.get('location')
+                node = item.get('node_number')
+                member = item.get('member_number')
+                if isinstance(description, float) or description == 'Extremes':
+                    if description == 'Extremes':
+                        description = results[results.index(item) - 1].get('description')
+                    if location != None: combo = (description, member, node, location)
+                    if combo not in combos:
+                        combos.append(combo)
+                        result.append(item)
 
-        return ConvertResultsToListOfDct(model.clientModel.service.get_results_for_members_internal_forces_by_member_set(loading_type.name, loading_no, object_no), include_base)
+            return result
+
+        else:
+            return ConvertResultsToListOfDct(model.clientModel.service.get_results_for_members_internal_forces_by_member_set(loading_type.name, loading_no, object_no), include_base)
 
     @staticmethod
     def MembersInternalForcesBySection(
@@ -610,35 +677,79 @@ def MembersLocalDeformations(
         loading_no: int = 1,
         object_no: int = 0,
         include_base: bool = False,
+        without_extremes: bool = False,
         model = Model):
 
         '''
          Args:
             loading_type (emun): Loading type (LC2 = E_OBJECT_TYPE_LOAD_CASE)
             loading_no (int): Loading Number (CO2 = 2)
             object_no (int): Object number
+            include_base (bool, optional): Include Base (include_base must be 'True' for without_extremes=True)
+            without_extremes (bool, optional): Without Extremes Option
             model (class, optional): Model instance
         '''
+        if without_extremes:
+
+            results = ConvertResultsToListOfDct(model.clientModel.service.get_results_for_members_local_deformations(loading_type.name, loading_no, object_no), True)
+            result, combos, combo = [], [], ()
+
+            for item in results:
+                description = item.get('description')
+                location = item.get('location')
+                node = item.get('node_number')
+                if isinstance(description, float) or description == 'Extremes':
+                    if description == 'Extremes':
+                        description = results[results.index(item) - 1].get('description')
+                    if location != None: combo = (description, node, location)
+                    if combo not in combos:
+                        combos.append(combo)
+                        result.append(item)
+
+            return result
 
-        return ConvertResultsToListOfDct(model.clientModel.service.get_results_for_members_local_deformations(loading_type.name, loading_no, object_no), include_base)
+        else:
+            return ConvertResultsToListOfDct(model.clientModel.service.get_results_for_members_local_deformations(loading_type.name, loading_no, object_no), include_base)
 
     @staticmethod
     def MembersStrains(
         loading_type: enum = CaseObjectType.E_OBJECT_TYPE_LOAD_CASE,
         loading_no: int = 1,
         object_no: int = 0,
         include_base: bool = False,
+        without_extremes: bool = False,
         model = Model):
 
         '''
          Args:
             loading_type (emun): Loading type (LC2 = E_OBJECT_TYPE_LOAD_CASE)
             loading_no (int): Loading Number (CO2 = 2)
             object_no (int): Object number
+            include_base (bool, optional): Include Base (include_base must be 'True' for without_extremes=True)
+            without_extremes (bool, optional): Without Extremes Option
             model (class, optional): Model instance
         '''
+        if without_extremes:
+
+            results = ConvertResultsToListOfDct(model.clientModel.service.get_results_for_members_strains(loading_type.name, loading_no, object_no), True)
+            result, combos, combo = [], [], ()
+
+            for item in results:
+                description = item.get('description')
+                location = item.get('location')
+                node = item.get('node_number')
+                if isinstance(description, float) or description == 'Extremes':
+                    if description == 'Extremes':
+                        description = results[results.index(item) - 1].get('description')
+                    if location != None: combo = (description, node, location)
+                    if combo not in combos:
+                        combos.append(combo)
+                        result.append(item)
 
-        return ConvertResultsToListOfDct(model.clientModel.service.get_results_for_members_strains(loading_type.name, loading_no, object_no), include_base)
+            return result
+
+        else:
+            return ConvertResultsToListOfDct(model.clientModel.service.get_results_for_members_strains(loading_type.name, loading_no, object_no), include_base)
 
     @staticmethod
     def ModalAnalysisEffectiveModalMasses(

UnitTests/test_ResultTables.py

@@ -61,3 +61,31 @@ def test_result_tables():
 
     table = ResultTables.SurfacesPrincipalTotalStrains(CaseObjectType.E_OBJECT_TYPE_DESIGN_SITUATION, 1, 1)
     assert table
+
+    table1 = ResultTables.MembersGlobalDeformations(CaseObjectType.E_OBJECT_TYPE_LOAD_CASE,1, object_no=0, include_base=True, without_extremes=False)
+    table2 = ResultTables.MembersGlobalDeformations(CaseObjectType.E_OBJECT_TYPE_LOAD_CASE,1, object_no=0, include_base=True, without_extremes=True)
+    table3 = ResultTables.MembersGlobalDeformations(CaseObjectType.E_OBJECT_TYPE_LOAD_CASE,1, object_no=1, include_base=True, without_extremes=True)
+
+    assert len(table1) > len(table2)
+    assert len(table2) > len(table3)
+
+    table4 = ResultTables.MembersLocalDeformations(CaseObjectType.E_OBJECT_TYPE_LOAD_CASE,1, object_no=0, include_base=True, without_extremes=False)
+    table5 = ResultTables.MembersLocalDeformations(CaseObjectType.E_OBJECT_TYPE_LOAD_CASE,1, object_no=0, include_base=True, without_extremes=True)
+    table6 = ResultTables.MembersLocalDeformations(CaseObjectType.E_OBJECT_TYPE_LOAD_CASE,1, object_no=1, include_base=True, without_extremes=True)
+
+    assert len(table4) > len(table5)
+    assert len(table5) > len(table6)
+
+    table7 = ResultTables.MembersInternalForces(CaseObjectType.E_OBJECT_TYPE_LOAD_CASE,1, object_no=0, include_base=True, without_extremes=False)
+    table8 = ResultTables.MembersInternalForces(CaseObjectType.E_OBJECT_TYPE_LOAD_CASE,1, object_no=0, include_base=True, without_extremes=True)
+    table9 = ResultTables.MembersInternalForces(CaseObjectType.E_OBJECT_TYPE_LOAD_CASE,1, object_no=1, include_base=True, without_extremes=True)
+
+    assert len(table7) > len(table8)
+    assert len(table8) > len(table9)
+
+    table10 = ResultTables.MembersStrains(CaseObjectType.E_OBJECT_TYPE_LOAD_CASE,1, object_no=0, include_base=True, without_extremes=False)
+    table11 = ResultTables.MembersStrains(CaseObjectType.E_OBJECT_TYPE_LOAD_CASE,1, object_no=0, include_base=True, without_extremes=True)
+    table12 = ResultTables.MembersStrains(CaseObjectType.E_OBJECT_TYPE_LOAD_CASE,1, object_no=1, include_base=True, without_extremes=True)
+
+    assert len(table10) > len(table11)
+    assert len(table11) > len(table12)