initial commit

unite tests: 125 passed, 9 skipped in 163.23s
dogukankaratas · Apr 6, 2022 · b153ea9 · b153ea9
1 parent a017acd
commit b153ea9
Show file tree

Hide file tree

Showing 87 changed files with 1,131 additions and 1,064 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -2,7 +2,7 @@
     "files.trimTrailingWhitespace": true,
     "editor.tabSize": 4,
     "editor.insertSpaces": true,
-    "python.linting.pylintEnabled": true,
+    "python.linting.pylintEnabled": false,
     "python.linting.pylintArgs": [],
     "python.linting.enabled": false,
     "python.linting.pydocstyleEnabled": false,
@@ -19,9 +19,12 @@
         "comments": false,
         "strings": false
     },
-    "editor.formatOnSave": true,
     "python.analysis.completeFunctionParens": true,
     "python.disableInstallationCheck": true,
     "python.linting.banditEnabled": true,
-    "python.languageServer": "Pylance"
+    "python.languageServer": "Pylance",
+    "python.analysis.diagnosticSeverityOverrides": {
+        "reportOptionalMemberAccess": "none",
+        "reportGeneralTypeIssues": "none",
+    }
 }
diff --git a/Examples/main.py b/Examples/main.py
@@ -11,7 +11,7 @@
 )
 sys.path.append(PROJECT_ROOT)
 from RFEM.enums import NodalSupportType, StaticAnalysisType, LoadDirectionType, MemberLoadDistribution, MemberLoadDirection, MemberRotationSpecificationType
-from RFEM.window import window
+from Examples.window import window
 from RFEM.dataTypes import inf
 from RFEM.initModel import Model, Calculate_all, insertSpaces, modelLst
 from RFEM.BasicObjects.material import Material
@@ -287,6 +287,7 @@ def main(hall_width_L, hall_height_h_o, hall_height_h_m, number_frames, frame_sp
 # -------------------------------------------------------------
     # Calculate all
     Calculate_all()
+
     print("Done")
 
 if __name__ == '__main__':

diff --git a/RFEM/BasicObjects/bracing.py b/RFEM/BasicObjects/bracing.py
@@ -11,7 +11,7 @@
 #                  start_section_no: int = 1,
 #                  end_section_no: int = 1,
 #                  comment: str = '',
-#                  params: dict = None):
+#                  params: dict = None, model = Model):
 
 #        '''
 #        Args:
@@ -27,7 +27,7 @@
 #        '''
 
 #         # Client model | Bracing
-#         clientObject = Model.clientModel.factory.create('ns0:bracing')
+#         clientObject = model.clientModel.factory.create('ns0:bracing')
 
 #         # Clears object atributes | Sets all atributes to None
 #         clearAtributes(clientObject)
@@ -67,7 +67,7 @@
 #             clientObject[key] = params[key]
 
 #         # Add Member to client model
-#         Model.clientModel.service.set_bracing(clientObject)
+#         model.clientModel.service.set_bracing(clientObject)
 
 #       def Horizontal(self,
 #             no: int = 1,
@@ -80,7 +80,7 @@
 #             start_bracing_hinge_no: int = 0,
 #             end_bracing_hinge_no: int = 0,
 #             comment: str = '',
-#             params: dict = None):
+#             params: dict = None, model = Model):
 
 #             '''
 #            Args:
@@ -98,7 +98,7 @@
 #             '''
 
 #         # Client model | Bracing
-#         clientObject = Model.clientModel.factory.create('ns0:bracing')
+#         clientObject = model.clientModel.factory.create('ns0:bracing')
 
 #         # Clears object atributes | Sets all atributes to None
 #         clearAtributes(clientObject)
@@ -138,7 +138,7 @@
 #             clientObject[key] = params[key]
 
 #         # Add Bracing to client model
-#         Model.clientModel.service.set_bracing(clientObject)
+#         model.clientModel.service.set_bracing(clientObject)
 
 #         def Vertical(self,
 #             no: int = 1,
@@ -151,7 +151,7 @@
 #             start_bracing_hinge_no: int = 0,
 #             end_bracing_hinge_no: int = 0,
 #             comment: str = '',
-#             params: dict = None):
+#             params: dict = None, model = Model):
 
 #            '''
 #            Args:
@@ -169,7 +169,7 @@
 #            '''
 
 #         # Client model | Bracing
-#         clientObject = Model.clientModel.factory.create('ns0:bracing')
+#         clientObject = model.clientModel.factory.create('ns0:bracing')
 
 #         # Clears object atributes | Sets all atributes to None
 #         clearAtributes(clientObject)
@@ -209,5 +209,5 @@
 #             clientObject[key] = params[key]
 
 #         # Add Bracing to client model
-#         Model.clientModel.service.set_bracing(clientObject)
+#         model.clientModel.service.set_bracing(clientObject)
 
diff --git a/RFEM/BasicObjects/frame.py b/RFEM/BasicObjects/frame.py
@@ -14,7 +14,7 @@
 #                  insertion_point_y: int = 4,
 #                  insertion_point_z: int = 3,
 #                  comment: str = '',
-#                  params: dict = None):
+#                  params: dict = None, model = Model):
 
 #        '''
 #        Args:

diff --git a/RFEM/BasicObjects/line.py b/RFEM/BasicObjects/line.py
@@ -6,7 +6,8 @@ def __init__(self,
                  no: int = 1,
                  nodes_no: str = '1 2',
                  comment: str = '',
-                 params: dict = None):
+                 params: dict = None,
+                 model = Model):
 
         '''
         Args:
@@ -17,7 +18,7 @@ def __init__(self,
         '''
 
         # Client model | Line
