From 37588c8186268edaa3817713f1fe0accc2696a71 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 6 Jun 2017 19:36:40 +0100 Subject: [PATCH 1/1] sewing-table: NewEndProfile: remove some debugging and old junk --- sewing-table.scad.m4 | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4 index f9b32af..06302ee 100644 --- 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); @@ -473,23 +473,14 @@ 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]]){ -- 2.30.2