X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=poster-tube-lid.scad;h=d4210a2d5d298e40bb70badfecf1eab2c8d21676;hb=9d27f71901e810cf87975ab5e51ffda0c9a58911;hp=ccf18a98cbd86c7cb23d9ddec4d2cd7307bbfcf6;hpb=46858c936555e0118b9a3faa1d02ebda4564279e;p=reprap-play.git

diff --git a/poster-tube-lid.scad b/poster-tube-lid.scad
index ccf18a9..d4210a2 100644
--- a/poster-tube-lid.scad
+++ b/poster-tube-lid.scad
@@ -87,7 +87,7 @@ catch_stalk_above_gap = 1.5;
 catch_stalk_eff_bend_rad = catch_stalk_len * 0.75;
 
 catch_strap_width = 12;
-catch_stalk_base_width = 15;
+catch_stalk_base_width = catch_stalk_h;
 
 catch_knob_dia = 6;
 catch_knob_above_gap = 5;
@@ -237,13 +237,15 @@ cppD = cppC + [0,-1] * catch_strap_width;
 
 // 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;
-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] ];
 
@@ -562,7 +564,7 @@ module CatchAssemblyCoreProfile(){
   difference(){
     union(){
       hull(){
-	translate(cpp3) circle(r= catch_cr);
+	translate(cpp3) circle(r= catch_cr3);
 	polygon([ cpp3,
 		  cpp2r,
 		  cpp5,