sewing-table: adjustment from test

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

diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4
index 785e88bb964b1b025c631a63bdf5fc405b0c68e5..ec12e1a9ea9127cdc9206054abcc86292acdfe1e 100644 (file)
--- a/sewing-table.scad.m4
+++ b/sewing-table.scad.m4
@@ -30,38 +30,7 @@ demo_slop = 0.1;
 
 // cutout
 
-machine_rear_to_front = 85;
-
-machine_rear_profile = [
-                       [ -  0,  -0.00 ],
-                       [ -  2,  -0.10 ],
-                       [ -  4,  -0.20 ],
-                       [ -  5,  -0.30 ],
-                       [ -  6,  -0.40 ],
-                       [ -  7,  -0.50 ],
-                       [ -  8,  -0.75 ],
-                       [ - 10,  -1.50 ],
-                       [ - 12,  -2.25 ],
-                       [ - 14,  -3.25 ],
-                       [ - 16,  -4.25 ],
-                       [ - 18,  -5.75 ],
-                       [ - 20,  -8.00 ]
-                       ];
-
-machine_front_profile =  [
-                         [  128,  -3.70,  ],
-                         [  124,  -2.90,  ],
-                         [  120,  -2.45,  ],
-                         [  116,  -2.10,  ],
-                         [  112,  -1.80,  ],
-                         [  108,  -1.55,  ],
-                         [  104,  -1.25,  ],
-                         [  100,  -1.00,  ],
-                         [   96,  -0.80,  ],
-                         [   92,  -0.65,  ],
-                         [   88,  -0.55,  ],
-                         [   84,  -0.50,  ]
-                         ];
+machine_rear_to_front = 84 + 0.25;
 
 cutout_l_end_y_front_slop = 0.5;
 cutout_l_end_y_rear_slop = 0.5;
@@ -133,8 +102,6 @@ interlock_negative_rad = interlock_rad + 0.125;
 
 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 )')
 
@@ -451,28 +418,6 @@ module Machine_Arm(){
   }
 }
 
-module Machine_Profile(){
-  first_rear = machine_rear_profile[0];
-  below_point = 0.5 * ( first_rear + first_front ) + [ 0, -10 ];
-  pol = concat( machine_rear_profile,
-               [ below_point ],
-               machine_front_profile);
-  skew_angle = atan2( first_front[1] - first_rear[1],
-                     first_front[0] - first_rear[0] );
-  //echo(below_point, pol, skew_angle);
-  hull(){
-    for (z=[0,-40]) {
-      translate([0,z]) {
-       //scale([1,5])
-       rotate([0,0, -skew_angle ]){
-         //translate( - first_front )
-         polygon(pol);
-       }
-      }
-    }
-  }
-}
-
 module Machine_NewRearProfile(){
   // figures copied out of xfig edit boxes
   // best not to edit the posbox size if poss - just move it
@@ -535,24 +480,6 @@ module Machine_NewRearCurve(){
   }
 }
 
-module Machine_RearProfile(){ ////toplevel
-  intersection(){
-    Machine_Profile();
-    translate([ -200 + machine_rear_to_front/2, -100 ]) {
-      square([200,200]);
-    }
-  }
-}
-
-module Machine_FrontProfile(){
-  intersection(){
-    Machine_Profile();
-    translate([ machine_rear_to_front/2, -100 ]) {
-      square([200,200]);
-    }
-  }
-}
-
 module Machine_Curves(){ ////toplevel
   translate([ tile01_tr[0] - cutout_l_end_x + rearedge_len,
              cutout_tile11_y,
@@ -885,15 +812,25 @@ module FitTest_FrontCurve(){ ////toplevel
 }
 
 module FitTest_Entire(){ ////toplevel
+  p0 = [-40,-80];
+  szrear = [270,180];
+  szfront = [250,szrear[1]];
   difference(){
-    FitTest_general([-40,-80], [250,180], dobrace=true, bracexx=15);
+    FitTest_general(p0, szrear, dobrace=true, bracexx=0);
     FitTest_PairLink(true);
+    translate(concat(p0,[0]) + [szfront[0],-10,-40])
+      cube([100, -p0[1], 80]);
+  }
+  intersection(){
+    FitTest_RearCurve();
+    translate(concat(p0,[-20])) cube(concat(szrear,[40]));
   }
+  FitTest_FrontCurve();
 }
 
 module FitTest_EntireDemo(){ ////toplevel
   FitTest_Entire();
-  %Tile00();
+  //%Tile00();
 }
 
 module FitTest_PairDemo(){ ////toplevel
@@ -947,7 +884,6 @@ module Demo(){ ////toplevel
 //TestPiece2();
 //Demo();
 
-//Machine_Profile();
 //Machine_NewRearProfile();
 //Machine_NewRearCurve();
 //Machine_NewFrontProfile();