Skip to content

Static Analysis Settings #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Dec 1, 2021
Merged

Static Analysis Settings #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
80ed4a9
Update staticAnalysisSettings.py
CarineKhalil22 Nov 11, 2021
8781969
Update staticAnalysisSettings.py
CarineKhalil22 Nov 11, 2021
6c5d4b3
First bunch of fixed code
jarabroz Nov 11, 2021
307d7a4
Merge branch 'CarineKhalil-StaticAnalysisSettings' of https://github.…
jarabroz Nov 11, 2021
6b603bf
Fixed issues in staticAnalysisSettings
jarabroz Nov 12, 2021
a1fba6d
Merge branch 'main' into CarineKhalil-StaticAnalysisSettings
jarabroz Dec 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
"python.testing.pytestArgs": [
"--html=UnitTests\\report.html",
"--self-contained-html",
"--cov=RFEM",
],
"markdownlint.config": {
"MD028": false,
Expand Down
248 changes: 124 additions & 124 deletions RFEM/BasicObjects/bracing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,170 +1,170 @@
from RFEM.initModel import *
from RFEM.enums import BracingType
# from RFEM.initModel import *
# from RFEM.enums import BracingType

class Bracing():
def __init__(self,
no: int = 1,
member_type = BracingType.TYPE_HORIZONTAL,
start_node_no: int = 1,
end_node_no: int = 2,
rotation_angle: float = 0.0,
start_section_no: int = 1,
end_section_no: int = 1,
comment: str = '',
params: dict = {}):
# class Bracing():
# def __init__(self,
# no: int = 1,
# member_type = BracingType.TYPE_HORIZONTAL,
# start_node_no: int = 1,
# end_node_no: int = 2,
# rotation_angle: float = 0.0,
# start_section_no: int = 1,
# end_section_no: int = 1,
# comment: str = '',
# params: dict = {}):

# Client model | Bracing
clientObject = clientModel.factory.create('ns0:bracing')
# # Client model | Bracing
# clientObject = clientModel.factory.create('ns0:bracing')

# Clears object atributes | Sets all atributes to None
clearAtributes(clientObject)
# # Clears object atributes | Sets all atributes to None
# clearAtributes(clientObject)

# Bracing No.
clientObject.no = no
# # Bracing No.
# clientObject.no = no

# Bracing Type
clientObject.type = bracing_type.name
# # Bracing Type
# clientObject.type = bracing_type.name

# Start Node No.
clientObject.node_start = start_node_no
# # Start Node No.
# clientObject.node_start = start_node_no

# End Node No.
clientObject.node_end = end_node_no
# # End Node No.
# clientObject.node_end = end_node_no

# Bracing Rotation Angle beta
clientObject.rotation_angle = rotation_angle
# # Bracing Rotation Angle beta
# clientObject.rotation_angle = rotation_angle

# Start Section No.
clientObject.section_start = start_section_no
# # Start Section No.
# clientObject.section_start = start_section_no

# End Section No.
clientObject.section_end = end_section_no
# # End Section No.
# clientObject.section_end = end_section_no

# Start Bracing Hinge No.
clientObject.bracing_hinge_start = start_bracing_hinge_no
# # Start Bracing Hinge No.
# clientObject.bracing_hinge_start = start_bracing_hinge_no

# End Bracing Hinge No.
clientObject.bracing_hinge_end = end_bracing_hinge_no
# # End Bracing Hinge No.
# clientObject.bracing_hinge_end = end_bracing_hinge_no

# Comment
clientObject.comment = comment
# # Comment
# clientObject.comment = comment

# Adding optional parameters via dictionary
for key in params:
clientObject[key] = params[key]
# # Adding optional parameters via dictionary
# for key in params:
# clientObject[key] = params[key]

# Add Member to client model
clientModel.service.set_bracing(clientObject)
# # Add Member to client model
# clientModel.service.set_bracing(clientObject)

def Horizontal(self,
no: int = 1,
bracing_type = BracingType.TYPE_HORIZONTAL,
start_node_no: int = 1,
end_node_no: int = 2,
rotation_angle: float = 0.0,
start_section_no: int = 1,
end_section_no: int = 1,
start_bracing_hinge_no: int = 0,
end_bracing_hinge_no: int = 0,
comment: str = '',
params: dict = {}):
# def Horizontal(self,
# no: int = 1,
# bracing_type = BracingType.TYPE_HORIZONTAL,
# start_node_no: int = 1,
# end_node_no: int = 2,
# rotation_angle: float = 0.0,
# start_section_no: int = 1,
# end_section_no: int = 1,
# start_bracing_hinge_no: int = 0,
# end_bracing_hinge_no: int = 0,
# comment: str = '',
# params: dict = {}):

# Client model | Bracing
clientObject = clientModel.factory.create('ns0:bracing')
# # Client model | Bracing
# clientObject = clientModel.factory.create('ns0:bracing')

# Clears object atributes | Sets all atributes to None
clearAtributes(clientObject)
# # Clears object atributes | Sets all atributes to None
# clearAtributes(clientObject)

# Bracing No.
clientObject.no = no
# # Bracing No.
# clientObject.no = no

# Bracing Type
clientObject.type = bracing_type.name
# # Bracing Type
# clientObject.type = bracing_type.name

# Start Node No.
clientObject.node_start = start_node_no
# # Start Node No.
# clientObject.node_start = start_node_no

# End Node No.
clientObject.node_end = end_node_no
# # End Node No.
# clientObject.node_end = end_node_no

# Bracing Rotation Angle beta
clientObject.rotation_angle = rotation_angle
# # Bracing Rotation Angle beta
# clientObject.rotation_angle = rotation_angle

# Start Section No.
clientObject.section_start = start_section_no
# # Start Section No.
# clientObject.section_start = start_section_no

# End Section No.
clientObject.section_end = end_section_no
# # End Section No.
# clientObject.section_end = end_section_no

# Start Bracing Hinge No.
clientObject.bracing_hinge_start = start_bracing_hinge_no
# # Start Bracing Hinge No.
# clientObject.bracing_hinge_start = start_bracing_hinge_no

# End Bracing Hinge No.
clientObject.bracing_hinge_end = end_bracing_hinge_no
# # End Bracing Hinge No.
# clientObject.bracing_hinge_end = end_bracing_hinge_no

# Comment
clientObject.comment = comment
# # Comment
# clientObject.comment = comment

# Adding optional parameters via dictionary
for key in params:
clientObject[key] = params[key]
# # Adding optional parameters via dictionary
# for key in params:
# clientObject[key] = params[key]

# Add Bracing to client model
clientModel.service.set_bracing(clientObject)
# # Add Bracing to client model
# clientModel.service.set_bracing(clientObject)

def Vertical(self,
no: int = 1,
bracing_type = BracingType.TYPE_VERTICAL,
start_node_no: int = 1,
end_node_no: int = 2,
rotation_angle: float = 0.0,
start_section_no: int = 1,
end_section_no: int = 1,
start_bracing_hinge_no: int = 0,
end_bracing_hinge_no: int = 0,
comment: str = '',
params: dict = {}):
# def Vertical(self,
# no: int = 1,
# bracing_type = BracingType.TYPE_VERTICAL,
# start_node_no: int = 1,
# end_node_no: int = 2,
# rotation_angle: float = 0.0,
# start_section_no: int = 1,
# end_section_no: int = 1,
# start_bracing_hinge_no: int = 0,
# end_bracing_hinge_no: int = 0,
# comment: str = '',
# params: dict = {}):

# Client model | Bracing
clientObject = clientModel.factory.create('ns0:bracing')
# # Client model | Bracing
# clientObject = clientModel.factory.create('ns0:bracing')

# Clears object atributes | Sets all atributes to None
clearAtributes(clientObject)
# # Clears object atributes | Sets all atributes to None
# clearAtributes(clientObject)

# Bracing No.
clientObject.no = no
# # Bracing No.
# clientObject.no = no

# Bracing Type
clientObject.type = bracing_type.name
# # Bracing Type
# clientObject.type = bracing_type.name

# Start Node No.
clientObject.node_start = start_node_no
# # Start Node No.
# clientObject.node_start = start_node_no

# End Node No.
clientObject.node_end = end_node_no
# # End Node No.
# clientObject.node_end = end_node_no

# Bracing Rotation Angle beta
clientObject.rotation_angle = rotation_angle
# # Bracing Rotation Angle beta
# clientObject.rotation_angle = rotation_angle

# Start Section No.
clientObject.section_start = start_section_no
# # Start Section No.
# clientObject.section_start = start_section_no

# End Section No.
clientObject.section_end = end_section_no
# # End Section No.
# clientObject.section_end = end_section_no

# Start Bracing Hinge No.
clientObject.bracing_hinge_start = start_bracing_hinge_no
# # Start Bracing Hinge No.
# clientObject.bracing_hinge_start = start_bracing_hinge_no

# End Bracing Hinge No.
clientObject.bracing_hinge_end = end_bracing_hinge_no
# # End Bracing Hinge No.
# clientObject.bracing_hinge_end = end_bracing_hinge_no

# Comment
clientObject.comment = comment
# # Comment
# clientObject.comment = comment

# Adding optional parameters via dictionary
for key in params:
clientObject[key] = params[key]
# # Adding optional parameters via dictionary
# for key in params:
# clientObject[key] = params[key]

# Add Bracing to client model
clientModel.service.set_bracing(clientObject)
# # Add Bracing to client model
# clientModel.service.set_bracing(clientObject)

Loading