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=bdc93a072411fa9dd7ce252ac53c5f06db12acb6;hp=4befae1df03c4003c787e3f9f587f348e8fce5a7;hb=0e08c1470d155365d31aa6fdb0d3c04f8b41899f;hpb=1ff8367f65e69e951740404ece918fa7ffcfb3a2 diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4 index 4befae1..bdc93a0 100644 --- a/sewing-table.scad.m4 +++ b/sewing-table.scad.m4 @@ -205,6 +205,19 @@ module TileBase(botleft, topright){ } } +m4_dnl R_EDGE(c,ix) +m4_dnl c is from Rectangle_corners and +m4_dnl ix is a corner number +m4_dnl expands to two comma-separated corners: +m4_dnl that denoted by ix, and the next one anticlockwise +m4_define(`R_EDGE',`$1[$2], $1[(($2)+1)%4]') + +m4_dnl R_CNR(c,ix) +m4_dnl c is from Rectangle_corners and +m4_dnl ix is a corner number +m4_dnl expands to an array of corners as for RoundCorner +m4_define(`R_CNR',`[ $1[$2], $1[(($2)+1)%4], $1[(($2)+3)%4] ]') + m4_dnl INREFFRAME(left_cnr, right_cnr, morevars) { body; } m4_define(`INREFFRAME',` length_vec = ($2) - ($1); @@ -241,13 +254,36 @@ m4_define(`ROUNDCORNER_VARS',` this_cnr = ci[0]; right_cnr = ci[1]; left_cnr = ci[2]; - bigr= round_cnr_rad - round_edge_rad + bigr= round_cnr_rad - round_edge_rad; + l_uvec = unitvector2d(left_cnr - this_cnr); + r_uvec = unitvector2d(right_cnr - this_cnr); + lp1 = left_cnr + clockwise2d(l_uvec) * bigr; + lp2 = this_cnr + clockwise2d(l_uvec) * bigr; + lp3 = this_cnr - clockwise2d(r_uvec) * bigr; + lp4 = right_cnr - clockwise2d(r_uvec) * bigr; + ctr = line_intersection_2d(lp1,lp2,lp3,lp4); + ctr3 = concat(ctr,[0]) ') module RoundCorner_selector(ci, adj) { ROUNDCORNER_VARS; - INREFFRAME(this_cnr, right_cnr) INREFFRAME_EDGE { - cube(bigr*2 + adj, center=true); + intersection(){ + union(){ + INREFFRAME(ctr3,concat(lp1,[4])){ + translate([0,0,-bigr]) linear_extrude(height=bigr*2) { + translate([-bigr*2 + adj, -bigr]) + square([bigr*2, bigr*3]); + } + } + } + union(){ + INREFFRAME(ctr3,concat(lp4,[0])){ + translate([0,0,-bigr]) linear_extrude(height=bigr*2) { + translate([-bigr*2, -bigr*2]) + square([bigr*2 + adj, bigr*3]); + } + } + } } } @@ -257,10 +293,8 @@ module RoundCornerCut(ci) { ROUNDCORNER_VARS; difference(){ RoundCorner_selector(ci, -0.1); - INREFFRAME(this_cnr, right_cnr) INREFFRAME_EDGE { - translate([bigr, bigr, 0]) - cylinder(center=true, h=20, r= bigr); - } + translate(ctr3) + cylinder(center=true, h=20, r= bigr); } } @@ -268,15 +302,16 @@ module RoundCornerAdd(ci) { ROUNDCORNER_VARS; intersection(){ RoundCorner_selector(ci, +0.1); - INREFFRAME(this_cnr, right_cnr) INREFFRAME_EDGE { - translate([bigr, bigr, 0]) + INREFFRAME_EDGE { + translate(ctr3){ rotate_extrude(convexity=10, $fn=50) - translate([bigr, 0]) - difference(){ + translate([bigr, 0]) + difference(){ circle(r= round_edge_rad, $fn=50); mirror([1,1]) square([20,20]); - } + } + } } } } @@ -365,7 +400,7 @@ module TestPiece1(){ ////toplevel [ 0, 0] ]; corners = TestPiece_holes2corners(holes); - rcs = [corners[0], corners[1]]; + rcs = R_CNR(corners,0); difference(){ union(){ TileBase(corners[0], corners[2]); @@ -454,6 +489,21 @@ module Machine_NewRearProfile(){ } } +module Machine_NewFrontProfile(){ + // figures copied out of xfig edit boxes + // best not to edit the posbox size if poss - just move it + posbox = 10 * ([11.8022,8.0600] - [4.2044,19.1867]); // box, Green + refline = 10 * ([7.6778,16.7222] - [27.8689,17.6578]); // line, Blue + refline_mm = (11-1)*10; + sh = -[abs(posbox[0]), abs(posbox[1])]; + rot = atan2(-refline[0], refline[1]); + sc = refline_mm / vectorlen2d(refline); + //echo("SH",sh,rot,sc); + mirror([1,0]) scale(sc) rotate(rot+90) translate(sh){ + import("sewing-table-front-profile.dxf", convexity=10); // spline, Pink3 + } +} + module Machine_NewRearCurve(){ slant = atan2(4,210-10); //echo("SL",slant); @@ -531,6 +581,16 @@ module Machine_Curves(){ ////toplevel Machine_FrontProfile(); } } + + %translate([0, -machine_rear_to_front, 0]) + multmatrix([[1, -frontcurve_side_skew, 0, 0], + [0, 1, 0, 0], + [0, 0, 1, 0], + [0, 0, 0, 1]]) + mirror([1,0,0]) rotate([0,-90,0])rotate([0,0,-90]) + linear_extrude(height= 200) + Machine_NewFrontProfile(); + translate([ rearcurve_strt_len, 0, rearcurve_z_slop ]){ @@ -575,13 +635,6 @@ module Rectangle_TileBase(c) { TileBase(c[0], c[2]); } function Posts_interpolate_one(c0,c1) = [c0, (c0+c1)/2, c1]; -m4_dnl R_EDGE(c,ix) -m4_dnl c is from Rectangle_corners and -m4_dnl ix is a corner number -m4_dnl expands to two comma-separated corners: -m4_dnl that denoted by ix, and the next one anticlockwise -m4_define(`R_EDGE',`$1[$2],$1[(($2)+1)%4]') - module FitTest_general(c0,sz, dobrace=false){ c = Rectangle_corners(c0, sz); brace = [7,7,9]; @@ -616,7 +669,7 @@ module Tile02(){ ////toplevel c0 = tile02_tr + -sz; c = Rectangle_corners(c0, sz); posts = Rectangle_corners2posts(c); - rcs = [R_EDGE(c,0)]; + rcs = R_CNR(c,0); difference(){ union(){ Rectangle_TileBase(c); @@ -636,7 +689,7 @@ module Tile12(){ ////toplevel c0 = tile02_tr + [-sz[0], 0]; c = Rectangle_corners(c0, sz); posts = Rectangle_corners2posts(c); - rcs = [R_EDGE(c,3)]; + rcs = R_CNR(c,3); difference(){ union(){ Rectangle_TileBase(c); @@ -716,7 +769,7 @@ module Tile10(){ ////toplevel cnr_posts[1] + [ 0, rcy ], cnr_posts[2], cnr_posts[3] ]; - rcs = [R_EDGE(c,2)]; + rcs = R_CNR(c,2); difference(){ union(){ Rectangle_TileBase(c); @@ -751,7 +804,8 @@ module Tile00(){ ////toplevel cnr_posts[2] + [ -sz[0] + rearedge_len - cutout_l_end_x, -cty ], cnr_posts[3] + [ 0, -cty ] ]; - rcs = [R_EDGE(c,1)]; + rcs = R_CNR(c,1); + rc2 = [c1bis,c2bis,c[1]]; difference(){ union(){ difference(){ @@ -770,9 +824,10 @@ module Tile00(){ ////toplevel RoundEdge(c1bis, c2bis); } Machine(); + RoundCornerCut(rc2); } RoundCornerAdd(rcs); - RoundCornerAdd([c1bis,c2bis,c[1]]); + RoundCornerAdd(rc2); } module FitTest_FrontCurve(){ ////toplevel @@ -791,10 +846,11 @@ module RoundCornerDemo_plat(cnr){ } module RoundCornerDemo(){ ////toplevel - cnr = [ [0,0], [15,0], [-10,10] ]; + cnr = [ [-2,-3], [13,-3], [-12,9] ]; translate([0,25,0]) RoundCornerDemo_plat(cnr); translate([25,0,0]) RoundCornerAdd(cnr); translate([-25,0,0]) RoundCornerCut(cnr); + translate([0,-25,0]) RoundCorner_selector(cnr, 0); difference(){ RoundCornerDemo_plat(cnr); RoundCornerCut(cnr); @@ -819,6 +875,7 @@ module Demo(){ ////toplevel //Machine_Profile(); //Machine_NewRearProfile(); //Machine_NewRearCurve(); +//Machine_NewFrontProfile(); //Machine_Curves(); //Machine(); //FitTest();