poster-tube-lid: catch: introduce catch_assembly_dy (nfc)

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

diff --git a/poster-tube-lid.scad b/poster-tube-lid.scad
index 91ce3cccd022d76ef5f3a44b93368e12dac4f75e..77ecb17cc6cc82577024df0fa0d53d2f8ca11968 100644 (file)
--- a/poster-tube-lid.scad
+++ b/poster-tube-lid.scad
@@ -245,6 +245,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 +591,7 @@ module CatchAssemblyCoreProfile(){
               cpp11,
               ]);
     }
+    translate(cpp2) circle(r= catch_cr);
   }
 }
 
@@ -636,8 +639,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),