BTLx_Flip_Beam

src/compas_timber/connections/__init__.py

@@ -9,6 +9,7 @@
 from .x_halflap import XHalfLapJoint
 from .t_halflap import THalfLapJoint
 from .l_halflap import LHalfLapJoint
+from .t_stirnversatz import TStirnversatzJoint
 from .solver import ConnectionSolver
 from .solver import JointTopology
 from .solver import find_neighboring_beams
@@ -25,6 +26,7 @@
     "LMiterJoint",
     "XHalfLapJoint",
     "THalfLapJoint",
+    "TStirnversatzJoint",
     "LHalfLapJoint",
     "NullJoint",
     "FrenchRidgeLapJoint",

src/compas_timber/connections/french_ridge_lap.py

@@ -38,10 +38,11 @@ class FrenchRidgeLapJoint(Joint):
 
     SUPPORTED_TOPOLOGY = JointTopology.TOPO_L
 
-    def __init__(self, beam_a=None, beam_b=None, **kwargs):
+    def __init__(self, beam_a=None, beam_b=None, drill_diameter=0.0, **kwargs):
         super(FrenchRidgeLapJoint, self).__init__(beams=(beam_a, beam_b), **kwargs)
         self.beam_a = beam_a
         self.beam_b = beam_b
+        self.drill_diameter = float(drill_diameter)
         self.beam_a_key = beam_a.key if beam_a else None
         self.beam_b_key = beam_b.key if beam_b else None
         self.reference_face_indices = {}
@@ -71,7 +72,7 @@ def cutting_plane_top(self):
 
     @property
     def cutting_plane_bottom(self):
-        _, cfr = self.get_face_most_towards_beam(self.beam_b, self.beam_b, ignore_ends=True)
+        _, cfr = self.get_face_most_towards_beam(self.beam_b, self.beam_a, ignore_ends=True)
         return cfr
 
     def restore_beams_from_keys(self, assemly):
@@ -80,15 +81,22 @@ def restore_beams_from_keys(self, assemly):
         self.beam_b = assemly.find_by_key(self.beam_b_key)
         self._beams = (self.beam_a, self.beam_b)
 
+    def add_extensions(self):
+        self.beam_a.add_blank_extension(*self.beam_a.extension_to_plane(self.cutting_plane_top), joint_key=self.key)
+        self.beam_b.add_blank_extension(*self.beam_b.extension_to_plane(self.cutting_plane_bottom), joint_key=self.key)
+
+    def add_features(self):
+        self.features = []
+
     def check_geometry(self):
         """
         This method checks whether the parts are aligned as necessary to create French Ridge Lap and determines which face is used as reference face for machining.
         """
         if not (self.beam_a and self.beam_b):
-            raise (BeamJoinningError("French Ridge Lap requires 2 beams"))
+            raise (BeamJoinningError(beams=self.beams, joint=self, debug_info="beams not set"))
 
         if not (self.beam_a.width == self.beam_b.width and self.beam_a.height == self.beam_b.height):
-            raise (BeamJoinningError("widths and heights for both beams must match for the French Ridge Lap"))
+            raise (BeamJoinningError(beams=self.beams, joint=self, debug_info="beams are not of same size"))
 
         normal = cross_vectors(self.beam_a.frame.xaxis, self.beam_b.frame.xaxis)
 
@@ -103,7 +111,13 @@ def check_geometry(self):
         elif angle_vectors(normal, -self.beam_a.frame.zaxis) < 0.001:
             indices.append(2)
         else:
-            raise (BeamJoinningError("part not aligned with corner normal, no French Ridge Lap possible"))
+            raise (
+                BeamJoinningError(
+                    beams=self.beams,
+                    joint=self,
+                    debug_info="part not aligned with corner normal, no French Ridge Lap possible",
+                )
+            )
 
         if abs(angle_vectors(normal, self.beam_b.frame.yaxis) - math.pi) < 0.001:
             indices.append(3)
@@ -114,5 +128,11 @@ def check_geometry(self):
         elif abs(angle_vectors(normal, -self.beam_b.frame.zaxis) - math.pi) < 0.001:
             indices.append(2)
         else:
-            raise (BeamJoinningError("part not aligned with corner normal, no French Ridge Lap possible"))
+            raise (
+                BeamJoinningError(
+                    beams=self.beams,
+                    joint=self,
+                    debug_info="part not aligned with corner normal, no French Ridge Lap possible",
+                )
+            )
         self.reference_face_indices = {str(self.beam_a.key): indices[0], str(self.beam_b.key): indices[1]}

src/compas_timber/connections/joint.py

@@ -76,6 +76,17 @@ def __data__(self):
     def beams(self):
         return self._beams
 
