US-9071: Delete Functions for Objects

RFEM/BasicObjects/line.py

@@ -1,5 +1,5 @@
-from RFEM.initModel import Model, clearAtributes, ConvertToDlString
-from RFEM.enums import LineType, LineArcAlphaAdjustmentTarget
+from RFEM.initModel import Model, clearAtributes, ConvertToDlString, ConvertStrToListOfInt
+from RFEM.enums import LineType, LineArcAlphaAdjustmentTarget, ObjectTypes
 
 class Line():
     def __init__(self,
@@ -460,3 +460,15 @@ def NURBS(
 
         # Add Line to client model
         model.clientModel.service.set_line(clientObject)
+
+    @staticmethod
+    def DeleteLine(lines_no: str = '1 2', model = Model):
+
+        '''
+        Args:
+            lines_no (str): Numbers of Lines to be deleted
+        '''
+
+        # Delete from client model
+        for line in ConvertStrToListOfInt(lines_no):
+            model.clientModel.service.delete_object(ObjectTypes.E_OBJECT_TYPE_LINE.name, line)

RFEM/BasicObjects/lineSet.py

@@ -13,7 +13,7 @@ def __init__(self,
         '''
         Args:
             no (int): Line Set Tag
-            lines_no (str): Tags of Lines Contained Within Line Set
+            lines_no (str): Numbers of Lines Contained Within Line Set
             line_set_type (enum): Line Set Type Enumeration
             comment (str, optional): Comments
             params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary
@@ -56,7 +56,7 @@ def ContinuousLines(
         '''
         Args:
             no (int): Line Set Tag
-            lines_no (str): Tags of Lines Contained Within Continuous Line Set
+            lines_no (str): Numbers of Lines Contained Within Continuous Line Set
             comment (str, optional): Comments
             params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary
         '''
@@ -98,7 +98,7 @@ def GroupOfLines(
         '''
         Args:
             no (int): Line Set Tag
-            lines_no (str): Tags of Lines Contained Within Group of Lines Line Set
+            lines_no (str): Numbers of Lines Contained Within Group of Lines Line Set
             comment (str, optional): Comments
             params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary
         '''

RFEM/BasicObjects/material.py

@@ -1,4 +1,5 @@
-from RFEM.initModel import clearAtributes, Model
+from RFEM.initModel import clearAtributes, Model, ConvertStrToListOfInt
+from RFEM.enums import ObjectTypes
 
 
 class Material():
@@ -39,3 +40,15 @@ def __init__(self,
 
         # Add material to client model
         model.clientModel.service.set_material(clientObject)
+
+    @staticmethod
+    def DeleteMaterial(materials_no: str = '1 2', model = Model):
+
+        '''
+        Args:
+            materials_no (str): Numbers of Materials to be deleted
+        '''
+
+        # Delete from client model
+        for material in ConvertStrToListOfInt(materials_no):
+            model.clientModel.service.delete_object(ObjectTypes.E_OBJECT_TYPE_MATERIAL.name, material)

RFEM/BasicObjects/member.py

@@ -1,5 +1,5 @@
-from RFEM.enums import MemberType, MemberRotationSpecificationType, MemberSectionDistributionType, MemberTypeRibAlignment, MemberReferenceLengthWidthType, MemberResultBeamIntegration
-from RFEM.initModel import Model, clearAtributes
+from RFEM.enums import MemberType, MemberRotationSpecificationType, MemberSectionDistributionType, MemberTypeRibAlignment, MemberReferenceLengthWidthType, MemberResultBeamIntegration, ObjectTypes
+from RFEM.initModel import Model, clearAtributes, ConvertStrToListOfInt
 
 class Member():
     def __init__(self,
@@ -1983,3 +1983,15 @@ def CouplingHingeHinge(
 
         # Add Member to client model
         model.clientModel.service.set_member(clientObject)
+
+    @staticmethod
+    def DeleteMember(members_no: str = '1 2', model = Model):
+
+        '''
+        Args:
+            members_no (str): Numbers of Members to be deleted
+        '''
+
+        # Delete from client model
+        for member in ConvertStrToListOfInt(members_no):
+            model.clientModel.service.delete_object(ObjectTypes.E_OBJECT_TYPE_MEMBER.name, member)

RFEM/BasicObjects/memberSet.py

@@ -13,7 +13,7 @@ def __init__(self,
         '''
         Args:
             no (int): Member Set Tag
-            members_no (str): Tags of Members Contained Within Member Set
+            members_no (str): Numbers of Members Contained Within Member Set
             member_set_type (enum): Member Set Type Enumeration
             comment (str, optional): Comments
             params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary
@@ -56,7 +56,7 @@ def ContinuousMembers(
         '''
         Args:
             no (int): Member Set Tag
-            members_no (str): Tags of Members Contained Within Continuous Member Set
+            members_no (str): Numbers of Members Contained Within Continuous Member Set
             comment (str, optional): Comments
             params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary
         '''
@@ -98,7 +98,7 @@ def GroupOfmembers(
         '''
         Args:
             no (int): Member Set Tag
-            members_no (str): Tags of Members Contained Within Group of Members Member Set
+            members_no (str): Numbers of Members Contained Within Group of Members Member Set
             comment (str, optional): Comments
             params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary
         '''

RFEM/BasicObjects/node.py

@@ -1,7 +1,7 @@
 from RFEM.enums import NodeType
 from RFEM.enums import NodeCoordinateSystemType
-from RFEM.enums import NodeReferenceType
-from RFEM.initModel import Model, clearAtributes
+from RFEM.enums import NodeReferenceType, ObjectTypes
+from RFEM.initModel import Model, clearAtributes, ConvertStrToListOfInt
 from math import pi
 
 class Node():
@@ -431,3 +431,15 @@ def OnMember(
 
         # Add Node to client model
         model.clientModel.service.set_node(clientObject)
+
+    @staticmethod
+    def DeleteNode(nodes_no: str = '1 2', model = Model):
+
+        '''
+        Args:
+            nodes_no (str): Numbers of Nodes to be deleted
+        '''
+
+        # Delete from client model
+        for node in ConvertStrToListOfInt(nodes_no):
+            model.clientModel.service.delete_object(ObjectTypes.E_OBJECT_TYPE_NODE.name, node)

RFEM/BasicObjects/opening.py

@@ -1,4 +1,5 @@
-from RFEM.initModel import Model, clearAtributes, ConvertToDlString
+from RFEM.initModel import Model, clearAtributes, ConvertToDlString, ConvertStrToListOfInt
+from RFEM.enums import ObjectTypes
 
 class Opening():
     def __init__(self,
@@ -11,7 +12,7 @@ def __init__(self,
         '''
         Args:
             no (int): Opening Tag
-            lines_no (str): Tags of Lines defining Opening
+            lines_no (str): Numbers of Lines defining Opening
             comment (str, optional): Comments
             params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary
         '''
@@ -38,3 +39,15 @@ def __init__(self,
 
         # Add Opening to client model
         model.clientModel.service.set_opening(clientObject)
+
+    @staticmethod
+    def DeleteOpening(openings_no: str = '1 2', model = Model):
+
+        '''
+        Args:
+            openings_no (str): Numbers of Openings to be deleted
+        '''
+
+        # Delete from client model
+        for opening in ConvertStrToListOfInt(openings_no):
+            model.clientModel.service.delete_object(ObjectTypes.E_OBJECT_TYPE_OPENING.name, opening)

RFEM/BasicObjects/section.py

@@ -1,4 +1,5 @@
-from RFEM.initModel import Model, clearAtributes
+from RFEM.initModel import Model, clearAtributes, ConvertStrToListOfInt
+from RFEM.enums import ObjectTypes
 
 class Section():
     def __init__(self,
@@ -44,3 +45,15 @@ def __init__(self,
 
         # Add Section to client model
         model.clientModel.service.set_section(clientObject)
+
+    @staticmethod
+    def DeleteSection(sections_no: str = '1 2', model = Model):
+
+        '''
+        Args:
+            sections_no (str): Numbers of Sections to be deleted
+        '''
+
+        # Delete from client model
+        for section in ConvertStrToListOfInt(sections_no):
+            model.clientModel.service.delete_object(ObjectTypes.E_OBJECT_TYPE_SECTION.name, section)

RFEM/BasicObjects/solid.py

@@ -1,5 +1,5 @@
-from RFEM.initModel import Model, clearAtributes, ConvertToDlString
-from RFEM.enums import SolidType
+from RFEM.initModel import Model, clearAtributes, ConvertToDlString, ConvertStrToListOfInt
+from RFEM.enums import SolidType, ObjectTypes
 
 class Solid():
     def __init__(self,
@@ -13,7 +13,7 @@ def __init__(self,
         '''
         Args:
             no (int): Solid Tag
-            boundary_surfaces_no (str): Tags of Surfaces defining Solid
+            boundary_surfaces_no (str): Numbers of Surfaces defining Solid
             material_no (int): Tag of Material assigned to Solid
             comment (str, optional): Comments
             params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary
@@ -57,7 +57,7 @@ def Standard(
         '''
         Args:
             no (int): Solid Tag
-            boundary_surfaces_no (str): Tags of Surfaces defining Solid
+            boundary_surfaces_no (str): Numbers of Surfaces defining Solid
             material_no (int): Tag of Material assigned to Solid
             comment (str, optional): Comments
             params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary
@@ -104,7 +104,7 @@ def Gas(
         '''
         Args:
             no (int): Solid Tag
-            boundary_surfaces_no (str): Tags of Surfaces defining Gas
+            boundary_surfaces_no (str): Numbers of Surfaces defining Gas
             material_no (int): Tag of Material assigned to Solid
             comment (str, optional): Comments
             params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary
@@ -151,7 +151,7 @@ def Contact(
         '''
         Args:
             no (int): Solid Tag
-            boundary_surfaces_no (str): Tags of Surfaces defining Contact
+            boundary_surfaces_no (str): Numbers of Surfaces defining Contact
             material_no (int): Tag of Material assigned to Solid
             comment (str, optional): Comments
             params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary
@@ -198,7 +198,7 @@ def Soil(
         '''
         Args:
             no (int): Solid Tag
-            boundary_surfaces_no (str): Tags of Surfaces defining Soil
+            boundary_surfaces_no (str): Numbers of Surfaces defining Soil
             material_no (int): Tag of Material assigned to Solid
             comment (str, optional): Comments
             params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary
@@ -231,4 +231,16 @@ def Soil(
                 clientObject[key] = params[key]
 
         # Add Surface to client model
-        model.clientModel.service.set_solid(clientObject)
+        model.clientModel.service.set_solid(clientObject)
+
+    @staticmethod
+    def DeleteSolid(solids_no: str = '1 2', model = Model):
+
+        '''
+        Args:
+            solids_no (str): Numbers of Solids to be deleted
+        '''
+
+        # Delete solids from client model
+        for solid in ConvertStrToListOfInt(solids_no):
+            model.clientModel.service.delete_object(ObjectTypes.E_OBJECT_TYPE_SOLID.name, solid)

RFEM/BasicObjects/solidSet.py

@@ -13,7 +13,7 @@ def __init__(self,
         '''
         Args:
             no (int): Solid Set Tag
-            solids_no (str): Tags of Solids Contained Within Solid Set
+            solids_no (str): Numbers of Solids Contained Within Solid Set
             solid_set_type (enum): Solid Set Type Enumeration
             comment (str, optional): Comments
             params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary
@@ -56,7 +56,7 @@ def ContinuousSolids(
         '''
         Args:
             no (int): Solid Set Tag
-            solids_no (str): Tags of Solids Contained Within Continuous Solid Set
+            solids_no (str): Numbers of Solids Contained Within Continuous Solid Set
             comment (str, optional): Comments
             params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary
         '''
@@ -98,7 +98,7 @@ def GroupOfSolids(
         '''
         Args:
             no (int): Solid Set Tag
-            solids_no (str): Tags of Solids Contained Within Group of Solids Solid Set
+            solids_no (str): Numbers of Solids Contained Within Group of Solids Solid Set
             comment (str, optional): Comments
             params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary
         '''