sewing-table: FitTest_Entire: move (nfc)

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

diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4
index 5ad31f80781b26d527c3cfa80cbbdd4de3c0ca1a..3de16d77c4feefbc300ce01d30646511a79e92b6 100644 (file)
--- 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
 
@@ -809,25 +809,6 @@ module FitTest_general(c0,sz, dobrace=false){
   }
 }
 
-module FitTest_Entire(){ ////toplevel
-  FitTest_general([-40,-80], [275,180], dobrace=true);
-}
-
-module FitTest_RearCurve(){ ////toplevel
-  FitTest_general([110,0], [170,100]);
-}
-
-module FitTest_FrontCurve(){ ////toplevel
-  p0 = [110,-80];
-  sz = [170,80];
-  intersection() {
-    Tile00();
-    translate([0,0,-8]) linear_extrude(height=18) {
-      translate(p0) square(sz);
-    }
-  }
-}
-
 module FitTest_PairLink(cut=false){ ////toplevel
   cy0=-55; cy1=85; cx=127;
   bar = [10,10];
@@ -835,13 +816,14 @@ module FitTest_PairLink(cut=false){ ////toplevel
   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])
-    cube([bar[0], cy1-cy0, bar[1]]);
+  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;
@@ -876,6 +858,39 @@ module FitTest_PairLink(cut=false){ ////toplevel
   }
 }
 
+module FitTest_RearCurve(){ ////toplevel
+  difference(){
+    FitTest_general([110,0], [170,100]);
+    FitTest_PairLink(true);
+  }
+}
+
+module FitTest_FrontCurve(){ ////toplevel
+  p0 = [110,-80];
+  sz = [170,80];
+  difference(){
+    intersection() {
+      Tile00();
+      translate([0,0,-8]) linear_extrude(height=18) {
+       translate(p0) square(sz);
+      }
+    }
+    FitTest_PairLink(true);
+  }
+}
+
+module FitTest_Entire(){ ////toplevel
+  difference(){
+    FitTest_general([-40,-80], [275,180], dobrace=true);
+    FitTest_PairLink(true);
+  }
+}
+
+module FitTest_EntireDemo(){ ////toplevel
+  FitTest_Entire();
+  %Tile00();
+}
+
 module FitTest_PairDemo(){ ////toplevel
   sh=[-100,-15,0];
   translate(sh){