Skip to content

Commit 6217dca

Browse files
committed
change assignment of defaults
1 parent 95ba763 commit 6217dca

File tree

3 files changed

+41
-22
lines changed

3 files changed

+41
-22
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1111

1212
### Changed
1313

14+
* Changed assignment of defaults in base scene object for Form Diagrams.
15+
* Changed assignment of defaults in base scene object for Force Diagrams.
16+
1417
### Removed
1518

1619

src/compas_tna/scene/forceobject.py

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,25 @@ class ForceDiagramObject(MeshObject):
1212
1313
"""
1414

15-
def __init__(self, *args, **kwargs):
16-
super(ForceDiagramObject, self).__init__(*args, **kwargs)
17-
18-
self.vertexcolor = Color.white()
19-
self.edgecolor = Color.black()
20-
self.facecolor = Color.from_rgb255(210, 210, 210)
21-
22-
self.show_vertices = True
23-
self.show_edges = True
24-
self.show_faces = False
25-
26-
self.vertexsize = 0.1
15+
def __init__(
16+
self,
17+
show_vertices=True,
18+
show_edges=True,
19+
show_faces=False,
20+
vertexcolor=Color.white(),
21+
edgecolor=Color.black(),
22+
facecolor=Color.from_rgb255(210, 210, 210),
23+
**kwargs,
24+
):
25+
super().__init__(
26+
show_vertices=show_vertices,
27+
show_edges=show_edges,
28+
show_faces=show_faces,
29+
vertexcolor=vertexcolor,
30+
edgecolor=edgecolor,
31+
facecolor=facecolor,
32+
**kwargs,
33+
)
2734

2835
@property
2936
def diagram(self):

src/compas_tna/scene/formobject.py

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,25 @@ class FormDiagramObject(MeshObject):
1212
1313
"""
1414

15-
def __init__(self, *args, **kwargs):
16-
super(FormDiagramObject, self).__init__(*args, **kwargs)
17-
18-
self.vertexcolor = Color.white()
19-
self.edgecolor = Color.black()
20-
self.facecolor = Color.from_rgb255(210, 210, 210)
21-
22-
self.vertexsize = 0.3
15+
def __init__(
16+
self,
17+
show_vertices=True,
18+
show_edges=True,
19+
show_faces=True,
20+
vertexcolor=Color.white(),
21+
edgecolor=Color.black(),
22+
facecolor=Color.from_rgb255(210, 210, 210),
23+
**kwargs,
24+
):
25+
super().__init__(
26+
show_vertices=show_vertices,
27+
show_edges=show_edges,
28+
show_faces=show_faces,
29+
vertexcolor=vertexcolor,
30+
edgecolor=edgecolor,
31+
facecolor=facecolor,
32+
**kwargs,
33+
)
2334

2435
self.vertexcolor_fixed = Color.blue()
2536
self.vertexcolor_support = Color.red()
@@ -42,8 +53,6 @@ def __init__(self, *args, **kwargs):
4253
self.tol_force = 1e-3
4354
self.tol_selfweight = 1e-3
4455

45-
self.show_vertices = True
46-
self.show_edges = True
4756
self.show_selfweight = False
4857
self.show_loads = False
4958
self.show_reactions = False

0 commit comments

Comments
 (0)