From f36e7af5462fa69d7708a97475fc34e2a09c7df1 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 27 Nov 2018 20:27:27 +0000
Subject: [PATCH] poster-tube-lid: catch: wip rework entirely

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 poster-tube-lid.scad | 82 ++++++++++++++++++++++++++------------------
 1 file changed, 49 insertions(+), 33 deletions(-)

diff --git a/poster-tube-lid.scad b/poster-tube-lid.scad
index 4aea76d..7002950 100644
--- a/poster-tube-lid.scad
+++ b/poster-tube-lid.scad
@@ -79,10 +79,15 @@ catch_stem_h = 3;
 catch_stem_len = 50;
 catch_stem_th = 3;
 
+catch_pin_slop = 0.25; // each side, and above
+catch_stalk_above_gap = 1.5;
+catch_stalk_eff_bend_rad = catch_stem_len * 0.75;
+
+catch_stalk_base_width = 15;
+
 catch_knob_dia = 6;
 catch_knob_above_gap = 8;
 catch_knob_height = 6;
-catch_pin_height = 7;
 
 catch_stem_below_gap = 1.0;
 catch_stem_beside_gap = 2.0;
@@ -151,38 +156,6 @@ catch_pin_width = (rivet_entry_width * sm_inner_rad / bayo_nom_rad)
 
 echo("R ", sm_inner_rad, bayo_real_rad, bayo_nom_rad);
 
-cppy6 = -catch_strap_width/2;
-cppxC = 0.34 * sm_inner_rad * TAU;
-cppB = [ catch_pin_width/2,
-	 cppy6
-	 + catch_stem_below_gap
-	 + catch_pin_height
-	 + catch_knob_dia/2 ];
-cpp0 = [ 0,
-	 cppB[1]
-	 + catch_knob_dia
-	 + catch_knob_above_gap ];
-cpp12 = cpp0 + [1,0] * (catch_pin_height * catch_hook_slope);
-cpp1 = cpp0 + [0,1] * catch_pin_height;
-cpp2 = cpp1 + [1,0] * catch_pin_width;
-cpp4 = cpp0 + [0,-1] * catch_stem_end_h;
-cpp3 = [ cpp2[0], cpp4[1] ];
-cpp5 = [ cpp0[0] - catch_stem_len,
-	 -catch_stem_h ];
-cpp6 = [ cpp5[0], catch_cr ];
-cpp7 = cppB + [1,-1] * catch_knob_dia/2
-            + [ catch_stem_beside_gap, -catch_stem_below_gap ]
-            + [ 0, -catch_pin_height ]
-            + [-1,1] * catch_cr;
-cpp11 = cpp7 + [1,0] * catch_cr;
-cpp10 = [ cpp11[0], 0 - catch_cr ];
-cpp8 = cpp10 + [1,0] * catch_cr;
-cpp9 = cpp8 + [0,1] * catch_cr;
-cppC = [ cppxC, cpp9[1] ];
-cppA = [ -cppxC, 0 ];
-cppD = cppC + [0,-1] * catch_strap_width;
-cppE = [ cppA[0], cppD[1] ];
-
 $fs= coarse ? 2.5 : 0.5;
 $fa= coarse ? 5 : 1;
 
@@ -226,6 +199,49 @@ bayo_polygon = [ bayo_a,
 
 echo(bayo_polygon);
 
+// CATCH
+
+//cppy6 = -catch_strap_width * 2/3;
+
+cppxC = 0.34 * sm_inner_rad * TAU;
+
+// catch pin
+
+cppa = bayo_f + [1,-1] * catch_pin_slop;
+cppb = bayo_g + [1,-1] * catch_pin_slop;
+cppd = [ bayo_n[0] - catch_pin_slop, -catch_stalk_above_gap ];
+cppc = [ cppd[0], cppb[1] ];
+cpph = cppd + [0,-1] * catch_stem_h;
+cppe = cppd + [0,-1] * (catch_knob_above_gap + catch_knob_dia/2);
+cppf = [ cppa[0], cppe[1] ];
+cppg = [ cppa[0], cpph[1] ];
+cppB = 0.5 * (cppf + cppe);
+
+// catch assembly depression below pin
+
+cppy6 = cppB[1] - (catch_knob_dia/2
+		   + (cppc[1] - cppd[1])
+		   + catch_stem_below_gap);
+cpp7 = [ cppB[0], cppy6 + catch_cr ];
+cpp11 = cpp7 + [1,0] * catch_cr;
+cppy9 = cppy6 + catch_strap_width * 1/3;
+cpp9 = [ cpp7[0] + catch_cr * 2, cppy9 ];
+cpp8 = cpp9 + [0,-1] * catch_cr;
+cpp10 = cpp8 + [-1,0] * catch_cr;
+cppC = [ cppxC, cpp9[1] ];
+cppD = cppC + [0,-1] * catch_strap_width;
+
+// catch assembly stalk and so on
+
+cppF = [ cppg[0] - catch_stem_stalk_eff_bend_rad, cppd[1] ];
+cpp4 = [ cppg[0] - catch_stem_lenm, cppd[1] ] + [1,-1] * catch_cr;
+cpp5 = [ cpp4[0], cppC[1] + catch_cr ];
+cpp2 = cpp5 + [-1,0] * (catch_cr * 2 + catch_stalk_base_width);
+cpp3 = [ cpp2[0] + catch_cr * 2, cppd[1] - catch_cr ];
+cppA = [ -cppxC, cpp9[1] ];
+cppE = [ cppA[0], cppD[1] ];
+
+
 module MainProfile(){
   main_cnr_pos = [ side_thick, top_z ] - [1,1]*main_cnr;
   difference(){
-- 
2.30.2