positive vertical_offsets were causing an issue for dovetails; addressed issue & updated testss

Author: x0pherl

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fb-library"
-version = "0.0.18"
+version = "0.0.19"
 authors = [
   { name="x0pherl"},
 ]
@@ -22,3 +22,8 @@ Documentation = "https://fb-library.readthedocs.org"
 requires = ["hatchling", "hatch-vcs"]
 
 build-backend = "hatchling.build"
+
+[tool.pytest.ini_options]
+markers = [
+    "manual: marks tests that can only be executed manually",
+]

src/fb_library/dovetail.py

@@ -45,9 +45,6 @@
 
 from fb_library.click_fit import divot
 
-from ocp_vscode import show, Camera
-
-
 class DovetailPart(Enum):
     TAIL = auto()
     SOCKET = auto()
@@ -703,6 +700,8 @@ def dovetail_subpart(
             cut on one side, and provides a hard stop for fitting. A positive number results in a straight cut on the bottom
             of the part passed, a negagive number results in a straight cut on the top of the part passed
     """
+    if start == end:
+        raise ValueError("start and end points cannot be the same")
     if abs(vertical_offset) > part.bounding_box().size.Z:
         raise ValueError(
             "Vertical offset cannot be greater than the part's height"
@@ -776,7 +775,7 @@ def dovetail_subpart(
                             taper_distance=0,
                             length_ratio=length_ratio,
                             depth_ratio=depth_ratio,
-                            scarf_offset=-scarf_offset + vertical_scarf_offset,
+                            scarf_offset=-scarf_offset + vertical_scarf_offset * (2 if section == DovetailPart.TAIL else .5),
                             straighten_dovetail=True,
                         )
                     )
@@ -805,7 +804,7 @@ def dovetail_subpart(
                             ),
                             length_ratio=length_ratio,
                             depth_ratio=depth_ratio,
-                            scarf_offset=-scarf_offset + vertical_scarf_offset,
+                            scarf_offset=-scarf_offset + vertical_scarf_offset * (2 if section == DovetailPart.TAIL else .5),
                             straighten_dovetail=False,
                         )
                     )
@@ -1027,6 +1026,8 @@ def dovetail_split_line(
 
 
 if __name__ == "__main__":
+    from ocp_vscode import show, Camera
+
     with BuildPart(mode=Mode.PRIVATE) as test:
         Box(40, 80, 78.7, align=(Align.CENTER, Align.CENTER, Align.MIN))
         with BuildPart(
@@ -1064,7 +1065,7 @@ def dovetail_split_line(
                     vertical_offset=-14.33333,
                     click_fit_radius=.75
     )
-    sckt.color = (0.5, 0.5, 0.5)
+    sckt.color = (0.5, 0.5, .5)
     splines = snugtail_subpart_outline(
         test.part,
         Point(-25, 0),
@@ -1100,5 +1101,5 @@ def dovetail_split_line(
         # splines,
         reset_camera=Camera.KEEP,
     )
-    export_stl(tl, "tail.stl")
-    export_stl(sckt, "socket.stl")
+    # export_stl(tl, "tail.stl")
+    # export_stl(sckt, "socket.stl")

tests/test_dovetail.py

@@ -3,6 +3,7 @@
 from importlib.machinery import SourceFileLoader
 from importlib.util import module_from_spec, spec_from_loader
 import pytest
+import os
 from unittest.mock import patch
 from pathlib import Path
 
@@ -15,6 +16,7 @@
     DovetailStyle,
     dovetail_split_line,
     dovetail_subpart,
+    snugtail_subpart_outline,
 )
 
 
@@ -34,6 +36,22 @@ def test_direct_run(self):
                 module_from_spec(spec_from_loader(loader.name, loader))
             )
 
+    def test_start_end_match(self):
+        with BuildPart(mode=Mode.PRIVATE) as test:
+            Box(10, 50, 2, align=(Align.CENTER, Align.CENTER, Align.MIN))
+        with pytest.raises(ValueError):
+            x = (
+                dovetail_subpart(
+                    test.part,
+                    Point(5, 0),
+                    Point(5, 0),
+                    # scarf_distance=0.5,
+                    section=DovetailPart.TAIL,
+                    # tilt=20,
+                    vertical_offset=-100,
+                ),
+            )
+
     def test_vertical_offset_too_high(self):
         with BuildPart(mode=Mode.PRIVATE) as test:
             Box(10, 50, 2, align=(Align.CENTER, Align.CENTER, Align.MIN))
@@ -167,3 +185,104 @@ def test_valid_vert_tail(self):
                     vertical_offset=0.5,
                 ),
             )
+
+@pytest.mark.manual
+def test_visualize_positive_voffset_dovetail():
+    from ocp_vscode import show, Camera
+    with BuildPart() as hanger:
+        Box(20,10,2, align=[Align.CENTER, Align.MAX, Align.MIN])
+        Box(20,200,2, align=[Align.CENTER, Align.MIN, Align.MIN])
+
+    taper = 0
+    scarf=-45
+    voffset = .6
+    top = dovetail_subpart(hanger.part, Point(-10,17), Point(10,17), 
+                    section=DovetailPart.TAIL,
+                    taper_angle=taper,
+                    scarf_angle=scarf,vertical_offset=voffset
+                    )
+    bottom = dovetail_subpart(hanger.part, Point(-10,17), Point(10,17), section=DovetailPart.SOCKET, 
+                        taper_angle=taper,
+                    scarf_angle=scarf,vertical_offset=voffset).move(Location((0, -15, 0)))
+    show(top, bottom, reset_camera=Camera.KEEP)
+
+@pytest.mark.manual
+def test_visualize_negative_voffset_dovetail():
+    from ocp_vscode import show, Camera
+    from build123d import BuildSketch, make_face, Plane, Cylinder
+    with BuildPart(mode=Mode.PRIVATE) as test:
+        Box(40, 80, 78.7, align=(Align.CENTER, Align.CENTER, Align.MIN))
+        with BuildPart(
+                Plane.XY.offset(73.6
+                ),
+                mode=Mode.SUBTRACT,
+            ):
+                Cylinder(
+                    25,
+                    170,
+                    rotation=(90, 0, 0),
+                )
+
+    tl = dovetail_subpart(
+        test.part,
+        Point(-20, 0),
+        Point(20, 0),
+        section=DovetailPart.TAIL,
+                    tolerance=.075,
+                    vertical_tolerance=0.2,
+                    taper_angle=2,
+                    scarf_angle=20,
+                    vertical_offset=-14.33333,
+                    click_fit_radius=.75
+    ).move(Location((0, 0, 0)))
+    sckt = dovetail_subpart(
+        test.part,
+        Point(-20, 0),
+        Point(20, 0),
+        section=DovetailPart.SOCKET,
+                    tolerance=.075,
+                    vertical_tolerance=0.2,
+                    taper_angle=2,
+                    scarf_angle=20,
+                    vertical_offset=-14.33333,
+                    click_fit_radius=.75
+    )
+    sckt.color = (0.5, 0.5, 0.5)
+    splines = snugtail_subpart_outline(
+        test.part,
+        Point(-25, 0),
+        Point(25, 0),
+        section=DovetailPart.SOCKET,
+        taper_distance=0,
+        # scarf_angle=20,
+        straighten_dovetail=True,
+    )
+    spline = snugtail_subpart_outline(
+        test.part,
+        Point(-25, 0),
+        Point(25, 0),
+        section=DovetailPart.TAIL,
+        taper_distance=0,
+        # scarf_angle=20,
+        straighten_dovetail=True,
+    )
+    with BuildSketch() as sks:
+        add(splines)
+        make_face()
+    with BuildSketch() as sk:
+        add(spline)
+        make_face()
+    from build123d import export_stl
+
+    show(
+        tl,
+        sckt,
+        # sk,
+        # sks,
+        # spline,
+        # splines,
+        reset_camera=Camera.KEEP,
+    )
+
+if __name__ == "__main__":
+    test_visualize_positive_voffset_dovetail()