X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=sewing-table.scad.m4;h=950f69c731d1aba9ca97461d1665a7af67659265;hb=9c3bb91f9adde083a93efe6268885255aa440dad;hp=ceea8b573836240ab90bdee447d8b845ff76ad05;hpb=faa7f5a62df364c974c25308ba4d32f3c3366595;p=reprap-play.git

diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4
index ceea8b5..950f69c 100644
--- a/sewing-table.scad.m4
+++ b/sewing-table.scad.m4
@@ -210,7 +210,13 @@ m4_dnl        c is from Rectangle_corners and
 m4_dnl        ix is a corner number
 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]')
+m4_define(`R_EDGE',`$1[$2], $1[(($2)+1)%4]')
+
+m4_dnl   R_CNR(c,ix)
+m4_dnl        c is from Rectangle_corners and
+m4_dnl        ix is a corner number
+m4_dnl    expands to an array of corners as for RoundCorner
+m4_define(`R_CNR',`[ $1[$2], $1[(($2)+1)%4], $1[(($2)+3)%4] ]')
 
 m4_dnl  INREFFRAME(left_cnr, right_cnr, morevars) { body; }
 m4_define(`INREFFRAME',`
@@ -261,12 +267,6 @@ m4_define(`ROUNDCORNER_VARS',`
 
 module RoundCorner_selector(ci, adj) {
   ROUNDCORNER_VARS;
-  echo("RCS",l_uvec,ctr);
-  %union(){
-    INREFFRAME(this_cnr, right_cnr) {
-      cube(bigr*2 + adj, center=true);
-    }
-  }
   intersection(){
     union(){
       INREFFRAME(ctr3,concat(lp1,[4])){
@@ -400,7 +400,7 @@ module TestPiece1(){ ////toplevel
 	    [   0, 0]
 	    ];
   corners = TestPiece_holes2corners(holes);
-  rcs = [corners[0], corners[1]];
+  rcs = R_CNR(corners,0);
   difference(){
     union(){
       TileBase(corners[0], corners[2]);
@@ -489,6 +489,21 @@ module Machine_NewRearProfile(){
   }
 }
 
+module Machine_NewFrontProfile(){
+  // figures copied out of xfig edit boxes
+  // best not to edit the posbox size if poss - just move it
+  posbox = 10 * ([11.8022,8.0600] - [4.2044,19.1867]); // box, Green
+  refline = 10 * ([7.6778,16.7222] - [27.8689,17.6578]); // line, Blue
+  refline_mm = (11-1)*10;
+  sh = -[abs(posbox[0]), abs(posbox[1])];
+  rot = atan2(-refline[0], refline[1]);
+  sc = refline_mm / vectorlen2d(refline);
+  //echo("SH",sh,rot,sc);
+  mirror([1,0]) scale(sc) rotate(rot+90) translate(sh){
+    import("sewing-table-front-profile.dxf", convexity=10); // spline, Pink3
+  }
+}
+
 module Machine_NewRearCurve(){
   slant = atan2(4,210-10);
   //echo("SL",slant);
@@ -554,18 +569,15 @@ module Machine_Curves(){ ////toplevel
   translate([ tile01_tr[0] - cutout_l_end_x + rearedge_len,
 	      cutout_tile11_y,
 	      frontcurve_z_slop ]){
-    translate([ 0, -first_front[0] , 0 ])
+    translate([0, -machine_rear_to_front, 0])
       multmatrix([[1, -frontcurve_side_skew, 0, 0],
 		  [0,  1,   0, 0],
 		  [0,  0,   1, 0],
 		  [0,  0,   0, 1]])
-      translate([ 0, first_front[0] , 0 ])
-      mirror([1,0,0]){
-      rotate([0,-90,0])rotate([0,0,-90]){
-	linear_extrude(height= 200)
-	  Machine_FrontProfile();
-      }
-    }
+      mirror([1,0,0]) rotate([0,-90,0])rotate([0,0,-90])
+      linear_extrude(height= 200)
+      Machine_NewFrontProfile();
+
     translate([ rearcurve_strt_len,
 		0,
 		rearcurve_z_slop ]){
@@ -644,7 +656,7 @@ module Tile02(){ ////toplevel
   c0 = tile02_tr + -sz;
   c = Rectangle_corners(c0, sz);
   posts = Rectangle_corners2posts(c);
-  rcs = [R_EDGE(c,0)];
+  rcs = R_CNR(c,0);
   difference(){
     union(){
       Rectangle_TileBase(c);
@@ -664,7 +676,7 @@ module Tile12(){ ////toplevel
   c0 = tile02_tr + [-sz[0], 0];
   c = Rectangle_corners(c0, sz);
   posts = Rectangle_corners2posts(c);
-  rcs = [R_EDGE(c,3)];
+  rcs = R_CNR(c,3);
   difference(){
     union(){
       Rectangle_TileBase(c);
@@ -744,7 +756,7 @@ module Tile10(){ ////toplevel
 	    cnr_posts[1] + [ 0,                             rcy ],
 	    cnr_posts[2],
 	    cnr_posts[3] ];
-  rcs = [R_EDGE(c,2)];
+  rcs = R_CNR(c,2);
   difference(){
     union(){
       Rectangle_TileBase(c);
@@ -779,7 +791,8 @@ module Tile00(){ ////toplevel
 	    cnr_posts[2] + [ -sz[0] + rearedge_len - cutout_l_end_x, -cty ],
 	    cnr_posts[3] + [ 0,                             -cty ]
 	    ];
-  rcs = [R_EDGE(c,1)];
+  rcs = R_CNR(c,1);
+  rc2 = [c1bis,c2bis,c[1]];
   difference(){
     union(){
       difference(){
@@ -798,9 +811,10 @@ module Tile00(){ ////toplevel
       RoundEdge(c1bis, c2bis);
     }
     Machine();
+    RoundCornerCut(rc2);
   }
   RoundCornerAdd(rcs);
-  RoundCornerAdd([c1bis,c2bis,c[1]]);
+  RoundCornerAdd(rc2);
 }
 
 module FitTest_FrontCurve(){ ////toplevel
@@ -848,6 +862,7 @@ module Demo(){ ////toplevel
 //Machine_Profile();
 //Machine_NewRearProfile();
 //Machine_NewRearCurve();
+//Machine_NewFrontProfile();
 //Machine_Curves();
 //Machine();
 //FitTest();