X/T/L HalfLap rework & Lap Volume viz adjustment

CHANGELOG.md

@@ -69,6 +69,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Changed `DirectJointRule` to allow for more than 2 elements per joint.
 * Changed `beam` objects get added to `Joint.elements` in `Joint.create()`.
 * Fixed bug in vizualization of tenon/mortise in `compas_timber._fabrication.StepJoint`and `compas_timber._fabrication.StepJointNotch`.
+* Changed `compas_timber._fabrication.Lap` so that the volume is generated fully from the relevant BTLx params.
+* Changed `THalfLapJoint`, `LHalfLapJoint`, `XHalfLapJoint` from `compas_timber.connections` so that they use the Lap process.
 
 ### Removed
 

src/compas_timber/_fabrication/btlx_process.py

@@ -165,20 +165,33 @@ class MachiningLimits(object):
         Limit the front face.
     face_limited_back : bool
         Limit the back face.
+    face_limited_top : bool
+        Limit the top face.
+    face_limited_bottom : bool
+        Limit the bottom face.
 
     Properties
     ----------
     limits : dict
         The limits dictionary with values as a boolean.
     """
 
-    EXPECTED_KEYS = ["FaceLimitedStart", "FaceLimitedEnd", "FaceLimitedFront", "FaceLimitedBack"]
+    EXPECTED_KEYS = [
+        "FaceLimitedStart",
+        "FaceLimitedEnd",
+        "FaceLimitedFront",
+        "FaceLimitedBack",
+        "FaceLimitedTop",
+        "FaceLimitedBottom",
+    ]
 
     def __init__(self):
         self.face_limited_start = True
         self.face_limited_end = True
         self.face_limited_front = True
         self.face_limited_back = True
+        self.face_limited_top = True
+        self.face_limited_bottom = True
 
     @property
     def limits(self):
@@ -188,4 +201,6 @@ def limits(self):
             "FaceLimitedEnd": self.face_limited_end,
             "FaceLimitedFront": self.face_limited_front,
             "FaceLimitedBack": self.face_limited_back,
+            "FaceLimitedTop": self.face_limited_top,
+            "FaceLimitedBottom": self.face_limited_bottom,
         }

src/compas_timber/connections/l_butt.py

@@ -193,7 +193,12 @@ def add_features(self):
             cross_cutting_plane = self.main_beam.ref_sides[self.main_beam_ref_side_index]
             lap_width = self.main_beam.height if self.main_beam_ref_side_index % 2 == 0 else self.main_beam.width
             cross_feature = Lap.from_plane_and_beam(
-                cross_cutting_plane, self.cross_beam, lap_width, self.mill_depth, self.cross_beam_ref_side_index
+                cross_cutting_plane,
+                self.cross_beam,
+                lap_width,
+                self.mill_depth,
+                is_pocket=True,
+                ref_side_index=self.cross_beam_ref_side_index,
             )
             self.cross_beam.add_features(cross_feature)
             self.features.append(cross_feature)

src/compas_timber/connections/l_halflap.py

@@ -1,14 +1,16 @@
-from compas.geometry import Frame
+from compas.tolerance import TOL
 
-from compas_timber.elements import CutFeature
-from compas_timber.elements import MillVolume
+from compas_timber._fabrication import JackRafterCut
+from compas_timber._fabrication import Lap
+from compas_timber.connections.utilities import beam_ref_side_incidence
+from compas_timber.connections.utilities import beam_ref_side_incidence_with_vector
 
 from .joint import BeamJoinningError
-from .lap_joint import LapJoint
+from .joint import Joint
 from .solver import JointTopology
 
 
-class LHalfLapJoint(LapJoint):
+class LHalfLapJoint(Joint):
     """Represents a L-Lap type joint which joins the ends of two beams,
     trimming the main beam.
 
@@ -18,10 +20,10 @@ class LHalfLapJoint(LapJoint):
 
     Parameters
     ----------
