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=b5151ecb1fd192c5f5a57c5cdf59808203db189a;hp=f9b32af5aad5a697c87d7d42ea0e7e073cfb115a;hb=a81175f044b955785e8dce6a19e9b8bac07bbf03;hpb=eb93f42ba750a31e6695a48a4eb2d96104d078fd

diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4
index f9b32af..b5151ec 100644
--- a/sewing-table.scad.m4
+++ b/sewing-table.scad.m4
@@ -39,6 +39,7 @@ cutout_l_end_x_slop = 0.25;
 cutout_l_end_x = 22;
 cutout_l_end_y = machine_rear_to_front;
 cutout_l_end_curve = 1;
+cutout_l_end_new_x_slop = -1.4;
 cutout_l_end_y_total = cutout_l_end_y
   + cutout_l_end_y_front_slop + cutout_l_end_y_rear_slop;
 
@@ -460,7 +461,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);
@@ -473,25 +474,19 @@ module Machine_NewEndProfile(){
   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 + rot_adj) translate(-[sh[0],-sh[1]]){
+  ellen = sc * dist2d(endline[0],endline[1]);
+  scy = cutout_l_end_y_total / 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);
@@ -520,6 +515,20 @@ module Machine_NewEndProfileDemo(){ ////toplevel
   }
 }
 
+module Machine_NewArm(){
+  translate([0,0,-30]) linear_extrude(height=60) {
+    translate(tile01_tr + [ -cutout_l_end_x + cutout_l_end_new_x_slop,
+			    (-cutout_tile01_y + cutout_tile11_y)/2 ]){
+      rotate(-90){
+	hull(){
+	  for (d=[0,400]) 
+	    translate([0,d]) Machine_NewEndProfile();
+	}
+      }
+    }
+  }
+}
+
 module Machine_NewRearCurve(){
   slant = atan2(4,210-10);
   //echo("SL",slant);
@@ -615,7 +624,7 @@ module Machine(){ ////toplevel
 
 module MachineEnvelope(){
   // used for testing
-  p_arm_bl = [-cutout_tile11_x, -cutout_tile01_y];
+  p_arm_bl = [-cutout_l_end_x, -cutout_tile01_y];
   y_arm_t  = cutout_tile11_y;
   p_crv_fl = p_arm_bl + [rearedge_len, -frontcurve_avoid_y];
   y_crv_b  = y_arm_t + rearcurve_avoid_y;
@@ -684,7 +693,7 @@ module Tile12(){ ////toplevel
   RoundCornerAdd(rcs);
 }
 
-tile_01_11_cnr = tile01_tr + [-cutout_tile11_x, 0];
+tile_01_11_cnr = tile01_tr + [-cutout_l_end_x, 0];
 tile_11_10_cnr = tile01_tr + [0, cutout_tile11_y];
 tile_01_00_cnr = tile01_tr - [0, cutout_tile01_y];
 
@@ -695,7 +704,7 @@ module Tile11(){ ////toplevel
   cnr_posts = Rectangle_corners2posts(c);
   posts = concat(
 		 Posts_interpolate_one(cnr_posts[0],
-				       cnr_posts[1] - [cutout_tile11_x, 0]),
+				       cnr_posts[1] - [cutout_l_end_x, 0]),
 		 [ cnr_posts[1] + [0, cutout_tile11_y],
 		   cnr_posts[2],
 		   cnr_posts[3]
@@ -721,7 +730,7 @@ module Tile01(){ ////toplevel
   posts = concat(
 		 Posts_interpolate_one(R_EDGE(cnr_posts,0)),
 		 [ cnr_posts[2] + [0, -cutout_tile01_y] ],
-		 Posts_interpolate_one(cnr_posts[2] - [cutout_tile11_x, 0],
+		 Posts_interpolate_one(cnr_posts[2] - [cutout_l_end_x, 0],
 				       cnr_posts[3])
 		 );
   difference(){