Merge pull request #351 from Dlubal-Software/heet-memberUpdate

Update member.py

Author: OndraMichal

RFEM/BasicObjects/member.py

@@ -43,15 +43,12 @@ def __init__(self,
         # Member Type
         clientObject.type = MemberType.TYPE_BEAM.name
 
-        # Assigned Line No.
-        clientObject.line = line
-
-        if not line:
-            # Start Node No.
+        # Assigned Line number or Node numbers
+        if line is None:
             clientObject.node_start = start_node_no
-
-            # End Node No.
             clientObject.node_end = end_node_no
+        else:
+            clientObject.line = line
 
         # Member Rotation Angle beta
         clientObject.rotation_angle = rotation_angle
@@ -173,12 +170,12 @@ def Beam(
         # Assigned Line No.
         clientObject.line = line
 
-        if not line:
-            # Start Node No.
+        # Assigned Line number or Node numbers
+        if line is None:
             clientObject.node_start = start_node_no
-
-            # End Node No.
             clientObject.node_end = end_node_no
+        else:
+            clientObject.line = line
 
         # Section Distribution
         clientObject.section_distribution_type = section_distribution_type.name
@@ -368,15 +365,12 @@ def Rigid(
         # Member Type
         clientObject.type = MemberType.TYPE_RIGID.name
 
-        # Assigned Line No.
-        clientObject.line = line
-
-        if not line:
-            # Start Node No.
+        # Assigned Line number or Node numbers
+        if line is None:
             clientObject.node_start = start_node_no
-
-            # End Node No.
             clientObject.node_end = end_node_no
+        else:
+            clientObject.line = line
 
         # Member Rotation
         clientObject.rotation_specification_type = rotation_specification_type.name
@@ -465,15 +459,12 @@ def Rib(
         # Member Type
         clientObject.type = MemberType.TYPE_RIB.name
 
-        # Assigned Line No.
-        clientObject.line = line
-
-        if not line:
-            # Start Node No.
+        # Assigned Line number or Node numbers
+        if line is None:
             clientObject.node_start = start_node_no
-
-            # End Node No.
             clientObject.node_end = end_node_no
+        else:
+            clientObject.line = line
 
         # Section Distribution
         clientObject.section_distribution_type = section_distribution_type.name
@@ -568,15 +559,12 @@ def Truss(
         # Member Type
         clientObject.type = MemberType.TYPE_TRUSS.name
 
-        # Assigned Line No.
-        clientObject.line = line
-
-        if not line:
-            # Start Node No.
+        # Assigned Line number or Node numbers
+        if line is None:
             clientObject.node_start = start_node_no
-
-            # End Node No.
             clientObject.node_end = end_node_no
+        else:
+            clientObject.line = line
 
         # Member Rotation
         clientObject.rotation_specification_type = rotation_specification_type.name
@@ -670,15 +658,12 @@ def TrussOnlyN(
         # Member Type
         clientObject.type = MemberType.TYPE_TRUSS_ONLY_N.name
 
-        # Assigned Line No.
-        clientObject.line = line
-
-        if not line:
-            # Start Node No.
+        # Assigned Line number or Node numbers
+        if line is None:
             clientObject.node_start = start_node_no
-
-            # End Node No.
             clientObject.node_end = end_node_no
+        else:
+            clientObject.line = line
 
         # Member Rotation
         clientObject.rotation_specification_type = rotation_specification_type.name
@@ -772,15 +757,12 @@ def Tension(
         # Member Type
         clientObject.type = MemberType.TYPE_TENSION.name
 
-        # Assigned Line No.
-        clientObject.line = line
-
-        if not line:
-            # Start Node No.
+        # Assigned Line number or Node numbers
+        if line is None:
             clientObject.node_start = start_node_no
-
-            # End Node No.
             clientObject.node_end = end_node_no
+        else:
+            clientObject.line = line
 
         # Member Rotation
         clientObject.rotation_specification_type = rotation_specification_type.name
@@ -874,15 +856,12 @@ def Compression(
         # Member Type
         clientObject.type = MemberType.TYPE_COMPRESSION.name
 
-        # Assigned Line No.
-        clientObject.line = line
-
-        if not line:
-            # Start Node No.
+        # Assigned Line number or Node numbers
+        if line is None:
             clientObject.node_start = start_node_no
-
-            # End Node No.
             clientObject.node_end = end_node_no
+        else:
+            clientObject.line = line
 
         # Member Rotation
         clientObject.rotation_specification_type = rotation_specification_type.name
@@ -976,15 +955,12 @@ def Buckling(
         # Member Type
         clientObject.type = MemberType.TYPE_BUCKLING.name
 
-        # Assigned Line No.
-        clientObject.line = line
-
-        if not line:
-            # Start Node No.
+        # Assigned Line number or Node numbers
+        if line is None:
             clientObject.node_start = start_node_no
-
-            # End Node No.
             clientObject.node_end = end_node_no
+        else:
+            clientObject.line = line
 
         # Member Rotation
         clientObject.rotation_specification_type = rotation_specification_type.name
@@ -1075,15 +1051,12 @@ def Cable(
         # Member Type
         clientObject.type = MemberType.TYPE_CABLE.name
 
-        # Assigned Line No.
-        clientObject.line = line
-
-        if not line:
-            # Start Node No.
+        # Assigned Line number or Node numbers
+        if line is None:
             clientObject.node_start = start_node_no
-
-            # End Node No.
             clientObject.node_end = end_node_no
+        else:
+            clientObject.line = line
 
         # Member Rotation
         clientObject.rotation_specification_type = rotation_specification_type.name