From 285d769f5887c6bc96dff104fa9f8a48117b743a Mon Sep 17 00:00:00 2001
From: "Brian T. Rice" <briantrice@gmail.com>
Date: Mon, 29 Apr 2024 19:43:54 -0700
Subject: [PATCH] Cleanup stickerprint algorithm a lot. No regressions.

---
 SlideRule.py                            | 117 +++++++++++-------------
 examples/Aristo868.StickerCut.png       | Bin 529346 -> 529351 bytes
 examples/FaberCastell283.StickerCut.png | Bin 429166 -> 429179 bytes
 3 files changed, 51 insertions(+), 66 deletions(-)

diff --git a/SlideRule.py b/SlideRule.py
index 43a12c5..e92b53a 100755
--- a/SlideRule.py
+++ b/SlideRule.py
@@ -1841,81 +1841,66 @@ def render_stickerprint_mode(m: Model, sliderule_img: Image.Image):
     geom_s.oX = 0
     geom_s.oY = 0
     style = m.style
-    # fsUM,MM,LM:
-    y = 0
-    y += o_y2 + o_a
-    x_left = geom.oX + x_off
     slide_h = geom.slide_h
     stator_h = geom.stator_h
     total_w = scale_w + 2 * o_x2
-    sticker_row_h = max(slide_h, stator_h)
-    total_h = (geom.side_h + 2 * o_a) * 2 + o_a * 5 + sticker_row_h * 2 + 145
-    stickerprint_img = image_for_rendering(m, w=total_w, h=total_h)
-    r = Renderer.make(stickerprint_img, geom_s, style)
-    transcribe(sliderule_img, stickerprint_img, x_left, geom.oY, scale_w, stator_h, o_x2, y)
-    extend(stickerprint_img, scale_w, y + stator_h - 1, BleedDir.DOWN, ext)
-    r.draw_corners(o_x2, y - o_a, o_x2 + scale_w, y + stator_h)
-    y += stator_h + o_a
-    transcribe(sliderule_img, stickerprint_img, x_left, geom.oY + stator_h + 1, scale_w, slide_h, o_x2, y)
-    extend(stickerprint_img, scale_w, y + 1, BleedDir.UP, ext)
-    extend(stickerprint_img, scale_w, y + slide_h - 1, BleedDir.DOWN, ext)
-    r.draw_corners(o_x2, y, o_x2 + scale_w, y + slide_h)
-    y += slide_h + o_a
-    transcribe(sliderule_img, stickerprint_img, x_left, geom.oY + geom.side_h - stator_h, scale_w, stator_h, o_x2, y)
-    extend(stickerprint_img, scale_w, y + 1, BleedDir.UP, ext)
-    extend(stickerprint_img, scale_w, y + stator_h - 1, BleedDir.DOWN, ext)
-    r.draw_corners(o_x2, y, o_x2 + scale_w, y + stator_h + o_a)
-    # bsUM,MM,LM:
-    y += stator_h + o_a + o_a + o_a
-    y_start = geom.oY + geom.side_h + geom.oY
-    transcribe(sliderule_img, stickerprint_img, x_left, y_start, scale_w, stator_h, o_x2, y)
-    extend(stickerprint_img, scale_w, y + stator_h - 1, BleedDir.DOWN, ext)
-    r.draw_corners(o_x2, y - o_a, o_x2 + scale_w, y + stator_h)
-    y += stator_h + o_a
-    transcribe(sliderule_img, stickerprint_img, x_left, y_start + stator_h + 1 - 3, scale_w, slide_h, o_x2, y)
-    extend(stickerprint_img, scale_w, y + 1, BleedDir.UP, ext)
-    extend(stickerprint_img, scale_w, y + slide_h - 1, BleedDir.DOWN, ext)
-    r.draw_corners(o_x2, y, o_x2 + scale_w, y + slide_h)
-    y += slide_h + o_a
-    transcribe(sliderule_img, stickerprint_img, x_left, y_start + geom.side_h - stator_h, scale_w, stator_h, o_x2, y)
-    extend(stickerprint_img, scale_w, y + 1, BleedDir.UP, ext)
-    extend(stickerprint_img, scale_w, y + stator_h - 1, BleedDir.DOWN, ext)
-    y_bottom = y + stator_h + o_a
-    r.draw_corners(o_x2, y, o_x2 + scale_w, y_bottom)
-    y_b = y_bottom + 20
+    sticker_row_h = max(slide_h, stator_h) + o_a
+    total_h = (geom.side_h + 2 * o_a) * 2 + o_a * 3 + sticker_row_h * 2 + 145
+    dst_img = image_for_rendering(m, w=total_w, h=total_h)
+    r = Renderer.make(dst_img, geom_s, style)
+
+    def copy_band(src_y: int, h: int, dst_y: int):
+        transcribe(sliderule_img, dst_img, geom.oX + x_off, src_y, scale_w, h, o_x2, dst_y)
+
+    def extend_edges(dst_y, h: int, both: bool):
+        if both:
+            extend(dst_img, scale_w, dst_y + 1, BleedDir.UP, ext)
+        extend(dst_img, scale_w, dst_y + h - 1, BleedDir.DOWN, ext)
+
+    def part_corners(dst_y, h):
+        r.draw_corners(o_x2, dst_y, o_x2 + scale_w, dst_y + h)
+
+    y = o_y2
+    # fsUM,MM,LM and bsUM,MM,LM:
+    for (front, y_side) in ((True, geom.oY), (False, geom.oY + geom.side_h + geom.oY)):
+        y += o_a
+        copy_band(y_side, stator_h, y)
+        extend_edges(y, stator_h, False)
+        part_corners(y - o_a, stator_h + o_a)
+        y += stator_h + o_a
+        copy_band(y_side + stator_h + 1 - (0 if front else 3), slide_h, y)
+        extend_edges(y, slide_h, True)
+        part_corners(y, slide_h)
+        y += slide_h + o_a
+        copy_band(y_side + geom.side_h - stator_h, stator_h, y)
+        extend_edges(y, stator_h, True)
+        part_corners(y, stator_h + o_a)
+        y += stator_h + (o_a + o_a if front else 0)
+    # Side stickers:
+    y_b = y + o_a + 20
     box_w = 510
     boxes = [
-        [o_a, y_b,
-         box_w + o_a, stator_h + o_a],
-        [box_w + 3 * o_a, y_b,
-         x_off + o_a, slide_h],
-        [box_w + x_off + 5 * o_a, y_b,
-         x_off + o_a, stator_h + o_a]
+        (o_a,                     y_b, box_w + o_a, stator_h + o_a),
+        (box_w + 3 * o_a,         y_b, x_off + o_a, slide_h),
+        (box_w + 5 * o_a + x_off, y_b, x_off + o_a, stator_h + o_a)
     ]
