sewing-table: NewRearCurve: scale

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

diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4
index d3930c5862768c47f50dfb15da79b5252b03d9b9..b2fbbfb72dc37f658e8dd0802eff6e86ba7cbe56 100644 (file)
--- a/sewing-table.scad.m4
+++ b/sewing-table.scad.m4
@@ -130,6 +130,9 @@ interlock_sq_adj = 0.2; // arbitrary
 
 first_front = machine_front_profile[len(machine_front_profile)-1];
 
+m4_define(`POST_TCROSSSZ',
+          `2*( tile_hard_edge_hole_dist - test_edge + 1 )')
+
 module Post(){
   mirror([0,0,1]) {
     difference(){
@@ -140,10 +143,9 @@ module Post(){
       }
     }
     if (TEST) {
-      tsz = tile_hard_edge_hole_dist - test_edge + 1;
       translate([0,0, tile_th/2]) {
-       cube([post_dia, tsz*2, tile_th], center=true);
-       cube([tsz*2, post_dia, tile_th], center=true);
+       cube([post_dia,      POST_TCROSSSZ, tile_th], center=true);
+       cube([POST_TCROSSSZ, post_dia,      tile_th], center=true);
       }
     }
   }
@@ -165,15 +167,22 @@ module TileBase(botleft, topright){
       translate(concat(botleft, [0]))
       cube(concat(size, [tile_th]));
     if (!TEST) {
+      cidsz = topright_post-botleft_post
+       + [-post_dia,-post_dia]
+       + [0, thehd[1]];
+      cidszr = [ min(cidsz[0],50), min(cidsz[1],50) ];
+      echo("CID",cidsz,cidszr);
       translate( concat(botleft_post, [ -tile_th ])
-                + 0.5 * [ post_dia, post_dia, 0 ] )
-       Commitid_BestCount_M( topright_post-botleft_post
-                             + [-post_dia,-post_dia]
-                             + [0, thehd[1]]);
+                + 0.5 * [ post_dia, post_dia, 0 ]
+                + 0.5 * concat( cidsz - cidszr, [ 0 ]) )
+       Commitid_BestCount_M(cidszr);
     }
     if (TEST) {
-      translate( concat(botleft + [thehd[0], 0], [0]) )
-       Commitid_BestCount([ size[0] - thehd[0]*2, thehd[1] ]);
+      crossoff = tile_hard_edge_hole_dist + POST_TCROSSSZ/2;
+      cidsz = [ thehd[0], size[1] - 2*crossoff ];
+      cidszr = [ cidsz[0], min(cidsz[1], 50) ];
+      translate( concat(botleft + [0, crossoff] + (cidsz-cidszr)/2, [0]) )
+       Commitid_BestCount(cidszr);
       difference(){
        mirror([0,0,1]) {
          translate(concat(botleft + [test_edge,test_edge], [test_tile_th]))
@@ -413,7 +422,34 @@ module Machine_Profile(){
   }
 }
 
-module Machine_RearProfile(){
+module Machine_NewRearProfile(){
+  // figures copied out of xfig edit boxes
+  // best not to edit the posbox size if poss - just move it
+  posbox = 10 * ([7.2333,-14.1267] - [-16.2289,40.0289]); // box, Green
+  sideline = -10 * ([-6.2400,13.5600] - [-2.4467,28.2556]); // line, Blue
+  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){
+    import("sewing-table-rear-profile.dxf", convexity=10); // spline, Pink3
+  }
+}
+
+module Machine_NewRearCurve(){
+  intersection(){
+    rotate_extrude(convexity=10, $fn=32)
+      rotate(90)
+      translate([ 0, -rearcurve_double_inrad ])
+      Machine_NewRearProfile();
+    translate([0,0,-500])
+      cube([500,500,1000]);
+  }
+}
+
+module Machine_RearProfile(){ ////toplevel
   intersection(){
     Machine_Profile();
     translate([ -200 + machine_rear_to_front/2, -100 ]) {
@@ -495,7 +531,7 @@ module Machine(){ ////toplevel
   Machine_Arm();
   Machine_Curves();
 }
-  
+
 function Rectangle_corners(c0, sz) =
   // returns the corners of a rectangle from c0 to c0+sz
   // if sz is positive, the corners are anticlockwise starting with c0
@@ -521,6 +557,27 @@ 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(){ ////toplevel
+  sz = [280,180];
+  c0 = [-50,-80];
+  c = Rectangle_corners(c0, sz);
+  brace = [7,7,9];
+  difference(){
+    union(){
+      Rectangle_TileBase(c);
+      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 Tile02(){ ////toplevel
   sz = [100,170];
   c0 = tile02_tr + -sz;
@@ -684,4 +741,5 @@ module Demo(){ ////toplevel
 //Demo();
 
 //Machine_Profile();
-//Machine_RearProfile();
+//Machine_NewRearProfile();
+//Machine_NewRearCurve();