sewing-table: FitTest_Entire: has szfront vs szrear

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

diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4
index c10695834b46eafe2772844501c4ee6be7fb3d51..2b03caf5a4d6aca93c2fc622fdd2c1055d787482 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
 
@@ -788,18 +788,19 @@ module Tile00(){ ////toplevel
   RoundCornerAdd(rc2);
 }
 
-module FitTest_general(c0,sz, dobrace=false){
+module FitTest_general(c0,sz, dobrace=false, bracexx=0){
   c = Rectangle_corners(c0, sz);
   brace = [7,7,9];
+  bsz = sz + [bracexx,0,0];
   difference(){
     union(){
       Rectangle_TileBase(c);
       if (dobrace) {
        translate(concat(c0, [-brace[2] + 0.1])){
          difference(){
-           cube(concat(sz,[brace[2]]) - [5,0,0]);
+           cube(concat(bsz, [brace[2]]) - [5,0,0]);
            translate(brace + [0,0, -25])
-             cube(concat(sz, [50]) - brace*2 + [10,0,0]);
+             cube(concat(bsz, [50]) - brace*2 + [10,0,0]);
          }
        }
       }
@@ -809,25 +810,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];
@@ -855,6 +837,10 @@ module FitTest_PairLink(cut=false){ ////toplevel
            translate([0,0,-footrad_depth])
              cylinder(r= footrad_min, h=1);
          }
+         translate([0,0,-10])
+           cylinder(r= footrad_min +
+                    adj_neg_slop * (footrad_max-footrad_min)/footrad_depth,
+                    h=20);
        }
       }
       // legs
@@ -877,6 +863,49 @@ 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
+  p0 = [-40,-80];
+  szrear = [270,180];
+  szfront = [250,szrear[1]];
+  difference(){
+    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();
+}
+
 module FitTest_PairDemo(){ ////toplevel
   sh=[-100,-15,0];
   translate(sh){