X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=sewing-table.scad.m4;h=f89859cb197796621aecc9bfd1c17e612da27a8c;hp=8dc10824e2fa81a396ae68a85719321b8ec01da9;hb=c1294c0ded45cab6ef4bc88d609632a7ceafb505;hpb=25a51b01b1a43c51fd4ccfd505c29424a17f28de

diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4
index 8dc1082..f89859c 100644
--- a/sewing-table.scad.m4
+++ b/sewing-table.scad.m4
@@ -100,6 +100,9 @@ frontcurve_side_skew = 3.5 / 72;
 frontcurve_avoid_y = 70;
 frontcurve_z_slop = 0.75;
 
+frontcurve_strt_len = 60;
+frontcurve_dualcurve_angle = 90 - 65;
+
 // calculated
 
 TEST = false;
@@ -183,6 +186,8 @@ module TileBase(botleft, topright){
       crossoff = tile_hard_edge_hole_dist + POST_TCROSSSZ/2;
       cidsz = [ thehd[0], size[1] - 2*crossoff ];
       cidszr = [ cidsz[0], min(cidsz[1], 50) ];
+      translate( concat(botleft + [0, crossoff] + (cidsz-cidszr)/2, [0]) )
+	Commitid_BestCount(cidszr);
       difference(){
 	mirror([0,0,1]) {
 	  translate(concat(botleft + [test_edge,test_edge], [test_tile_th]))
@@ -191,11 +196,9 @@ module TileBase(botleft, topright){
 	    cube(concat(topright_post-botleft_post, [tile_th+2]));
 	}
 	shufflesz = max(test_edge, tile_hard_edge_hole_dist)*2;
-	hull(){ // poor man's minkowski
-	  for (xs=[-1,1]) for (ys=[-1,1]) for (zs=[-1,1]) {
-	    translate([xs,ys,zs] * shufflesz)
-	      Machine();
-	  }
+	minkowski(){
+	  MachineEnvelope();
+	  cube(shufflesz, center=true);
 	}
       }
     }
@@ -235,10 +238,11 @@ module RoundEdge(left_cnr, right_cnr) {
 }
 
 module RoundCornerCut(ci) {
-  // ci should be [this_cnr, right_cnr]
+  // ci should be [this_cnr, right_cnr, left_cnr]
   // where right_cnr is to the right (ie, anticlockwise)
   this_cnr = ci[0];
   right_cnr = ci[1];
+  left_cnr = ci[2];
   offr= round_cnr_rad - round_edge_rad;
   INREFFRAME(this_cnr, right_cnr) INREFFRAME_EDGE {
     difference(){
@@ -252,6 +256,7 @@ module RoundCornerCut(ci) {
 module RoundCornerAdd(ci) {
   this_cnr = ci[0];
   right_cnr = ci[1];
+  left_cnr = ci[2];
   bigr = round_cnr_rad - round_edge_rad;
   INREFFRAME(this_cnr, right_cnr) INREFFRAME_EDGE {
     intersection(){
@@ -411,7 +416,7 @@ module Machine_Profile(){
 		machine_front_profile);
   skew_angle = atan2( first_front[1] - first_rear[1],
 		      first_front[0] - first_rear[0] );
-  echo(below_point, pol, skew_angle);
+  //echo(below_point, pol, skew_angle);
   hull(){
     for (z=[0,-40]) {
       translate([0,z]) {
@@ -435,7 +440,7 @@ module Machine_NewRearProfile(){
   sh = -[abs(posbox[0]), abs(posbox[1])];
   rot = atan2(-sideline[0], sideline[1]);
   sc = scaleline_mm / scaleline;
-  echo("SH",sh,rot,sc);
+  //echo("SH",sh,rot,sc);
   scale(sc) rotate(rot) translate(sh){
     import("sewing-table-rear-profile.dxf", convexity=10); // spline, Pink3
   }
@@ -443,7 +448,7 @@ module Machine_NewRearProfile(){
 
 module Machine_NewRearCurve(){
   slant = atan2(4,210-10);
-  echo("SL",slant);
+  //echo("SL",slant);
   translate([0,0, rearcurve_double_inrad]) rotate([slant,0,0]){
     translate([ rearcurve_double_inrad,
 		0,
@@ -531,6 +536,19 @@ module Machine(){ ////toplevel
   Machine_Curves();
 }
 
+module MachineEnvelope(){
+  // used for testing
+  p_arm_bl = [-cutout_tile11_x, -cutout_tile01_y];
+  y_arm_t  = cutout_tile11_y;
+  p_crv_fl = p_arm_bl + [rearedge_len, -frontcurve_avoid_y];
+  y_crv_b  = y_arm_t + rearcurve_avoid_y;
+
+  translate([0,0,-50]) linear_extrude(height= 100){
+    translate(p_arm_bl) square([400, y_arm_t] - p_arm_bl);
+    translate(p_crv_fl) square([400, y_crv_b] - p_crv_fl);
+  }
+}
+
 function Rectangle_corners(c0, sz) =
   // returns the corners of a rectangle from c0 to c0+sz
   // if sz is positive, the corners are anticlockwise starting with c0
@@ -585,10 +603,6 @@ module FitTest_RearCurve(){ ////toplevel
   FitTest_general([110,0], [170,100]);
 }
 
-module FitTest_FrontCurve(){ ////toplevel
-  FitTest_general([110,-80], [170,80]);
-}
-
 module Tile02(){ ////toplevel
   sz = [100,170];
   c0 = tile02_tr + -sz;
@@ -713,6 +727,13 @@ module Tile00(){ ////toplevel
   sz = [250,170];
   c0 = tile01_tr + [0,-sz[1]];
   c = Rectangle_corners(c0, sz);
+
+  // the edge c[1]..c[2] needs a diagonal chunk, from c1bis to c2bis
+  c2bis = [ -cutout_l_end_x + rearedge_len + frontcurve_strt_len, c[2][1] ];
+  c1bis = [ c[1][0],
+	    c[2][1] -
+	    (c[2][0] - c2bis[0]) * tan(90 - frontcurve_dualcurve_angle) ];
+
   cnr_posts = Rectangle_corners2posts(c);
   cty = cutout_tile01_y;
   rcy = cty + frontcurve_avoid_y;
@@ -725,16 +746,36 @@ module Tile00(){ ////toplevel
   rcs = [R_EDGE(c,1)];
   difference(){
     union(){
-      Rectangle_TileBase(c);
-      Posts(posts);
-      RoundEdge(R_EDGE(c,0));
-      RoundEdge(R_EDGE(c,1));
-      InterlockEdge(tile_01_00_cnr, c[0]);
+      difference(){
+	union(){
+	  Rectangle_TileBase(c);
+	  Posts(posts);
+	  RoundEdge(R_EDGE(c,0));
+	  RoundEdge(c[1], c1bis);
+	  InterlockEdge(tile_01_00_cnr, c[0]);
+	}
+	RoundCornerCut(rcs);
+	translate([0,0,-20]) linear_extrude(height=40) {
+	  polygon([ c1bis, c1bis + [50,0], c2bis + [50,0], c2bis ]);
+	}
+      }
+      RoundEdge(c1bis, c2bis);
     }
-    RoundCornerCut(rcs);
     Machine();
   }
   RoundCornerAdd(rcs);
+  RoundCornerAdd([c1bis,c2bis,c[1]]);
+}
+
+module FitTest_FrontCurve(){ ////toplevel
+  p0 = [110,-80];
+  sz = [170,80];
+  intersection() {
+    Tile00();
+    translate([0,0,-8]) linear_extrude(height=18) {
+      translate(p0) square(sz);
+    }
+  }
 }
 
 module Demo(){ ////toplevel
@@ -757,3 +798,4 @@ module Demo(){ ////toplevel
 //Machine_Curves();
 //Machine();
 //FitTest();
+//MachineEnvelope();