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=ef02acce9b03446eb27084d004c42bd6bf7312e7;hp=794252883002726333e9da52a0eab833f23bb9e6;hb=2b081a52f5abaf58b1e4859d818e1ca92b0779fd;hpb=65634175dd5002a6ab030d901cccc8a6f67b5af4

diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4
index 7942528..ef02acc 100644
--- a/sewing-table.scad.m4
+++ b/sewing-table.scad.m4
@@ -94,7 +94,7 @@ rearcurve_double_inrad = 26.10 + 8.04;
 
 reartablet_z = 2.54;
 reartablet_x = 5 + 1;
-reartablet_y = 5;
+reartablet_y = 8;
 
 frontcurve_side_skew = 3.5 / 72;
 frontcurve_avoid_y = 70;
@@ -167,15 +167,22 @@ module TileBase(botleft, topright){
       translate(concat(botleft, [0]))
       cube(concat(size, [tile_th]));
     if (!TEST) {
+      cidsz = topright_post-botleft_post
+	+ [-post_dia,-post_dia]
+	+ [0, thehd[1]];
+      cidszr = [ min(cidsz[0],50), min(cidsz[1],50) ];
+      echo("CID",cidsz,cidszr);
       translate( concat(botleft_post, [ -tile_th ])
-		 + 0.5 * [ post_dia, post_dia, 0 ] )
-	Commitid_BestCount_M( topright_post-botleft_post
-			      + [-post_dia,-post_dia]
-			      + [0, thehd[1]]);
+		 + 0.5 * [ post_dia, post_dia, 0 ]
+		 + 0.5 * concat( cidsz - cidszr, [ 0 ]) )
+	Commitid_BestCount_M(cidszr);
     }
     if (TEST) {
-      translate( concat(botleft + [thehd[0], 0], [0]) )
-	Commitid_BestCount([ size[0] - thehd[0]*2, thehd[1] ]);
+      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]))
@@ -415,7 +422,52 @@ module Machine_Profile(){
   }
 }
 
-module Machine_RearProfile(){
+module Machine_NewRearProfile(){
+  // figures copied out of xfig edit boxes
+  // best not to edit the posbox size if poss - just move it
+  posbox = 10 * ([7.2333,-14.1267] - [-16.2289,40.0289]); // box, Green
+  sideline = -10 * ([-6.2400,13.5600] - [-2.4467,28.2556]); // line, Blue
+  scaleline = 10 * dist2d([-1.1911,-20.4800], [-11.2600,4.0578]); // Green2
+  scaleline_mm = 12+5+10+5+3;
+  sh = -[abs(posbox[0]), abs(posbox[1])];
+  rot = atan2(-sideline[0], sideline[1]);
+  sc = scaleline_mm / scaleline;
+  echo("SH",sh,rot,sc);
+  scale(sc) rotate(rot) translate(sh){
+    import("sewing-table-rear-profile.dxf", convexity=10); // spline, Pink3
+  }
+}
+
+module Machine_NewRearCurve(){
+  slant = atan2(4,210-10);
+  echo("SL",slant);
+  translate([0,0, rearcurve_double_inrad]) rotate([slant,0,0]){
+    translate([ rearcurve_double_inrad, 0, 10 ]){
+      rotate([180,0,0]) rotate([0,0,90]) linear_extrude(height=30){
+	hull(){
+	  Machine_NewRearProfile();
+	  translate([0,-100]) Machine_NewRearProfile();
+	}
+      }
+    }
+    rotate([0,90,0]) rotate([90,0,0]) {
+      intersection(){
+	rotate_extrude(convexity=10, $fn=64)
+	  rotate(90)
+	  translate([ 0, -rearcurve_double_inrad ])
+	  Machine_NewRearProfile();
+	translate([0,0,-500])
+	  cube([500,500,1000]);
+      }
+    }
+    translate([1,0,-rearcurve_double_inrad])
+      rotate([0,-90,0]) rotate([0,0,-90])
+      linear_extrude(height= rearcurve_strt_len + 1)
+      Machine_NewRearProfile();
+  }
+}
+
+module Machine_RearProfile(){ ////toplevel
   intersection(){
     Machine_Profile();
     translate([ -200 + machine_rear_to_front/2, -100 ]) {
@@ -464,31 +516,7 @@ module Machine_Curves(){ ////toplevel
     translate([ rearcurve_strt_len,
 		0,
 		rearcurve_z_slop ]){
-      translate([ 1,
-		  0,
-		  0
-		  ]){
-	rotate([0,-90,0])rotate([0,0,-90]){
-	  linear_extrude(height= rearcurve_strt_len + 1)
-	  Machine_RearProfile();
-	}
-      }
-      translate([ 0,
-		  0,
-		  rearcurve_double_inrad ]) {
-	intersection(){
-	  rotate([90,0,0]){
-	    rotate_extrude(convexity=10, $fn=32) {
-	      rotate([0,0,90]) translate([ 0,
-			  -rearcurve_double_inrad ]) {
-		Machine_RearProfile();
-	      }
-	    }
-	  }
-	  mirror([0,0,1])
-	    translate([0,-75,0]) cube([150,150,150]);
-	}
-      }
+      Machine_NewRearCurve();
     }
   }
 }
@@ -497,7 +525,7 @@ module Machine(){ ////toplevel
   Machine_Arm();
   Machine_Curves();
 }
-  
+
 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
@@ -523,6 +551,27 @@ m4_dnl    expands to two comma-separated corners:
 m4_dnl    that denoted by ix, and the next one anticlockwise
 m4_define(`R_EDGE',`$1[$2],$1[(($2)+1)%4]')
 
+module FitTest(){ ////toplevel
+  sz = [280,180];
+  c0 = [-50,-80];
+  c = Rectangle_corners(c0, sz);
+  brace = [7,7,9];
+  difference(){
+    union(){
+      Rectangle_TileBase(c);
+      translate(concat(c0, [-brace[2] + 0.1])){
+	difference(){
+	  cube(concat(sz,[brace[2]]) - [5,0,0]);
+	  translate(brace + [0,0, -25])
+	    cube(concat(sz, [50]) - brace*2 + [10,0,0]);
+	}
+      }
+      RoundEdge(R_EDGE(c,1));
+    }
+    Machine();
+  }
+}
+
 module Tile02(){ ////toplevel
   sz = [100,170];
   c0 = tile02_tr + -sz;
@@ -686,4 +735,7 @@ module Demo(){ ////toplevel
 //Demo();
 
 //Machine_Profile();
-//Machine_RearProfile();
+//Machine_NewRearProfile();
+//Machine_NewRearCurve();
+//Machine_Curves();
+//Machine();