-    main_beam : :class:`~compas_timber.parts.Beam`
-        The main beam to be joined.
-    cross_beam : :class:`~compas_timber.parts.Beam`
-        The cross beam to be joined.
+    beam_a : :class:`~compas_timber.parts.Beam`
+        The first beam to be joined.
+    beam_b : :class:`~compas_timber.parts.Beam`
+        The second beam to be joined.
     flip_lap_side : bool
         If True, the lap is flipped to the other side of the beams.
     cut_plane_bias : float
@@ -31,25 +33,71 @@ class LHalfLapJoint(LapJoint):
     ----------
     beams : list(:class:`~compas_timber.parts.Beam`)
         The beams joined by this joint.
-    main_beam : :class:`~compas_timber.parts.Beam`
-        The main beam to be joined.
-    cross_beam : :class:`~compas_timber.parts.Beam`
-        The cross beam to be joined.
-    main_beam_key : str
-        The key of the main beam.
-    cross_beam_key : str
-        The key of the cross beam.
-    features : list(:class:`~compas_timber.parts.Feature`)
-        The features created by this joint.
-    joint_type : str
-        A string representation of this joint's type.
-
+    beam_a : :class:`~compas_timber.parts.Beam`
+        The first beam to be joined.
+    beam_b : :class:`~compas_timber.parts.Beam`
+        The second beam to be joined.
+    flip_lap_side : bool
+        If True, the lap is flipped to the other side of the beams.
+    cut_plane_bias : float
+        Allows lap to be shifted deeper into one beam or the other. Value should be between 0 and 1.0 without completely cutting through either beam. Default is 0.5.
     """
 
     SUPPORTED_TOPOLOGY = JointTopology.TOPO_L
 
-    def __init__(self, main_beam=None, cross_beam=None, flip_lap_side=False, cut_plane_bias=0.5, **kwargs):
-        super(LHalfLapJoint, self).__init__(main_beam, cross_beam, flip_lap_side, cut_plane_bias, **kwargs)
+    @property
+    def __data__(self):
+        data = super(LHalfLapJoint, self).__data__
+        data["beam_a"] = self.beam_a_guid
+        data["beam_b"] = self.beam_b_guid
+        data["flip_lap_side"] = self.flip_lap_side
+        data["cut_plane_bias"] = self.cut_plane_bias
+        return data
+
+    def __init__(self, beam_a=None, beam_b=None, flip_lap_side=None, cut_plane_bias=None, **kwargs):
+        super(LHalfLapJoint, self).__init__(**kwargs)
+        self.beam_a = beam_a
+        self.beam_b = beam_b
+        self.beam_a_guid = kwargs.get("beam_a_guid", None) or str(beam_a.guid)
+        self.beam_b_guid = kwargs.get("beam_b_guid", None) or str(beam_b.guid)
+
+        self.flip_lap_side = flip_lap_side
+        self.cut_plane_bias = 0.5 if cut_plane_bias is None else cut_plane_bias
+        self.features = []
+
+    @property
+    def elements(self):
+        return [self.beam_a, self.beam_b]
+
+    @property
+    def beam_a_ref_side_index(self):
+        cross_vector = self.beam_a.centerline.direction.cross(self.beam_b.centerline.direction)
+        ref_side_dict = beam_ref_side_incidence_with_vector(self.beam_a, cross_vector, ignore_ends=True)
+        if self.flip_lap_side:
+            return max(ref_side_dict, key=ref_side_dict.get)
+        return min(ref_side_dict, key=ref_side_dict.get)
+
+    @property
+    def beam_b_ref_side_index(self):
+        cross_vector = self.beam_a.centerline.direction.cross(self.beam_b.centerline.direction)
+        ref_side_dict = beam_ref_side_incidence_with_vector(self.beam_b, cross_vector, ignore_ends=True)
+        if self.flip_lap_side:
+            return min(ref_side_dict, key=ref_side_dict.get)
+        return max(ref_side_dict, key=ref_side_dict.get)
+
+    @property
+    def cutting_plane_a(self):
+        # the plane that cuts beam_a as a planar surface
+        ref_side_dict = beam_ref_side_incidence(self.beam_a, self.beam_b, ignore_ends=True)
+        ref_side_index = max(ref_side_dict, key=ref_side_dict.get)
+        return self.beam_b.side_as_surface(ref_side_index)
+
+    @property
+    def cutting_plane_b(self):
+        # the plane that cuts beam_b as a planar surface
+        ref_side_dict = beam_ref_side_incidence(self.beam_b, self.beam_a, ignore_ends=True)
+        ref_side_index = max(ref_side_dict, key=ref_side_dict.get)
+        return self.beam_a.side_as_surface(ref_side_index)
 
     def add_extensions(self):
         """Calculates and adds the necessary extensions to the beams.
