sewing-table: NewEndProfile: wip profile

diff --git a/sewing-table-end-profile.fig b/sewing-table-end-profile.fig
index ed60e347af3a5ec4a438b103c126139889e69239..2250e9448c1f9c3f20af94f1553437231da98f65 100644 (file)
--- a/sewing-table-end-profile.fig
+++ b/sewing-table-end-profile.fig
@@ -7,19 +7,19 @@ A4
 Single
 -2
 1200 2
+2 5 0 1 0 -1 60 -1 -1 0.000 0 0 -1 0 0 5
+       0 sewing-table-end-profile-photo.jpg
+        2655 6615 23743 6615 23743 12787 2655 12787 2655 6615
 2 1 0 1 1 7 50 -1 -1 0.000 0 0 -1 0 0 2
         3780 10170 22635 9990
+2 1 0 2 9 7 50 -1 -1 0.000 0 0 -1 0 0 2
+        22671 9881 22587 6522
 2 1 0 3 14 7 50 -1 -1 0.000 0 0 -1 0 0 2
         3780 8137 22635 7957
 2 1 0 2 9 7 50 -1 -1 0.000 0 0 -1 0 0 2
-        22671 9881 22587 6522
+        4090 9278 4034 6610
 2 2 0 2 28 7 50 -1 -1 0.000 0 0 -1 0 0 5
         1818 8008 5248 8008 5248 14648 1818 14648 1818 8008
-2 1 0 2 9 7 50 -1 -1 0.000 0 0 -1 0 0 2
-        4090 9278 4034 6610
-2 5 0 1 0 -1 60 -1 -1 0.000 0 0 -1 0 0 5
-       0 sewing-table-end-profile-photo.jpg
-        2655 6615 23743 6615 23743 12787 2655 12787 2655 6615
 3 1 0 1 6 7 40 -1 -1 0.000 0 0 0 17
         8544 8080 12341 8071 16290 7965 19845 7830 22214 7727 22560 7582
         22605 7370 22539 6869 22548 6611 12555 4725 4252 5873 4101 6534

diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4
index 82a838fd7f4082b4368bb3ef273c624d94e9ad45..ea742d539b8e1efa5a3e736ffbae11f882f5f063 100644 (file)
--- a/sewing-table.scad.m4
+++ b/sewing-table.scad.m4
@@ -461,18 +461,51 @@ 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
-//  posbox = 10 * ([7.2333,-14.1267] - [-16.2289,40.0289]); // box, Green
-  refline = 10 * ([-6.2400,13.5600] - [-2.4467,28.2556]); // line, Blue
+  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){
+  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(){