Merge pull request #475 from gramaziokohler/graph_node

graph node missing workaround

Author: chenkasirer

CHANGELOG.md

@@ -57,6 +57,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Fixed bug in show_ref_faces GH component.
 * `BTLxProcessing.ref_side_index` defaults to `0` if not set, instead of the invalid `None`.
 * Fixed several GH Components for Rhino8 compatibility.
+* Fixed `graph_node` is `None` after deserializing a `TimberModel`.
 
 ### Removed
 

src/compas_timber/model/model.py

@@ -49,6 +49,13 @@ class TimberModel(Model):
     @classmethod
     def __from_data__(cls, data):
         model = super(TimberModel, cls).__from_data__(data)
+
+        # TODO: this is a workaround to ensure that the graph nodes are not lost during deserialization
+        # TODO: this was fixed in later compas_model release, remove after migrating
+        for graphnode in model._graph.nodes():
+            element = model._graph.node_element(graphnode)  # type: ignore
+            element.graph_node = graphnode  # type: ignore
+
         for interaction in model.interactions():
             interaction.restore_beams_from_keys(model)  # type: ignore
         return model

tests/compas_timber/test_model.py

@@ -1,3 +1,4 @@
+from copy import deepcopy
 from compas.data import json_dumps
 from compas.data import json_loads
 from compas.geometry import Frame
@@ -255,7 +256,6 @@ def test_error_deepcopy_fastener():
 
 
 def test_error_deepcopy_joint():
-    from copy import deepcopy
     from compas_timber.errors import BeamJoiningError
 
     error = BeamJoiningError("mama", "papa", "dog", "cucumber")
@@ -266,3 +266,29 @@ def test_error_deepcopy_joint():
     assert error.joint == "papa"
     assert error.debug_info == "dog"
     assert error.debug_geometries == "cucumber"
+
+
+def test_beam_graph_node_available_after_serialization():
+    model = TimberModel()
+    frame = Frame(Point(0, 0, 0), Vector(1, 0, 0), Vector(0, 1, 0))
+    beam = Beam(frame, length=1.0, width=0.1, height=0.1)
+    model.add_element(beam)
+
+    graph_node = beam.graph_node
+    deserialized_model = json_loads(json_dumps(model))
+
+    assert graph_node is not None
+    assert list(deserialized_model.beams)[0].graph_node == graph_node
+
+
+def test_beam_graph_node_available_after_deepcopying():
+    model = TimberModel()
+    frame = Frame(Point(0, 0, 0), Vector(1, 0, 0), Vector(0, 1, 0))
+    beam = Beam(frame, length=1.0, width=0.1, height=0.1)
+    model.add_element(beam)
+
+    grap_node = beam.graph_node
+    deserialized_model = deepcopy(model)
+
+    assert grap_node is not None
+    assert list(deserialized_model.beams)[0].graph_node == grap_node