-    box_x_mirror = 6.5 * o_a + box_w + 2 * x_off
+    box_x_mirror = 13 * o_a // 2 + box_w + 2 * x_off
     for (x0, y0, dx, dy) in boxes:
-        r.draw_box(x0, y0, dx, dy, Color.CUT)
-        r.draw_box(x0, y0 + slide_h + o_a, dx, dy, Color.CUT)
-
-        x0 = round(2 * box_x_mirror - x0 - dx)
-
-        r.draw_box(x0, y0, dx, dy, Color.CUT)
-        r.draw_box(x0, y0 + sticker_row_h + o_a, dx, dy, Color.CUT)
-    points = [
-        [2 * o_a + 120, y_b + o_a + scale_h],
-        [6 * o_a + box_w + x_off + 2 * scale_h, y_b + scale_h],
-        [6 * o_a + box_w + x_off + scale_h, y_b + 2 * scale_h],
-
-        [2 * o_a + 120, y_b + slide_h + o_a + scale_h],
-        [6 * o_a + box_w + x_off + scale_h, y_b + slide_h + o_a + o_a + 2 * scale_h],
-        [6 * o_a + box_w + x_off + 2 * scale_h, y_b + slide_h + o_a + o_a + scale_h]
+        for x1 in (x0, 2 * box_x_mirror - x0 - dx):
+            for y1 in (y0, y0 + slide_h + o_a):
+                r.draw_box(x1, y1, dx, dy, Color.CUT)
+    p1 = [
+        (2 * o_a + 120,                         y_b + o_a + scale_h),
+        (6 * o_a + box_w + x_off + scale_h,     y_b + 2 * scale_h),
+        (6 * o_a + box_w + x_off + 2 * scale_h, y_b + scale_h),
     ]
+    points = p1 + [(cx, cy + sticker_row_h + (o_a if i > 0 else -o_a))
+                   for (i, (cx, cy)) in enumerate(p1)]
     hole_r = 34  # (2.5mm diameter screw holes) = math.ceil(0.25 * Geometry.PixelsPerCM / 2)
-    for (p_x, p_y) in points:
-        r.draw_circle(p_x, p_y, hole_r, Color.CUT)
-        p_x_mirror = round(2 * box_x_mirror - p_x)
-        r.draw_circle(p_x_mirror, p_y, hole_r, Color.CUT)
-    return stickerprint_img
+    for (cx, cy) in points:
+        for x in (cx, 2 * box_x_mirror - cx):
+            r.draw_circle(x, cy, hole_r, Color.CUT)
+    return dst_img
 
 
 def render_diagnostic_mode(model: Model, all_scales=False):
diff --git a/examples/Aristo868.StickerCut.png b/examples/Aristo868.StickerCut.png
index 0afe256254d89a09e3f1d6669a2974a0bfc9ad9d..9ebdb25f3f3de348de8dd10a249dc6457e146155 100644
GIT binary patch
delta 4808
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
O-KE|uye=&k?EN1U&Wn@)

delta 5417
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
IjeAr73yBdiY5)KL

diff --git a/examples/FaberCastell283.StickerCut.png b/examples/FaberCastell283.StickerCut.png
index c285823032ddf9b50353b4100692080377662a29..7485adf571b840dfbf2485b203b7381722425312 100644
GIT binary patch
delta 4999
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
E|Ijsg+yDRo

delta 6313
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
S?{+=%W|g!17dgxQfA}W`3*wjn