-        clientObject = Model.clientModel.factory.create('ns0:line')
+        clientObject = model.clientModel.factory.create('ns0:line')
 
         # Clears object atributes | Sets all atributes to None
         clearAtributes(clientObject)
@@ -37,14 +38,15 @@ def __init__(self,
                 clientObject[key] = params[key]
 
         # Add Line to client model
-        Model.clientModel.service.set_line(clientObject)
+        model.clientModel.service.set_line(clientObject)
 
     @staticmethod
     def Polyline(
                  no: int = 1,
                  nodes_no: str = '1 2',
                  comment: str = '',
-                 params: dict = None):
+                 params: dict = None,
+                 model = Model):
 
         '''
         Args:
@@ -55,7 +57,7 @@ def Polyline(
         '''
 
         # Client model | Line
-        clientObject = Model.clientModel.factory.create('ns0:line')
+        clientObject = model.clientModel.factory.create('ns0:line')
 
         # Clears object atributes | Sets all atributes to None
         clearAtributes(clientObject)
@@ -78,7 +80,7 @@ def Polyline(
                 clientObject[key] = params[key]
 
         # Add Line to client model
-        Model.clientModel.service.set_line(clientObject)
+        model.clientModel.service.set_line(clientObject)
 
     @staticmethod
     def Arc(
@@ -87,7 +89,8 @@ def Arc(
             control_point: list,
             alpha_adjustment_target = LineArcAlphaAdjustmentTarget.ALPHA_ADJUSTMENT_TARGET_BEGINNING_OF_ARC,
             comment: str = '',
-            params: dict = None):
+            params: dict = None,
+            model = Model):
 
         '''
         Args:
@@ -100,7 +103,7 @@ def Arc(
         '''
 
         # Client model | Line
-        clientObject = Model.clientModel.factory.create('ns0:line')
+        clientObject = model.clientModel.factory.create('ns0:line')
 
         # Clears object atributes | Sets all atributes to None
         clearAtributes(clientObject)
@@ -129,7 +132,7 @@ def Arc(
                 clientObject[key] = params[key]
 
         # Add Line to client model
-        Model.clientModel.service.set_line(clientObject)
+        model.clientModel.service.set_line(clientObject)
 
     @staticmethod
     def Circle(
@@ -138,7 +141,7 @@ def Circle(
                 circle_radius: float = 1.0,
                 point_of_normal_to_circle_plane: list = [1,0,0],
                 comment: str = '',
-                params: dict = None):
+                params: dict = None, model = Model):
 
         '''
         Args:
@@ -152,7 +155,7 @@ def Circle(
         '''
 
         # Client model | Line
-        clientObject = Model.clientModel.factory.create('ns0:line')
+        clientObject = model.clientModel.factory.create('ns0:line')
 
         # Clears object atributes | Sets all atributes to None
         clearAtributes(clientObject)
@@ -184,7 +187,7 @@ def Circle(
                 clientObject[key] = params[key]
 
         # Add Line to client model
-        Model.clientModel.service.set_line(clientObject)
+        model.clientModel.service.set_line(clientObject)
 
     @staticmethod
     def EllipticalArc(
@@ -195,7 +198,7 @@ def EllipticalArc(
                       arc_angle_alpha: float = 0,
                       arc_angle_beta: float = 3.141592653589793,
                       comment: str = '',
-                      params: dict = None):
+                      params: dict = None, model = Model):
 
         '''
         Args:
@@ -210,7 +213,7 @@ def EllipticalArc(
         '''
 
         # Client model | Line
-        clientObject = Model.clientModel.factory.create('ns0:line')
+        clientObject = model.clientModel.factory.create('ns0:line')
 
         # Clears object atributes | Sets all atributes to None
         clearAtributes(clientObject)
@@ -246,15 +249,15 @@ def EllipticalArc(
                 clientObject[key] = params[key]
 
         # Add Line to client model
-        Model.clientModel.service.set_line(clientObject)
+        model.clientModel.service.set_line(clientObject)
 
     @staticmethod
     def Ellipse(
                 no: int = 1,
                 nodes_no: list = [5,10],
                 ellipse_control_point: list = [18,-4.8,0],
                 comment: str = '',
-                params: dict = None):
+                params: dict = None, model = Model):
 
         '''
         Args:
@@ -266,7 +269,7 @@ def Ellipse(
         '''
 
         # Client model | Line
-        clientObject = Model.clientModel.factory.create('ns0:line')
+        clientObject = model.clientModel.factory.create('ns0:line')
 
         # Clears object atributes | Sets all atributes to None
         clearAtributes(clientObject)
@@ -296,7 +299,7 @@ def Ellipse(
                 clientObject[key] = params[key]
 
         # Add Line to client model
-        Model.clientModel.service.set_line(clientObject)
+        model.clientModel.service.set_line(clientObject)
 
     @staticmethod
     def Parabola(
@@ -305,7 +308,7 @@ def Parabola(
                  parabola_control_point: list = [10,-3,0],
                  parabola_alpha: float = 0,
                  comment: str = '',
-                 params: dict = None):
+                 params: dict = None, model = Model):
 
         '''
         Args:
@@ -318,7 +321,7 @@ def Parabola(
         '''
 
         # Client model | Line
-        clientObject = Model.clientModel.factory.create('ns0:line')
+        clientObject = model.clientModel.factory.create('ns0:line')
 
         # Clears object atributes | Sets all atributes to None
         clearAtributes(clientObject)
@@ -350,14 +353,14 @@ def Parabola(
                 clientObject[key] = params[key]
 
         # Add Line to client model
-        Model.clientModel.service.set_line(clientObject)
+        model.clientModel.service.set_line(clientObject)
 
     @staticmethod
     def Spline(
                no: int = 1,
                nodes_no: str = '1 3 5',
                comment: str = '',
-               params: dict = None):
+               params: dict = None, model = Model):
 
         '''
         Args:
@@ -368,7 +371,7 @@ def Spline(
         '''
 
         # Client model | Line
-        clientObject = Model.clientModel.factory.create('ns0:line')
+        clientObject = model.clientModel.factory.create('ns0:line')
 
         # Clears object atributes | Sets all atributes to None
         clearAtributes(clientObject)
@@ -391,7 +394,7 @@ def Spline(
                 clientObject[key] = params[key]
 
         # Add Line to client model
-        Model.clientModel.service.set_line(clientObject)
+        model.clientModel.service.set_line(clientObject)
 
     @staticmethod
     def NURBS(
@@ -401,7 +404,7 @@ def NURBS(
               weights: list = None,
               order: int = 0,
               comment: str = '',
-              params: dict = None):
+              params: dict = None, model = Model):
 
         '''
         Args:
@@ -415,7 +418,7 @@ def NURBS(
         '''
 
         # Client model | Line
-        clientObject = Model.clientModel.factory.create('ns0:line')
+        clientObject = model.clientModel.factory.create('ns0:line')
 
         # Clears object atributes | Sets all atributes to None
         clearAtributes(clientObject)
@@ -438,14 +441,14 @@ def NURBS(
             # TODO: bug 24721
             nurbs_control_points = []
             for i,j in enumerate(control_points):
-                point = Model.clientModel.factory.create('ns0:line_nurbs_control_points_by_components')
+                point = model.clientModel.factory.create('ns0:line_nurbs_control_points_by_components')
                 point.no = i+1
                 point.global_coordinate_x = control_points[i][0]
                 point.global_coordinate_y = control_points[i][1]
                 point.global_coordinate_z = control_points[i][2]
                 point.weight = 1 if not weights else weights[i]
                 nurbs_control_points.append(point)
-            clientObject.nurbs_control_points_by_components = Model.clientModel.factory.create('ns0:line_nurbs_control_points_by_components')
+            clientObject.nurbs_control_points_by_components = model.clientModel.factory.create('ns0:line_nurbs_control_points_by_components')
 
         # Comment
         clientObject.comment = comment
@@ -456,4 +459,4 @@ def NURBS(
                 clientObject[key] = params[key]
 
         # Add Line to client model
-        Model.clientModel.service.set_line(clientObject)
+        model.clientModel.service.set_line(clientObject)