Merge pull request #346 from Dlubal-Software/heet-coordinateSystemUpdate

Update coordinateSystem.py

Author: OndraMichal

RFEM/BasicObjects/coordinateSystem.py RFEM/GuideObjects/coordinateSystem.pyRFEM/BasicObjects/coordinateSystem.py renamed to RFEM/GuideObjects/coordinateSystem.py

@@ -4,7 +4,6 @@
 class CoordinateSystem():
     def __init__(self,
                  no: int = 1,
-                 type = CoordinateSystemType.TYPE_OFFSET_XYZ,
                  origin_coordinate_x: float = 0.0,
                  origin_coordinate_y: float = 0.0,
                  origin_coordinate_z: float = 0.0,
@@ -16,11 +15,10 @@ def __init__(self,
         '''
          Args:
             no (int): Coordinate System Tag
-            type (enum): Coordinate System Type
             origin_coordinate_x (float): X-Coordinate
             origin_coordinate_y (float): Y-Coordinate
             origin_coordinate_z (float): Z-Coordinate
-            name (str): Name
+            name (str, optional): User Defined Coordinate System Name
             comment (str, optional): Comments
             params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary
             model (RFEM Class, optional): Model to be edited
@@ -35,7 +33,7 @@ def __init__(self,
         clientObject.no = no
 
         # Coordinate System Type
-        clientObject.type = type.name
+        clientObject.type = CoordinateSystemType.TYPE_OFFSET_XYZ.name
 
         # Coordinates
         clientObject.origin_coordinate_x = origin_coordinate_x
@@ -44,6 +42,7 @@ def __init__(self,
 
         # Name
         if name:
+            clientObject.user_defined_name_enabled = True
             clientObject.name = name
 
         # Comment
@@ -76,7 +75,7 @@ def OffsetXYZ(no: int = 1,
             origin_coordinate_x (float): X-Coordinate
             origin_coordinate_y (float): Y-Coordinate
             origin_coordinate_z (float): Z-Coordinate
-            name (str): Name
+            name (str, optional): User Defined Coordinate System Name
             comment (str, optional): Comments
             params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary
             model (RFEM Class, optional): Model to be edited
@@ -100,6 +99,7 @@ def OffsetXYZ(no: int = 1,
 
         # Name
         if name:
+            clientObject.user_defined_name_enabled = True
             clientObject.name = name
 
         # Comment
@@ -144,7 +144,7 @@ def ThreePoints(no: int = 1,
             uw_plane_point_coordinate_x (float): Point in +UW-Plane - 2nd Point X-Coordinate
             uw_plane_point_coordinate_y (float): Point in +UW-Plane - 2nd Point Y-Coordinate
             uw_plane_point_coordinate_z (float): Point in +UW-Plane - 2nd Point Z-Coordinate
-            name (str): Name
+            name (str, optional): User Defined Coordinate System Name
             comment (str, optional): Comments
             params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary
             model (RFEM Class, optional): Model to be edited
@@ -176,6 +176,7 @@ def ThreePoints(no: int = 1,
 
         # Name
         if name:
+            clientObject.user_defined_name_enabled = True
             clientObject.name = name
 
         # Comment
@@ -216,7 +217,7 @@ def TwoPointsAndAngle(no: int = 1,
             u_axis_point_coordinate_y (float): Point on +U-Axis - 1st point Y-Coordinate
             u_axis_point_coordinate_z (float): Point on +U-Axis - 1st point Z-Coordinate
             uw_plane_angle (float): Rotation About U-Axis
-            name (str): Name
+            name (str, optional): Name
             comment (str, optional): Comments
             params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary
             model (RFEM Class, optional): Model to be edited
@@ -246,6 +247,7 @@ def TwoPointsAndAngle(no: int = 1,
 
         # Name
         if name:
+            clientObject.user_defined_name_enabled = True
             clientObject.name = name
 
         # Comment
@@ -282,11 +284,11 @@ def PointAndThreeAngles(no: int = 1,
             origin_coordinate_x (float): Origin Point X-Coordinate
             origin_coordinate_y (float): Origin Point Y-Coordinate
             origin_coordinate_z (float): Origin Point Z-Coordinate
-            rotation_angles_sequence (float): Rotation Angles Sequesce
+            rotation_angles_sequence (enum): Coordinate System Rotation Angles Sequence Enumeration
             rotation_angle_1 (float): Rotation about X Axes
             rotation_angle_2 (float): Rotation about Y Axes
             rotation_angle_3 (float): Rotation about Z Axes
-            name (str): Name
+            name (str, optional): User Defined Coordinate System Name
             comment (str, optional): Comments
             params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary
             model (RFEM Class, optional): Model to be edited
@@ -300,7 +302,6 @@ def PointAndThreeAngles(no: int = 1,
         # Coordinate System No.
         clientObject.no = no
 
-
         # Coordinate System Type
         clientObject.type = CoordinateSystemType.TYPE_POINT_AND_3_ANGLES.name
 
@@ -318,6 +319,7 @@ def PointAndThreeAngles(no: int = 1,
 
         # Name
         if name:
+            clientObject.user_defined_name_enabled = True
             clientObject.name = name
 
         # Comment
@@ -339,7 +341,7 @@ def GetCoordinateSystem(object_index: int = 1, model = Model):
 
         '''
         Args:
-            obejct_index (int): Thickness Index
+            obejct_index (int): Coordinate System Index
             model (RFEM Class, optional): Model to be edited
         '''
 

RFEM/Tools/GetObjectNumbersByType.py

@@ -61,7 +61,7 @@ def __new__(cls,
         # For each of these steps individual record is made (4 total).
 
         # Vector of all function
-        func_vec = [[ObjectTypes.E_OBJECT_TYPE_COORDINATE_SYSTEM, lambda i: model.clientModel.service.get_coordinate_system(i), 'from RFEM.BasicObjects.coordinateSystem import CoordinateSystem\n', 'CoordinateSystem'],
+        func_vec = [[ObjectTypes.E_OBJECT_TYPE_COORDINATE_SYSTEM, lambda i: model.clientModel.service.get_coordinate_system(i), 'from RFEM.GuideObjects.coordinateSystem import CoordinateSystem\n', 'CoordinateSystem'],
             [ObjectTypes.E_OBJECT_TYPE_MATERIAL, lambda i: model.clientModel.service.get_material(i), 'from RFEM.BasicObjects.material import Material\n', 'Material'],
             [ObjectTypes.E_OBJECT_TYPE_SECTION, lambda i: model.clientModel.service.get_section(i), 'from RFEM.BasicObjects.section import Section\n', 'Section'],
             [ObjectTypes.E_OBJECT_TYPE_THICKNESS, lambda i: model.clientModel.service.get_thickness(i), 'from RFEM.BasicObjects.thickness import Thickness\n', 'Thickness'],

UnitTests/test_basic_objects.py

@@ -20,7 +20,6 @@
 from RFEM.BasicObjects.memberSet import MemberSet
 from RFEM.BasicObjects.solid import Solid
 from RFEM.BasicObjects.solidSet import SolidSet
-from RFEM.BasicObjects.coordinateSystem import CoordinateSystem
 from RFEM.Calculate.meshSettings import GetModelInfo
 
 if Model.clientModel is None:
@@ -788,23 +787,18 @@ def test_thickness_shape_orthotropy():
 
     Model.clientModel.service.finish_modification()
 
-def test_coordinate_system():
+def test_get_thickness():
 
     Model.clientModel.service.delete_all()
     Model.clientModel.service.begin_modification()
 
     Material(1, 'S235')
 
-    Node(1, 0, 0, 0)
-
-    CoordinateSystem()
-    CoordinateSystem.OffsetXYZ(2)
-    CoordinateSystem.ThreePoints(3)
-    CoordinateSystem.TwoPointsAndAngle(4)
-    CoordinateSystem.PointAndThreeAngles(5)
+    Thickness(1, '20 mm', 1, 0.02)
 
     Model.clientModel.service.finish_modification()
 
-    coord = CoordinateSystem.GetCoordinateSystem(2)
+    thickness = Thickness.GetThickness(1)
 
-    assert coord.type == 'TYPE_OFFSET_XYZ'
+    assert thickness['type'] == "TYPE_UNIFORM"
+    assert thickness['uniform_thickness'] == 0.02

UnitTests/test_note.py UnitTests/test_guide_objects.pyUnitTests/test_note.py renamed to UnitTests/test_guide_objects.py

@@ -16,6 +16,7 @@
 from RFEM.BasicObjects.member import Member
 from RFEM.BasicObjects.surface import Surface
 from RFEM.GuideObjects.note import Note
+from RFEM.GuideObjects.coordinateSystem import CoordinateSystem
 
 if Model.clientModel is None:
     Model()
@@ -69,3 +70,40 @@ def test_note():
     note5 = Model.clientModel.service.get_note(5)
     assert note5.surface_first_coordinate == 5
     assert note5.offset_coordinate_y == 2
+
+def test_coordinate_system():
+
+    Model.clientModel.service.delete_all()
+    Model.clientModel.service.begin_modification()
+
+    Material(1, 'S235')
+
+    Node(1, 0, 0, 0)
+
+    CoordinateSystem()
+    CoordinateSystem.OffsetXYZ(2, 1, 0, 0, 'Offset')
+    CoordinateSystem.ThreePoints(3, 2, 0, 0, 0, 1, 0, 0, 0, 3)
+    CoordinateSystem.TwoPointsAndAngle(4, 1.5, 0, 0, 0, 0, 0, 5.5)
+    CoordinateSystem.PointAndThreeAngles(5)
+
+    Model.clientModel.service.finish_modification()
+
+    coord2 = Model.clientModel.service.get_coordinate_system(2)
+
+    assert coord2.type == 'TYPE_OFFSET_XYZ'
+    assert coord2.name == 'Offset'
+    assert coord2.origin_coordinate_x == 1
+
+    coord3 = Model.clientModel.service.get_coordinate_system(3)
+
+    assert coord3.type == 'TYPE_3_POINTS'
+    assert coord3.u_axis_point_coordinate_y == 1
+
+    coord4 = Model.clientModel.service.get_coordinate_system(4)
+
+    assert coord4.type == 'TYPE_2_POINTS_AND_ANGLE'
+    assert coord4.origin_coordinate_x == 1.5
+
+    coord5 = Model.clientModel.service.get_coordinate_system(5)
+
+    assert coord5.type == 'TYPE_POINT_AND_3_ANGLES'