poster-tube-lid: catch: wip rework entirely

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

diff --git a/poster-tube-lid.scad b/poster-tube-lid.scad
index 011383f72baefb60f2d0f86a79b58bbe81d56152..c652d7d1235da72484122a0df10222cb664f2810 100644 (file)
--- a/poster-tube-lid.scad
+++ b/poster-tube-lid.scad
@@ -234,7 +234,7 @@ 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_len, cppd[1] ] + [1,-1] * catch_cr;
+cpp4 = [ cppg[0] - catch_stem_len, cpph[1] ] + [1,-1] * catch_cr;
 cpp5 = [ cpp4[0], cppC[1] + catch_cr ];
 cpp2 = cpp5 + [-1,0] * (catch_cr * 2 + catch_stalk_base_width);
 cpp2r = cpp2 + [1,0] * catch_cr;
@@ -563,6 +563,18 @@ module CatchAssemblyCoreProfile(){
                  cppd
                  ]);
       }
+      polygon([cppD,
+              cppC,
+              cpp9,
+              cpp10,
+              cpp11,
+              cpp4,
+              cpp2r,
+              cpp2d,
+              cppA,
+              cppE
+              ]);
+      translate(cpp8) circle(r= catch_cr);
     }
     hull(){
       translate(cpp4) circle(r= catch_cr);
@@ -571,7 +583,6 @@ module CatchAssemblyCoreProfile(){
       polygon([cpp4,
               cppg,
               cpph,
-              cpp9,
               cpp10,
               cpp11,
               ]);