poster-tube-lid: catch wip, mid-ework

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/poster-tube-lid.scad b/poster-tube-lid.scad
index 8bc48535b7050db6333aeb5a317def89684d271a..3458ca04647d655d1625562f532a521c095195fd 100644 (file)
--- a/poster-tube-lid.scad
+++ b/poster-tube-lid.scad
@@ -140,28 +140,34 @@ smc_cnr_c_x = sm_bolt_shaft/2 - sm_closure_cnr
 catch_cr = catch_knob_dia/2 + catch_stem_beside_gap;
 catch_strap_width = sm_main_width;
 catch_stem_end_h = catch_stem_h;
-
-cpp0 = [0,0];
+catch_pin_width = rivet_entry_width - catch_pin_gap;
+
+cppy6 = -catch_strap_width/2;
+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 ];
 cpp1 = cpp0 + [0,1] * catch_pin_height;
-cpp2 = cpp1 + [1,0] * (rivet_entry_width - catch_pin_gap);
+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,
-        0 - (catch_stem_h + catch_cr) ];
-cppB = [ 0.5*(cpp1 + cpp2)[0],
-        cpp1[1] - catch_pin_height - catch_knob_above_gap -
-        0.5 * catch_knob_dia ];
+        -catch_stem_h ];
 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;
-cpp6 = cpp5;
 cpp10 = [ cpp11[0], 0 - catch_cr ];
 cpp8 = cpp10 + [1,0] * catch_cr;
 cpp9 = cpp8 + [0,1] * catch_cr;
 cppC = cpp8 + [1,1] * catch_cr;
-cppA = [ cpp5[0] - catch_cr*2, 0 ];
+cppA = [ cpp5[0] - catch_cr, 0 ];
 cppD = cppC + [0,-1] * catch_strap_width;
 cppE = [ cppA[0], cppD[1] ];
 
@@ -509,6 +515,7 @@ module StrapMount(){ ////toplevel
 module CatchCoreProfile(){ ////toplevel
   difference(){
     polygon([ cpp4,
+             cppB,
              cpp3,
              cpp2,
              cpp1,
@@ -520,7 +527,7 @@ module CatchCoreProfile(){ ////toplevel
              cpp9,
              cpp10,
              cpp11,
-             cpp6,
+             cpp7,
              cpp5,
              ], convexity=10);
   }