+    def add_extensions(self):
+        """Adds the features defined by this joint to affected beam(s).
+
+        Raises
+        ------
+        :class:`~compas_timber.connections.BeamJoinningError`
+            Should be raised whenever the joint was not able to calculate the features to be applied to the beams.
+
+        """
+        raise NotImplementedError
+
     def add_features(self):
         """Adds the features defined by this joint to affected beam(s).
 
@@ -134,7 +145,7 @@ def create(cls, assembly, *beams, **kwargs):
             raise ValueError("Expected at least 2 beams. Got instead: {}".format(len(beams)))
         joint = cls(*beams, **kwargs)
         assembly.add_joint(joint, beams)
-        joint.add_features()
+        joint.add_extensions()
         return joint
 
     @property
@@ -238,7 +249,6 @@ def _beam_side_incidence(beam_a, beam_b, ignore_ends=True):
             raise AssertionError("No intersection found")
 
         end, _ = beam_a.endpoint_closest_to_point(Point(*p1x))
-
         if end == "start":
             centerline_vec = beam_a.centerline.vector
         else:

src/compas_timber/connections/l_butt.py

@@ -1,5 +1,6 @@
 from compas_timber.parts import CutFeature
 from compas_timber.parts import MillVolume
+from compas_timber.parts import BrepSubtraction
 
 from .joint import BeamJoinningError
 from .solver import JointTopology
@@ -49,6 +50,7 @@ def __init__(
         main_beam=None,
         cross_beam=None,
         mill_depth=0,
+        birdsmouth=False,
         small_beam_butts=False,
         modify_cross=True,
         reject_i=False,
@@ -58,7 +60,7 @@ def __init__(
             if main_beam.width * main_beam.height > cross_beam.width * cross_beam.height:
                 main_beam, cross_beam = cross_beam, main_beam
 
-        super(LButtJoint, self).__init__(main_beam, cross_beam, mill_depth, **kwargs)
+        super(LButtJoint, self).__init__(main_beam, cross_beam, mill_depth, birdsmouth, **kwargs)
         self.modify_cross = modify_cross
         self.small_beam_butts = small_beam_butts
         self.reject_i = reject_i
@@ -88,6 +90,25 @@ def get_main_cutting_plane(self):
             )
         return super(LButtJoint, self).get_main_cutting_plane()
 
+    def add_extensions(self):
+        """Adds the required extensions to both beams.
+
+        This method is automatically called when joint is created by the call to `Joint.create()`.
+
+        """
+        assert self.main_beam and self.cross_beam
+        extension_tolerance = 0.01  # TODO: this should be proportional to the unit used
+        if self.birdsmouth:
+            extension_plane_main = self.get_face_most_towards_beam(self.main_beam, self.cross_beam, ignore_ends=True)[1]
+        else:
+            extension_plane_main = self.get_face_most_ortho_to_beam(self.main_beam, self.cross_beam, ignore_ends=True)[1]
+        start_main, end_main = self.main_beam.extension_to_plane(extension_plane_main)
+        self.main_beam.add_blank_extension(start_main + extension_tolerance, end_main + extension_tolerance, self.key)
+
+        extension_plane_cross = self.get_face_most_towards_beam(self.cross_beam, self.main_beam, ignore_ends=True)[1]
+        start_cross, end_cross = self.cross_beam.extension_to_plane(extension_plane_cross)
+        self.cross_beam.add_blank_extension(start_cross + extension_tolerance, end_cross + extension_tolerance, self.key)
+
     def add_features(self):
         """Adds the required extension and trimming features to both beams.
 
@@ -102,8 +123,7 @@ def add_features(self):
         try:
             main_cutting_plane = self.get_main_cutting_plane()[0]
             cross_cutting_plane = self.get_cross_cutting_plane()
-            start_main, end_main = self.main_beam.extension_to_plane(main_cutting_plane)
-            start_cross, end_cross = self.cross_beam.extension_to_plane(cross_cutting_plane)
+
         except BeamJoinningError as be:
             raise be
         except AttributeError as ae:
@@ -113,20 +133,26 @@ def add_features(self):
         except Exception as ex:
             raise BeamJoinningError(beams=self.beams, joint=self, debug_info=str(ex))
 
-        extension_tolerance = 0.01  # TODO: this should be proportional to the unit used
-
         if self.modify_cross:
-            self.cross_beam.add_blank_extension(
-                start_cross + extension_tolerance, end_cross + extension_tolerance, self.key
-            )
+
             f_cross = CutFeature(cross_cutting_plane)
             self.cross_beam.add_features(f_cross)
             self.features.append(f_cross)
 
-        self.main_beam.add_blank_extension(start_main + extension_tolerance, end_main + extension_tolerance, self.key)
-
-        f_main = CutFeature(main_cutting_plane)
         if self.mill_depth:
             self.cross_beam.add_features(MillVolume(self.subtraction_volume()))
-        self.main_beam.add_features(f_main)
-        self.features.append(f_main)
+            self.features.append(MillVolume(self.subtraction_volume()))
+
+        do_jack = False
+        if self.birdsmouth:
+            if self.calc_params_birdsmouth():
+                self.main_beam.add_features(BrepSubtraction(self.bm_sub_volume))
+                self.features.append(BrepSubtraction(self.bm_sub_volume))
+
+            else:
+                do_jack = True
+        if do_jack:
+            f_main = CutFeature(main_cutting_plane)
+            self.main_beam.add_features(f_main)
+            self.features.append(f_main)
+