X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=poster-tube-lid.scad;h=4ce2176f513dbe34e646cfbac7859aae7a5a0ab6;hb=9cb16ea8efbc65fba14bded7da869c2a0e57b396;hp=cadbe62537c6a6b4f314240cfbf9f6a0a7c29130;hpb=d8f70205282e42f105ad4cb6df44d73a3404a166;p=reprap-play.git

diff --git a/poster-tube-lid.scad b/poster-tube-lid.scad
index cadbe62..4ce2176 100644
--- a/poster-tube-lid.scad
+++ b/poster-tube-lid.scad
@@ -81,12 +81,12 @@ catch_stem_th = 3;
 
 catch_knob_dia = 6;
 catch_knob_above_gap = 8;
-catch_stem_end_h = 12;
 catch_pin_height = 7;
 
 catch_stem_below_gap = 1.0;
 catch_stem_beside_gap = 2.0;
 catch_pin_gap = 0.5;
+catch_hook_slope = 0.15;
 
 // calculated
 
@@ -140,26 +140,39 @@ 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;
-
-cpp0 = [0,0];
+catch_strap_thick = sm_main_thick;
+catch_stem_end_h = catch_stem_h;
+catch_pin_width = rivet_entry_width - catch_pin_gap;
+
+cppy6 = -catch_strap_width/2;
+cppxC = TAU * 0.34 * main_dia/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 ];
+cpp12 = cpp0 + [1,0] * (catch_pin_height * catch_hook_slope);
 cpp1 = cpp0 + [0,1] * catch_pin_height;
-cpp2 = cpp0 + [1,0] * (rivet_entry_width - catch_pin_gap);
-cpp3 = cpp2 + [0,-1] * catch_stem_end_h;
-cpp4 = cpp2 + [0,-1] * catch_stem_end_h;
+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,
-	 cpp0[1] - (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 ];
-cpp7 = cppB + [-1,-1] * catch_knob_dia/2
+	 -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;
-cpp6 = [ cpp5[0], cpp7[1] ];
-cpp8 = [ cpp7[0] + catch_cr*2,
-	 cpp0[0] - catch_cr ];
-cppC = cpp8 + [1,1] * catch_cr;
-cppA = [ cpp5[0] - catch_cr*2, cpp0[1] ];
+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] ];
 
@@ -504,21 +517,58 @@ module StrapMount(){ ////toplevel
   }
 }
 
-module CatchCoreProfile(){
+module CatchCoreProfile(){ ////toplevel
+  hull(){
+    translate(cppB) circle(r= catch_knob_dia/2);
+    polygon([cpp4,
+	     cppB,
+	     cpp3]);
+  }
+  translate(cpp8)
+    circle(catch_cr);
+  polygon([
+	   cpp4,
+	   cppB,
+	   cpp3,
+	   cpp2,
+	   cpp1,
+	   cpp12,
+	   ]);
   difference(){
     polygon([ cpp4,
 	      cpp3,
-	      cpp2,
-	      cpp1,
-	      cpp0,
+	      cpp12,
 	      cppA,
 	      cppE,
 	      cppD,
 	      cppC,
-	      ]);
+	      cpp9,
+	      cpp10,
+	      cpp11,
+	      cpp7,
+	      cpp5,
+	      ], convexity=10);
+    hull(){
+      translate(cpp7) circle(r= catch_cr);
+      polygon([ cpp7,
+		cpp5,
+		cpp11 ]);
+    }
+    hull(){
+      translate(cpp6) circle(catch_cr);
+      polygon([ cppA,
+		cpp0,
+		cpp1 ]);
+    }
   }
 }
 
+module CatchPreDistort(){ /////toplevel
+  rotate([90,0,0])
+    linear_extrude(height=catch_strap_thick, convexity=10)
+    CatchCoreProfile();
+}
+
 //ProfilesDemo();
 //BayonetCutout();
 //MainProfile();