X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=poster-tube-lid.scad;h=2e8209f0430e9e3ca591dce15c9d05e35c96275f;hp=bdad0c229d783ceb17881dccfe090eec6c61bb8f;hb=a77f9afd05af6862238596327a76aa1beccd036e;hpb=a4309f492e2cecb6ebcdfcb04cd8d70d2dcf9440

diff --git a/poster-tube-lid.scad b/poster-tube-lid.scad
index bdad0c2..2e8209f 100644
--- a/poster-tube-lid.scad
+++ b/poster-tube-lid.scad
@@ -117,6 +117,9 @@ middle_bot_z = top_z - top_thick_middle;
 bayo_entry = bayo_behind / 3.0;
 bayo_top_z = bayo_behind + bayo_gap;
 
+bayo_nom_rad = main_dia/2 + side_thick;
+bayo_real_rad = main_dia/2 + rivet_tall;
+
 rivet_entry_width = rivet_width + side_rivet_gap;
 
 jig_mark_rad = jig_mark + main_dia/2 + jig_thick;
@@ -318,8 +321,8 @@ module RotateProject(x_min, x_max, slice_size, nom_rad, real_rad){
 
 module BayonetCutout(){
   RotateProject(bayo_c[0], bayo_i[0], bayo_slice_size,
-		main_dia/2 + side_thick, 
-		main_dia/2 + rivet_tall)
+		bayo_nom_rad, 
+		bayo_real_rad)
     translate([-0.5 * (bayo_a[0] + bayo_d[0]), 0])
     polygon(bayo_polygon, convexity=10);
 }
@@ -458,6 +461,26 @@ module ImplHeadCupTest(){ ////toplevel
       ImplHeadCup();
 }
 
+module SomeStrap(){
+  // children(0) is to add, (1) subtract
+  difference(){
+    union(){
+      cylinder(r=sm_outer_rad, h=sm_main_width);
+      StrapMountProtrusion(smc_cnr_c_x + sm_closure_cnr,
+			   smc_max_y,
+			   sm_closure_cnr);
+      children(0);
+    }
+    translate([0,0,-1])
+      cylinder(r=sm_inner_rad, h=sm_main_width+2);
+    translate(smc_pos)
+      StrapMountBolt(10);
+    translate(smc_pos)
+      cube([ sm_bolt_tighten_allow, 40,100 ], center=true);
+    children(1);
+  }
+}
+
 module StrapMountBolt(l_delta){ ///toplevel
   // positioned relative to smc_pos
   translate([(smc_bolt_nut_eff_thick - sm_bolt_head_thick)/2,
@@ -492,28 +515,17 @@ module StrapMountProtrusion(half_x, max_y, cnr){
 }
 
 module StrapMount(){ ////toplevel
-  difference(){
-    union(){
-      cylinder(r=sm_outer_rad, h=sm_main_width);
-      StrapMountProtrusion(smc_cnr_c_x + sm_closure_cnr,
-			   smc_max_y,
+  SomeStrap(){
+    rotate([0,0,180]){
+      StrapMountProtrusion(strap_hoop_inside/2 + strap_hoop_thick,
+			   strap_hoop_thick,
 			   sm_closure_cnr);
-      rotate([0,0,180]){
-	StrapMountProtrusion(strap_hoop_inside/2 + strap_hoop_thick,
-			     strap_hoop_thick,
-			     sm_closure_cnr);
-	translate(smc_pos +
-		  [0,0, sm_main_width] +
-		  strap_hoop_thick * [ 0, 0.5, -1.0 ])
-	  StrapHoop();
-      }
+      translate(smc_pos +
+		[0,0, sm_main_width] +
+		strap_hoop_thick * [ 0, 0.5, -1.0 ])
+	StrapHoop();
     }
-    translate([0,0,-1])
-      cylinder(r=sm_inner_rad, h=sm_main_width+2);
-    translate(smc_pos)
-      StrapMountBolt(10);
-    translate(smc_pos)
-      cube([ sm_bolt_tighten_allow, 40,100 ], center=true);
+    union(){ };
   }
 }
 
@@ -571,11 +583,32 @@ module CatchPreDistort(){ /////toplevel
 }
 
 module CatchAssembly(){ /////toplevel
-  scale(sm_inner_rad / 100)
+  rotate([0,0, -0.5 * (cpp1[0] + cpp2[0]) / sm_inner_rad * 360/TAU])
+    translate([0,0, catch_strap_width])
+    scale(sm_inner_rad / 100)
     import(str("poster-tube-lid,CatchPostDistort-fa",
 	       (coarse ? 20 : 1),
 	       ".stl"),
 	   convexity=20);
+
+  SomeStrap(){
+    union(){ }
+    union(){
+      translate([-200, -200, -200])
+	cube([400, 200, 400]);
+    }
+  }
+}
+
+module CatchDemo(){ /////toplevel
+  color("blue") translate([0,0,
+	     -catch_strap_width
+	     -cpp0[1]
+	     ])
+    CatchAssembly();
+  translate([0,0,+side_height
+	     ])
+    Cover();
 }
 
 //ProfilesDemo();