X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=poster-tube-lid.scad;h=2e11f7949079ddf22289ab82dfc780bf4f0db240;hb=c1500ad488993e64e90ddd5aeb58ce75d91a889e;hp=8528673b9517dea6285a4f1e6e7e8fc680679fee;hpb=92eb30d719e83005a6e4f881988b968c419c5342;p=reprap-play.git

diff --git a/poster-tube-lid.scad b/poster-tube-lid.scad
index 8528673..2e11f79 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;
@@ -142,7 +145,10 @@ catch_cr = catch_knob_dia/2 + catch_stem_beside_gap;
 catch_strap_width = sm_main_width;
 catch_strap_thick = sm_main_thick;
 catch_stem_end_h = catch_stem_h;
-catch_pin_width = rivet_entry_width - catch_pin_gap;
+catch_pin_width = (rivet_entry_width * sm_inner_rad / bayo_nom_rad)
+		   - catch_pin_gap;
+
+echo("R ", sm_inner_rad, bayo_real_rad, bayo_nom_rad);
 
 cppy6 = -catch_strap_width/2;
 cppxC = 0.34 * sm_inner_rad * TAU;
@@ -318,8 +324,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);
 }
@@ -580,11 +586,61 @@ 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();
+}
+
+module CatchDemoS(){ /////toplevel
+  color("blue") translate([0,0,
+	     -catch_strap_width
+	     -cpp0[1]
+	     ])
+    CatchAssembly();
+  intersection(){
+    translate([0,0,+side_height
+	       ])
+      Cover();
+    mirror([0,1,0]) translate([-250,33,0]) cube([500,500,500]);
+  }
+  color("black")
+    translate([0,-33,0])
+    cube([6.15, 2,2], center=true);
+}
+
+module CatchPinProfileDemo(){ /////toplevel
+  echo("G ",
+       cpp2[0] - cpp1[0],
+       bayo_n[0] - bayo_e[0]);
+  color("blue") translate([-cpp2[0],
+			   -cpp2[1],
+			   +1,
+	     ])
+    CatchCoreProfile();
+  polygon(bayo_polygon, convexity=10);
 }
 
 //ProfilesDemo();