X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=sewing-table.scad.m4;h=2baad77a57b7ef1534d6ac73fb135e1a56087adb;hb=972e52b1713b17a89c121ee0a9d30290d0563434;hp=794252883002726333e9da52a0eab833f23bb9e6;hpb=65634175dd5002a6ab030d901cccc8a6f67b5af4;p=reprap-play.git

diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4
index 7942528..2baad77 100644
--- a/sewing-table.scad.m4
+++ b/sewing-table.scad.m4
@@ -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,11 @@ module Machine_Profile(){
   }
 }
 
-module Machine_RearProfile(){
+module Machine_NewRearProfile(){ ////toplevel
+  import("sewing-table-rear-profile.dxf", convexity=10);
+}
+
+module Machine_RearProfile(){ ////toplevel
   intersection(){
     Machine_Profile();
     translate([ -200 + machine_rear_to_front/2, -100 ]) {
@@ -497,7 +508,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 +534,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;