poster-tube-lid: catch stalk base outer curve same centre as inner

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

diff --git a/poster-tube-lid.scad b/poster-tube-lid.scad
index f7d4498b85334d22513b0421c11c5b67789ada43..d4210a2d5d298e40bb70badfecf1eab2c8d21676 100644 (file)
--- a/poster-tube-lid.scad
+++ b/poster-tube-lid.scad
@@ -237,13 +237,15 @@ cppD = cppC + [0,-1] * catch_strap_width;
 
 // catch assembly stalk and so on
 
 
 // catch assembly stalk and so on
 

+catch_cr3 = catch_cr + catch_stalk_h;
+

 cppF = [ cppg[0] - catch_stalk_eff_bend_rad, cppd[1] ];
 cpp4 = [ cppg[0] - catch_stalk_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;
 cpp2d = cpp2 + [0,-1] * catch_cr;
 cppF = [ cppg[0] - catch_stalk_eff_bend_rad, cppd[1] ];
 cpp4 = [ cppg[0] - catch_stalk_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;
 cpp2d = cpp2 + [0,-1] * catch_cr;

-cpp3 = [ cpp2[0] + catch_cr * 2, cppd[1] - catch_cr ];
+cpp3 = [ cpp2[0] + catch_cr + catch_cr3, cppd[1] - catch_cr3 ];

 cppA = [ -cppxC, cpp9[1] ];
 cppE = [ cppA[0], cppD[1] ];
 
 cppA = [ -cppxC, cpp9[1] ];
 cppE = [ cppA[0], cppD[1] ];
 


@@ -562,7 +564,7 @@ module CatchAssemblyCoreProfile(){
   difference(){
     union(){
       hull(){
   difference(){
     union(){
       hull(){

-       translate(cpp3) circle(r= catch_cr);
+       translate(cpp3) circle(r= catch_cr3);

        polygon([ cpp3,
                  cpp2r,
                  cpp5,
        polygon([ cpp3,
                  cpp2r,
                  cpp5,