sewing-table: NewEndProfile: scale to meet cutout_l_end_y

[reprap-play.git] / sewing-table.scad.m4

diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4
index ea742d539b8e1efa5a3e736ffbae11f882f5f063..74aea124a984847d863e5b397833fee84fe964d1 100644 (file)
--- a/sewing-table.scad.m4
+++ b/sewing-table.scad.m4
@@ -460,7 +460,7 @@ 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
+  // NB that y coords are reversed - xfig origin is at bottom left
   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);
@@ -468,35 +468,32 @@ module Machine_NewEndProfile(){
                    [[50.3800,21.9578], [50.1933,14.4933]]]; // lines, Blue3
   baseline = 10 * [[8.4000,18.0822], [50.3000,17.6822]]; // line, Green2
 
+  rot_adj = -0.38;
+
   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])')
+  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]]){
+
+  ellen = sc * dist2d(endline[0],endline[1]);
+  scy = cutout_l_end_y / ellen;
+
+  scale([scy,1]) scale(sc) rotate(rot + rot_adj) 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 * (baseline[0] - posbox)) square([50,10]);
 
-  %translate(1 * (endline[0] - posbox)) square([50,10]);
-  %translate(1 * (endline[1] - 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]);
@@ -508,6 +505,15 @@ m4_define(`MNEP_ELP',
   }
 }
 
+module Machine_NewEndProfileDemo(){ ////toplevel
+    translate([0,5,0])                             Machine_NewEndProfile();
+    translate([0,5,1]) color("blue") mirror([1,0]) Machine_NewEndProfile();
+  mirror([0,1,0]){
+    translate([0,5, 0])                             Machine_NewEndProfile();
+    translate([0,5,-1]) color("blue") mirror([1,0]) Machine_NewEndProfile();
+  }
+}
+
 module Machine_NewRearCurve(){
   slant = atan2(4,210-10);
   //echo("SL",slant);
@@ -989,6 +995,7 @@ module Demo(){ ////toplevel
 //Machine_NewRearCurve();
 //Machine_NewFrontProfile();
 //Machine_NewEndProfile();
+//Machine_NewEndProfileDemo();
 //Machine_Curves();
 //Machine();
 //FitTest();