Skip to content

Commit 908bbfc

Browse files
author
MichalO
committed
GetAllObjects
1 parent 0d3e302 commit 908bbfc

2 files changed

Lines changed: 55 additions & 4 deletions

File tree

RFEM/Tools/GetObjectNumbersByType.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,11 @@ def __new__(cls,
8181
[ObjectTypes.E_OBJECT_TYPE_SURFACES_CONTACT, lambda i: model.clientModel.service.get_surfaces_contact(i), 'from RFEM.SpecialObjects.surfaceContact import SurfaceContact\n', 'SurfaceContact'],
8282
[ObjectTypes.E_OBJECT_TYPE_RIGID_LINK, lambda i: model.clientModel.service.get_rigid_link(i), 'from RFEM.SpecialObjects.rigidLink import RigidLink\n', 'RigidLink'],
8383
[ObjectTypes.E_OBJECT_TYPE_RESULT_SECTION, lambda i: model.clientModel.service.get_result_section(i), 'from RFEM.SpecialObjects.resultSection import ResultSection\n', 'ResultSection'],
84-
# nodal_release
84+
[ObjectTypes.E_OBJECT_TYPE_NODAL_RELEASE, lambda i: model.clientModel.service.get_nodal_release(i), 'from RFEM.SpecialObjects.nodalRelease import NodalRelease\n', 'NodalRelease'],
8585
[ObjectTypes.E_OBJECT_TYPE_LINE_RELEASE, lambda i: model.clientModel.service.get_line_release(i), 'from RFEM.SpecialObjects.lineRelease import LineRelease\n', 'LineRelease'],
86-
# surface_release
86+
[ObjectTypes.E_OBJECT_TYPE_SURFACE_RELEASE, lambda i: model.clientModel.service.get_surface_release(i), 'from RFEM.SpecialObjects.surfaceRelease import SurfaceRelease\n', 'SurfaceRelease'],
8787
# blocks
88-
# boreholes
88+
[ObjectTypes.E_OBJECT_TYPE_BOREHOLE, lambda i: model.clientModel.service.get_borehole(i), 'from RFEM.SpecialObjects.borehole import Borehole\n', 'Borehole'],
8989
# soil_massif
9090

9191
[ObjectTypes.E_OBJECT_TYPE_NODAL_SUPPORT, lambda i: model.clientModel.service.get_nodal_support(i), 'from RFEM.TypesForNodes.nodalSupport import NodalSupport\n', 'NodalSupport'],
@@ -121,7 +121,7 @@ def __new__(cls,
121121
[ObjectTypes.E_OBJECT_TYPE_SURFACES_CONTACT, lambda i: model.clientModel.service.get_surfaces_contact(i), 'from RFEM.SpecialObjects.surfaceContact import SurfaceContact\n', 'SurfaceContact'],
122122

123123
# nodal_release_type
124-
[ObjectTypes.E_OBJECT_TYPE_LINE_RELEASE_TYPE, lambda i: model.clientModel.service.get_line_release_type(i), 'from RFEM.SpecialObjects.lineReleaseType import LineReleaseType\n', 'LineReleaseType'],
124+
# line_release_type
125125
# surface_release_ty
126126
[ObjectTypes.E_OBJECT_TYPE_CONCRETE_EFFECTIVE_LENGTHS, lambda i: model.clientModel.service.get_concrete_effective_lengths(i), 'from RFEM.TypesforConcreteDesign.ConcreteEffectiveLength import ConcreteEffectiveLength\n', 'ConcreteEffectiveLength'],
127127
[ObjectTypes.E_OBJECT_TYPE_CONCRETE_DURABILITY, lambda i: model.clientModel.service.get_concrete_durability(i), 'from RFEM.TypesforConcreteDesign.ConcreteDurability import ConcreteDurability\n', 'ConcreteDurability'],

UnitTests/test_note.py

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
import os
2+
import sys
3+
PROJECT_ROOT = os.path.abspath(os.path.join(
4+
os.path.dirname(__file__),
5+
os.pardir)
6+
)
7+
sys.path.append(PROJECT_ROOT)
8+
9+
from RFEM.enums import NoteType, NoteOffsetType, NoteMemberReferenceType
10+
from RFEM.initModel import Model
11+
from RFEM.BasicObjects.material import Material
12+
from RFEM.BasicObjects.section import Section
13+
from RFEM.BasicObjects.node import Node
14+
from RFEM.BasicObjects.member import Member
15+
from RFEM.GuideObjects.note import Note
16+
17+
if Model.clientModel is None:
18+
Model()
19+
20+
def test_note():
21+
22+
Model.clientModel.service.delete_all()
23+
Model.clientModel.service.begin_modification()
24+
25+
Material()
26+
Section()
27+
Node(1, 0, 0, 0)
28+
Node(2, 10, 0, 0)
29+
Node(3, 10, 10, 0)
30+
Node(4, 0, 10, 0)
31+
32+
Member(1, 1, 2)
33+
34+
Note(1, 'Point 1', NoteType.NOTE_TYPE_POINT, [5, 0, -5], None, 0, 0)
35+
Note(2, 'Node 2', NoteType.NOTE_TYPE_NODE, 2, [NoteOffsetType.OFFSET_TYPE_XYZ, 3, -2, -3], 0.1, 1, 'Node', True)
36+
Note(4, 'Member 1', NoteType.NOTE_TYPE_MEMBER, [1, NoteMemberReferenceType.REFERENCE_TYPE_XY, False, 7], [NoteOffsetType.OFFSET_TYPE_XZ, -2, -2], 0, 3)
37+
38+
Model.clientModel.service.finish_modification()
39+
40+
note1 = Model.clientModel.service.get_note(1)
41+
assert note1.type == 'NOTE_TYPE_POINT'
42+
assert note1.offset == False
43+
44+
note2 = Model.clientModel.service.get_note(2)
45+
assert note2.node == 2
46+
assert note2.offset_type == 'OFFSET_TYPE_XYZ'
47+
assert note2.name == 'Node'
48+
49+
note4 = Model.clientModel.service.get_note(4)
50+
assert note4.member == 1
51+
assert note4.member_distance_absolute == 7

0 commit comments

Comments
 (0)