@@ -62,43 +110,100 @@ def add_extensions(self):
             If the extension could not be calculated.
 
         """
-        assert self.main_beam and self.cross_beam
+        assert self.beam_a and self.beam_b
+        start_a, start_b = None, None
         try:
-            main_cutting_frame = self.get_main_cutting_frame()
-            cross_cutting_frame = self.get_cross_cutting_frame()
+            start_a, end_a = self.beam_a.extension_to_plane(self.cutting_plane_a.to_plane())
+            start_b, end_b = self.beam_b.extension_to_plane(self.cutting_plane_b.to_plane())
+        except AttributeError as ae:
+            # I want here just the plane that caused the error
+            geometries = [self.cutting_plane_b] if start_a is not None else [self.cutting_plane_a]
+            raise BeamJoinningError(self.elements, self, debug_info=str(ae), debug_geometries=geometries)
         except Exception as ex:
-            raise BeamJoinningError(beams=self.elements, joint=self, debug_info=str(ex))
-
-        start_main, end_main = self.main_beam.extension_to_plane(main_cutting_frame)
-        start_cross, end_cross = self.cross_beam.extension_to_plane(cross_cutting_frame)
-
-        extension_tolerance = 0.01  # TODO: this should be proportional to the unit used
-        self.main_beam.add_blank_extension(start_main + extension_tolerance, end_main + extension_tolerance, self.guid)
-        self.cross_beam.add_blank_extension(
-            start_cross + extension_tolerance, end_cross + extension_tolerance, self.guid
-        )
+            raise BeamJoinningError(self.elements, self, debug_info=str(ex))
+        self.beam_a.add_blank_extension(start_a, end_a, self.beam_a_guid)
+        self.beam_b.add_blank_extension(start_b, end_b, self.beam_b_guid)
 
     def add_features(self):
-        assert self.main_beam and self.cross_beam
-
-        try:
-            main_cutting_frame = self.get_main_cutting_frame()
-            cross_cutting_frame = self.get_cross_cutting_frame()
-            negative_brep_main_beam, negative_brep_cross_beam = self._create_negative_volumes()
-        except Exception as ex:
-            raise BeamJoinningError(beams=self.elements, joint=self, debug_info=str(ex))
+        """Adds the required joint features to both beams.
 
-        main_volume = MillVolume(negative_brep_main_beam)
-        cross_volume = MillVolume(negative_brep_cross_beam)
+        This method is automatically called when joint is created by the call to `Joint.create()`.
 
