poster-tube-lid: catch: introduce catch_pin_slop_x_extra (wrong?)

[reprap-play.git] / poster-tube-lid.scad

diff --git a/poster-tube-lid.scad b/poster-tube-lid.scad
index 91ce3cccd022d76ef5f3a44b93368e12dac4f75e..73abf8d8b09dbf2d7732d77d2cf9065e48987b7e 100644 (file)
--- a/poster-tube-lid.scad
+++ b/poster-tube-lid.scad
@@ -82,6 +82,7 @@ catch_stem_len = 50;
 catch_stem_th = 3;
 
 catch_pin_slop = 0.25; // each side, and above
+catch_pin_slop_x_extra = 0.25; // only on one side
 catch_stalk_above_gap = 1.5;
 catch_stalk_eff_bend_rad = catch_stem_len * 0.75;
 
@@ -211,7 +212,8 @@ cppxC = 0.41 * sm_inner_rad * TAU;
 
 cppa = bayo_f + [1,-1] * catch_pin_slop;
 cppb = bayo_g + [1,-1] * catch_pin_slop;
-cppd = [ bayo_n[0] - catch_pin_slop, -catch_stalk_above_gap ];
+cppd = [ bayo_n[0] - catch_pin_slop - catch_pin_slop_x_extra,
+        -catch_stalk_above_gap ];
 cppc = [ cppd[0], cppb[1] ];
 cpph = cppd + [0,-1] * catch_stem_h;
 cppe = cppd + [0,-1] * (catch_knob_above_gap + catch_knob_dia/2);
@@ -245,6 +247,8 @@ cpp3 = [ cpp2[0] + catch_cr * 2, cppd[1] - catch_cr ];
 cppA = [ -cppxC, cpp9[1] ];
 cppE = [ cppA[0], cppD[1] ];
 
+catch_assembly_dy = -cppy9 + catch_strap_width;
+
 
 module MainProfile(){
   main_cnr_pos = [ side_thick, top_z ] - [1,1]*main_cnr;
@@ -589,6 +593,7 @@ module CatchAssemblyCoreProfile(){
               cpp11,
               ]);
     }
+    translate(cpp2) circle(r= catch_cr);
   }
 }
 
@@ -636,8 +641,8 @@ module CatchPreDistort(){ /////toplevel
 }
 
 module CatchAssembly(){ /////toplevel
-  rotate([0,0, -0.5 * (cpp1[0] + cpp2[0]) / sm_inner_rad * 360/TAU])
-    translate([0,0, catch_strap_width])
+  rotate([0,0, -(cppe[0] + cppB[0]) / sm_inner_rad * 360/TAU])
+    translate([0,0, catch_assembly_dy])
     scale(sm_inner_rad / 100)
     import(str("poster-tube-lid,CatchPostDistort-fa",
               (coarse ? 20 : 3),
@@ -655,8 +660,7 @@ module CatchAssembly(){ /////toplevel
 
 module CatchDemo(){ /////toplevel
   color("blue") translate([0,0,
-            -catch_strap_width
-            -cpp0[1]
+                          -catch_assembly_dy
             ])
     CatchAssembly();
   translate([0,0,+side_height
@@ -666,8 +670,7 @@ module CatchDemo(){ /////toplevel
 
 module CatchDemoS(){ /////toplevel
   color("blue") translate([0,0,
-            -catch_strap_width
-            -cpp0[1]
+            -catch_assembly_dy
             ])
     CatchAssembly();
   intersection(){