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=de05a9bc796962e07eaf58283e0b047d347fdd44;hp=3b498f3e10d80dcf9abf17feb1758a0029280075;hb=fd35903275e60b7ac026093fb99381d5dbd23ae0;hpb=046c818d05c54fe0e757120a82512adce1472f97 diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4 index 3b498f3..de05a9b 100644 --- a/sewing-table.scad.m4 +++ b/sewing-table.scad.m4 @@ -100,8 +100,8 @@ frontcurve_side_skew = 3.5 / 72; frontcurve_avoid_y = 70; frontcurve_z_slop = 0.75; -frontcurve_strt_len = 60; -frontcurve_dualcurve_angle = 90 - 65; +frontcurve_strt_len = 50; +frontcurve_dualcurve_angle = 30; // calculated @@ -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,40 +254,64 @@ 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) { - r = round_cnr_rad - round_edge_rad; - cube(r*2 + adj, center=true); + ROUNDCORNER_VARS; + 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]); + } + } + } + } } module RoundCornerCut(ci) { // ci should be [this_cnr, right_cnr, left_cnr] // where right_cnr is to the right (ie, anticlockwise) ROUNDCORNER_VARS; - INREFFRAME(this_cnr, right_cnr) INREFFRAME_EDGE { - difference(){ - RoundCorner_selector(ci, -0.1); - translate([bigr, bigr, 0]) - cylinder(center=true, h=20, r= bigr); - } + difference(){ + RoundCorner_selector(ci, -0.1); + translate(ctr3) + cylinder(center=true, h=20, r= bigr); } } module RoundCornerAdd(ci) { ROUNDCORNER_VARS; - INREFFRAME(this_cnr, right_cnr) INREFFRAME_EDGE { - intersection(){ - RoundCorner_selector(ci, +0.1); - translate([bigr, bigr, 0]) + intersection(){ + RoundCorner_selector(ci, +0.1); + 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]); - } + } + } } } } @@ -363,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]); @@ -452,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); @@ -517,18 +569,15 @@ module Machine_Curves(){ ////toplevel translate([ tile01_tr[0] - cutout_l_end_x + rearedge_len, cutout_tile11_y, frontcurve_z_slop ]){ - translate([ 0, -first_front[0] , 0 ]) + 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]]) - translate([ 0, first_front[0] , 0 ]) - mirror([1,0,0]){ - rotate([0,-90,0])rotate([0,0,-90]){ - linear_extrude(height= 200) - Machine_FrontProfile(); - } - } + 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 ]){ @@ -573,48 +622,12 @@ 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]; - difference(){ - union(){ - Rectangle_TileBase(c); - if (dobrace) { - translate(concat(c0, [-brace[2] + 0.1])){ - difference(){ - cube(concat(sz,[brace[2]]) - [5,0,0]); - translate(brace + [0,0, -25]) - cube(concat(sz, [50]) - brace*2 + [10,0,0]); - } - } - } - RoundEdge(R_EDGE(c,1)); - } - Machine(); - } -} - -module FitTest_Entire(){ ////toplevel - FitTest_general([-40,-80], [275,180], dobrace=true); -} - -module FitTest_RearCurve(){ ////toplevel - FitTest_general([110,0], [170,100]); -} - module Tile02(){ ////toplevel sz = [100,170]; 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); @@ -634,7 +647,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); @@ -714,7 +727,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); @@ -749,7 +762,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(){ @@ -768,18 +782,123 @@ module Tile00(){ ////toplevel RoundEdge(c1bis, c2bis); } Machine(); + RoundCornerCut(rc2); } RoundCornerAdd(rcs); - RoundCornerAdd([c1bis,c2bis,c[1]]); + RoundCornerAdd(rc2); +} + +module FitTest_general(c0,sz, dobrace=false){ + c = Rectangle_corners(c0, sz); + brace = [7,7,9]; + difference(){ + union(){ + Rectangle_TileBase(c); + if (dobrace) { + translate(concat(c0, [-brace[2] + 0.1])){ + difference(){ + cube(concat(sz,[brace[2]]) - [5,0,0]); + translate(brace + [0,0, -25]) + cube(concat(sz, [50]) - brace*2 + [10,0,0]); + } + } + } + RoundEdge(R_EDGE(c,1)); + } + Machine(); + } +} + +module FitTest_PairLink(cut=false){ ////toplevel + cy0=-55; cy1=85; cx=127; + bar = [10,10]; + legrad = 12; + footrad_min = 1; footrad_max = 4; footrad_depth = 5; + strap = [3,5]; + adj_neg_slop = 1.0; + bar_z_slop = 1.75; + + // calculated + straphole_x_max = legrad/sqrt(2) + footrad_max; + dz = cut ? adj_neg_slop : 0; + + translate([cx - bar[0]/2, cy0, dz + bar_z_slop]) + cube([bar[0], cy1-cy0, bar[1] - bar_z_slop]); + + for (endy=[cy0,cy1]) { + $fn=32; + translate([cx,endy,dz]){ + // feet + for (rot=[45:90:315]) rotate(rot) { + translate([legrad,0,0]){ + hull(){ + cylinder(r= footrad_max, h=1); + translate([0,0,-footrad_depth]) + cylinder(r= footrad_min, h=1); + } + } + } + // legs + for (rot=[45,135]) rotate(rot) { + hull(){ + for (s=[-1,+1]){ + translate([s*legrad,0,0]) + cylinder(r= footrad_max, h=bar[1]); + } + } + } + // strap holes + if (cut) { + for (rot=[0,180]) rotate(rot) { + translate([ straphole_x_max - strap[0]/2, 0,0 ]) + cube(concat(strap,[20]), center=true); + } + } + } + } +} + +module FitTest_Entire(){ ////toplevel + FitTest_general([-40,-80], [275,180], dobrace=true); +} + +module FitTest_RearCurve(){ ////toplevel + difference(){ + FitTest_general([110,0], [170,100]); + FitTest_PairLink(true); + } } module FitTest_FrontCurve(){ ////toplevel p0 = [110,-80]; sz = [170,80]; - intersection() { - Tile00(); - translate([0,0,-8]) linear_extrude(height=18) { - translate(p0) square(sz); + difference(){ + intersection() { + Tile00(); + translate([0,0,-8]) linear_extrude(height=18) { + translate(p0) square(sz); + } + } + FitTest_PairLink(true); + } +} + +module FitTest_PairDemo(){ ////toplevel + sh=[-100,-15,0]; + translate(sh){ + FitTest_PairLink(); + %FitTest_FrontCurve(); + %FitTest_RearCurve(); + } + rotate([0,0,180]){ + translate(sh){ + difference(){ + union(){ + FitTest_FrontCurve(); + FitTest_RearCurve(); + } + #FitTest_PairLink(true); + } } } } @@ -789,10 +908,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); @@ -817,6 +937,7 @@ module Demo(){ ////toplevel //Machine_Profile(); //Machine_NewRearProfile(); //Machine_NewRearCurve(); +//Machine_NewFrontProfile(); //Machine_Curves(); //Machine(); //FitTest();