fully implement step and notch

gramaziokohler · Aug 9, 2024 · f8a0c4c · f8a0c4c
1 parent a16d852
commit f8a0c4c
Show file tree

Hide file tree

Showing 3 changed files with 702 additions and 987 deletions.
diff --git a/src/compas_timber/_fabrication/step_joint.py b/src/compas_timber/_fabrication/step_joint.py
@@ -1,13 +1,13 @@
 import math
 
+from compas.geometry import Box
+from compas.geometry import Brep
 from compas.geometry import Frame
 from compas.geometry import Line
 from compas.geometry import Plane
+from compas.geometry import Polyline
 from compas.geometry import Rotation
 from compas.geometry import Vector
-from compas.geometry import Box
-from compas.geometry import Brep
-from compas.geometry import Polyline
 from compas.geometry import angle_vectors_signed
 from compas.geometry import distance_point_point
 from compas.geometry import intersection_line_plane
@@ -428,6 +428,16 @@ def apply(self, beam):
                 raise FeatureApplicationError(
                     cutting_planes[0], tenon_volume, "Failed to trim tenon volume with cutting plane: {}".format(str(e))
                 )
+            # trim tenon volume with second cutting plane if tenon height is greater than step depth
+            if self.tenon_height > self.step_depth:
+                try:
+                    tenon_volume.trim(cutting_planes[1])
+                except Exception as e:
+                    raise FeatureApplicationError(
+                        cutting_planes[1],
+                        tenon_volume,
+                        "Failed to trim tenon volume with second cutting plane: {}".format(str(e)),
+                    )
             # add tenon volume to geometry
             try:
                 geometry += tenon_volume
@@ -646,8 +656,13 @@ def tenon_volume_from_params_and_beam(self, beam):
 
         # convert to Brep and trim with ref_side and opp_side
         tenon_brep = Brep.from_box(tenon_box)
-        tenon_brep.trim(ref_side.to_plane())
-        tenon_brep.trim(opp_side.to_plane())
+        try:
+            tenon_brep.trim(ref_side.to_plane())
+            tenon_brep.trim(opp_side.to_plane())
+        except Exception as e:
+            raise FeatureApplicationError(
+                None, tenon_brep, "Failed to trim tenon volume with cutting planes: {}".format(str(e))
+            )
         return tenon_brep