X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=sewing-table.scad.m4;h=ea742d539b8e1efa5a3e736ffbae11f882f5f063;hb=de51ac460d5d5c1f53bfb4ec03c3b749beba78fc;hp=365635a541b07ea61c3c9d39abc11225232e570a;hpb=4818254213688a2eaf749ccfe014bd9d6b19f4b6;p=reprap-play.git

diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4
index 365635a..ea742d5 100644
--- a/sewing-table.scad.m4
+++ b/sewing-table.scad.m4
@@ -104,7 +104,7 @@ thehd_tl = [ -thehd_tr[0], thehd_tr[1] ];
 thehd_bl = -thehd_tr;
 thehd_br = -thehd_tl;
 
-tablet_z_slop = rearcurve_z_slop;
+tablet_z_slop = 0.25;
 
 interlock_rad = interlock_dia/2;
 interlock_negative_rad = interlock_rad + 0.125;
@@ -458,6 +458,56 @@ module Machine_NewFrontProfile(){
   }
 }
 
+module Machine_NewEndProfile(){
+  // figures copied out of xfig edit boxes
+  // best not to edit the posbox size if poss - just move it
+  posboxs = 10 * [[4.0400,17.7956], [11.6622,32.5511]]; // box, Pink3
+  refline = 10 * ([8.4000,22.6000] - [50.3000,22.2000]); // line, Blue
+  refline_mm = 10 * (11 - 2.5);
+  sidelines = 10 * [[[9.0889,20.6178], [8.9644,14.6889]],
+		    [[50.3800,21.9578], [50.1933,14.4933]]]; // lines, Blue3
+  baseline = 10 * [[8.4000,18.0822], [50.3000,17.6822]]; // line, Green2
+
+  posbox = [min(posboxs[0][0],posboxs[1][0]),
+	    max(posboxs[0][1],posboxs[1][1])];
+
+m4_define(`MNEP_ELP',
+   `line_intersection_2d(baseline[0],baseline[1],
+                         sidelines[$1][0],sidelines[$1][1])')
+  endline = [MNEP_ELP(0),MNEP_ELP(1)];
+  echo("PBS",posboxs,"PB",posbox,"SL00",sidelines[0][0]);
+
+  //%translate(posbox) square(10);
+
+  rot = atan2(-refline[1], -refline[0]);
+  sc = refline_mm / vectorlen2d(refline);
+  sh = (0.5 * (endline[0] + endline[1])) - posbox;
+//  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[0],-sh[1]]){
+
+    mirror([0,1]){
+  //%translate(1 * (posboxs[0] - posbox)) square(50);
+  //%translate(1 * (posboxs[1] - posbox)) square(50);
+  %translate(1 * (baseline[0] - posbox)) square([50,10]);
+
+  %translate(1 * (endline[0] - posbox)) square([50,10]);
+  %translate(1 * (endline[1] - posbox)) square([50,10]);
+
+//  %translate(1 * (sidelines[0][0] - posbox)) square([10,50]);
+//  %translate(1 * (sidelines[0][1] - posbox)) square([10,50]);
+//  %translate(1 * (sidelines[1][0] - posbox)) square([10,50]);
+//  %translate(1 * (sidelines[1][1] - posbox)) square([10,50]);
+    }
+
+    import("sewing-table-end-profile.dxf", convexity=10); // spline, Pink3
+  }
+}
+
 module Machine_NewRearCurve(){
   slant = atan2(4,210-10);
   //echo("SL",slant);
@@ -529,7 +579,7 @@ module TestStrapSlots(){
     translate(concat(pos,[0]))
       for (mx = [0,1]) mirror([mx,0,0]) {
 	  translate([ pegwidth/2, -teststrap[1]/2, -20 ])
-	    #cube(concat(teststrap,[40]));
+	    cube(concat(teststrap,[40]));
 	}
   }
 }
@@ -846,18 +896,20 @@ module FitTest_FrontCurve(){ ////toplevel
       }
     }
     FitTest_PairLink(true);
+    TestStrapSlots();
   }
 }
 
 module FitTest_Entire(){ ////toplevel
-  p0 = [-40,-80];
-  szrear = [270,180];
-  szfront = [250,szrear[1]];
+  p0 = [-33,-80];
+  szrear = [263,180];
+  szfront = [243,szrear[1]];
   difference(){
     FitTest_general(p0, szrear, dobrace=true, bracexx=0);
     FitTest_PairLink(true);
     translate(concat(p0,[0]) + [szfront[0],-10,-40])
       cube([100, -p0[1], 80]);
+    TestStrapSlots();
   }
   intersection(){
     FitTest_RearCurve();
@@ -871,6 +923,17 @@ module FitTest_EntireDemo(){ ////toplevel
   //%Tile00();
 }
 
+module FitTest_EndEnd(){ ////toplevel
+  p0 = [-32,-32];
+  sz = [188,113];
+  sz2 = [168,100];
+  difference(){
+    FitTest_general(p0, sz);
+    translate([ p0[0] -1, p0[1]+sz2[1], -10])
+      cube([ sz2[0] +1, 50, 20 ]);
+  }
+}
+
 module FitTest_PairDemo(){ ////toplevel
   sh=[-90,-15,0];
   translate(sh){
@@ -925,6 +988,7 @@ module Demo(){ ////toplevel
 //Machine_NewRearProfile();
 //Machine_NewRearCurve();
 //Machine_NewFrontProfile();
+//Machine_NewEndProfile();
 //Machine_Curves();
 //Machine();
 //FitTest();