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=7c95db9682b16029b972a150ad1a2e3e69b6f219;hp=8e16bbd9fa93c14d7cb831c5637c745495bcf923;hb=62ab81705a1d49b4b39ed7c5a565e4fd1b9fb787;hpb=72b3e36d237516831427da010a6e9488e19ba291

diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4
index 8e16bbd..7c95db9 100644
--- a/sewing-table.scad.m4
+++ b/sewing-table.scad.m4
@@ -267,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])){
@@ -495,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);
@@ -560,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 ]){
@@ -616,35 +622,6 @@ module Rectangle_TileBase(c) { TileBase(c[0], c[2]); }
 
 function Posts_interpolate_one(c0,c1) = [c0, (c0+c1)/2, c1];
 
-module FitTest_general(c0,sz, dobrace=false){
-  c = Rectangle_corners(c0, sz);
-  brace = [7,7,9];
-  difference(){
-    union(){
-      Rectangle_TileBase(c);
-      if (dobrace) {
-	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 FitTest_Entire(){ ////toplevel
-  FitTest_general([-40,-80], [275,180], dobrace=true);
-}
-
-module FitTest_RearCurve(){ ////toplevel
-  FitTest_general([110,0], [170,100]);
-}
-
 module Tile02(){ ////toplevel
   sz = [100,170];
   c0 = tile02_tr + -sz;
@@ -786,6 +763,7 @@ module Tile00(){ ////toplevel
 	    cnr_posts[3] + [ 0,                             -cty ]
 	    ];
   rcs = R_CNR(c,1);
+  rc2 = [c1bis,c2bis,c[1]];
   difference(){
     union(){
       difference(){
@@ -804,9 +782,39 @@ module Tile00(){ ////toplevel
       RoundEdge(c1bis, c2bis);
     }
     Machine();
+    RoundCornerCut(rc2);
   }
   RoundCornerAdd(rcs);
-  RoundCornerAdd([c1bis,c2bis,c[1]]);
+  RoundCornerAdd(rc2);
+}
+
+module FitTest_general(c0,sz, dobrace=false){
+  c = Rectangle_corners(c0, sz);
+  brace = [7,7,9];
+  difference(){
+    union(){
+      Rectangle_TileBase(c);
+      if (dobrace) {
+	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 FitTest_Entire(){ ////toplevel
+  FitTest_general([-40,-80], [275,180], dobrace=true);
+}
+
+module FitTest_RearCurve(){ ////toplevel
+  FitTest_general([110,0], [170,100]);
 }
 
 module FitTest_FrontCurve(){ ////toplevel
@@ -820,6 +828,48 @@ module FitTest_FrontCurve(){ ////toplevel
   }
 }
 
+module FitTest_PairLink(cut=false){ ////toplevel
+  cy0=-55; cy1=85; cx=127;
+  bar = [10,10];
+  legrad = 12;
+  footrad_min = 4; footrad_max = 6; footrad_depth = 3;
+
+  translate([cx - bar[0]/2, cy0, 0])
+    cube([bar[0], cy1-cy0, bar[1]]);
+  for (endy=[cy0,cy1]) {
+    $fn=32;
+    translate([cx,endy,0]){
+      for (rot=[45,135]) {
+	rotate(rot){
+	  hull(){
+	    for (s=[-1,+1]){
+	      translate([s*legrad,0,0])
+		cylinder(r= footrad_max, h=bar[1]);
+	    }
+	  }
+	}
+      }
+      for (rot=[45:90:315]) {
+	rotate(rot){
+	  translate([legrad,0,0]){
+	    hull(){
+	      cylinder(r= footrad_max, h=1);
+	      translate([0,0,-footrad_depth])
+		cylinder(r= footrad_min, h=1);
+	    }
+	  }
+	}
+      }
+    }
+  }
+}
+
+module FitTest_PairDemo(){ ////toplevel
+  FitTest_PairLink();
+  %FitTest_FrontCurve();
+  %FitTest_RearCurve();
+}
+
 module RoundCornerDemo_plat(cnr){
   mirror([0,0,1]) linear_extrude(height=1) polygon(cnr);
 }
@@ -854,6 +904,7 @@ module Demo(){ ////toplevel
 //Machine_Profile();
 //Machine_NewRearProfile();
 //Machine_NewRearCurve();
+//Machine_NewFrontProfile();
 //Machine_Curves();
 //Machine();
 //FitTest();