-        self.main_beam.add_features(main_volume)
-        self.cross_beam.add_features(cross_volume)
+        """
+        assert self.beam_a and self.beam_b
+
+        if self.features:
+            self.beam_a.remove_features(self.features)
+            self.beam_b.remove_features(self.features)
+
+        # calculate the lap length and depth for each beam
+        beam_a_lap_length, beam_b_lap_length = self._get_lap_lengths()
+        beam_a_lap_depth, beam_b_lap_depth = self._get_lap_depths()
+
+        ## beam_a
+        # lap feature on beam_a
+        lap_feature_a = Lap.from_plane_and_beam(
+            self.cutting_plane_a.to_plane(),
+            self.beam_a,
+            beam_a_lap_length,
+            beam_a_lap_depth,
+            ref_side_index=self.beam_a_ref_side_index,
+        )
+        # cutoff feature for beam_a
+        cutoff_feature_a = JackRafterCut.from_plane_and_beam(
+            self.cutting_plane_a.to_plane(), self.beam_a, self.beam_a_ref_side_index
+        )
+        beam_a_features = [lap_feature_a, cutoff_feature_a]
+        self.beam_a.add_features(beam_a_features)
+        self.features.extend(beam_a_features)
+
+        ## beam_b
+        # lap feature on beam_b
+        lap_feature_b = Lap.from_plane_and_beam(
+            self.cutting_plane_b.to_plane(),
+            self.beam_b,
+            beam_b_lap_length,
+            beam_b_lap_depth,
+            ref_side_index=self.beam_b_ref_side_index,
+        )
+        # cutoff feature for beam_b
+        cutoff_feature_b = JackRafterCut.from_plane_and_beam(
+            self.cutting_plane_b.to_plane(), self.beam_b, self.beam_b_ref_side_index
+        )
+        beam_b_features = [lap_feature_b, cutoff_feature_b]
+        self.beam_b.add_features(beam_b_features)
+        self.features.extend(beam_b_features)
 
-        f_cross = CutFeature(cross_cutting_frame)
-        self.cross_beam.add_features(f_cross)
+    def restore_beams_from_keys(self, model):
+        """After de-serialization, restores references to the main and cross beams saved in the model."""
+        self.beam_a = model.element_by_guid(self.beam_a_guid)
+        self.beam_b = model.element_by_guid(self.beam_b_guid)
 
-        trim_frame = Frame(main_cutting_frame.point, main_cutting_frame.xaxis, -main_cutting_frame.yaxis)
-        f_main = CutFeature(trim_frame)
-        self.main_beam.add_features(f_main)
+    def check_elements_compatibility(self):
+        """Checks if the elements are compatible for the creation of the joint.
 
-        self.features = [main_volume, cross_volume, f_main, f_cross]
+        Raises
+        ------
+        BeamJoinningError
+            If the elements are not compatible for the creation of the joint.
+        """
+        # check if the beams are aligned
+        for beam in self.elements:
+            cross_vector = self.beam_a.centerline.direction.cross(self.beam_b.centerline.direction)
+            beam_normal = beam.frame.normal.unitized()
+            dot = abs(beam_normal.dot(cross_vector.unitized()))
+            if not (TOL.is_zero(dot) or TOL.is_close(dot, 1)):
+                raise BeamJoinningError(
+                    self.elements,
+                    self,
+                    debug_info="The the two beams are not aligned to create a Half Lap joint.",
+                )
+
+    def _get_lap_lengths(self):
+        lap_a_length = self.beam_b.side_as_surface(self.beam_b_ref_side_index).ysize
+        lap_b_length = self.beam_a.side_as_surface(self.beam_a_ref_side_index).ysize
+        return lap_a_length, lap_b_length
+
+    def _get_lap_depths(self):
+        lap_depth = (self.cutting_plane_a.ysize + self.cutting_plane_b.ysize) / 2
+        return lap_depth * self.cut_plane_bias, lap_depth * (1 - self.cut_plane_bias)

src/compas_timber/connections/t_butt.py

@@ -130,13 +130,15 @@ def add_features(self):
         # apply the pocket on the cross beam
         if self.mill_depth:
             cross_cutting_plane = self.main_beam.ref_sides[self.main_beam_ref_side_index]
-            lap_width = self.main_beam.height if self.main_beam_ref_side_index % 2 == 0 else self.main_beam.width
+            lap_length = self.main_beam.height if self.main_beam_ref_side_index % 2 == 0 else self.main_beam.width
+
             cross_feature = Lap.from_plane_and_beam(
                 cross_cutting_plane,
                 self.cross_beam,
-                lap_width,
+                lap_length,
                 self.mill_depth,
-                self.cross_beam_ref_side_index,
+                is_pocket=True,
+                ref_side_index=self.cross_beam_ref_side_index,
             )
             self.cross_beam.add_features(cross_feature)
             self.features.append(cross_feature)