sewing-table: Machine: extend and fix

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

diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4
index b2fbbfb72dc37f658e8dd0802eff6e86ba7cbe56..13778aa360b6120de890fad670ef9082de60f0dc 100644 (file)
--- a/sewing-table.scad.m4
+++ b/sewing-table.scad.m4
@@ -94,7 +94,7 @@ rearcurve_double_inrad = 26.10 + 8.04;
 
 reartablet_z = 2.54;
 reartablet_x = 5 + 1;
-reartablet_y = 5;
+reartablet_y = 8;
 
 frontcurve_side_skew = 3.5 / 72;
 frontcurve_avoid_y = 70;
@@ -391,7 +391,7 @@ module Machine_Arm(){
   translate([0,0,-30]) linear_extrude(height=60) {
     translate(tile01_tr + [0, (-cutout_tile01_y + cutout_tile11_y)/2]) {
       intersection(){
-       translate([-100, -ysz/2])
+       translate([-50, -ysz/2])
          square([400, ysz]);
        translate([ endrad - cutout_tile11_x - cutout_l_end_x_slop, 0 ])
          circle(r=endrad, $fa=0.01,$fd=5);
@@ -439,13 +439,33 @@ module Machine_NewRearProfile(){
 }
 
 module Machine_NewRearCurve(){
-  intersection(){
-    rotate_extrude(convexity=10, $fn=32)
-      rotate(90)
-      translate([ 0, -rearcurve_double_inrad ])
+  slant = atan2(4,210-10);
+  echo("SL",slant);
+  translate([0,0, rearcurve_double_inrad]) rotate([slant,0,0]){
+    translate([ rearcurve_double_inrad,
+               0,
+               -rearcurve_double_inrad + 10 ]){
+      rotate([180,0,0]) rotate([0,0,90]) linear_extrude(height=30){
+       hull(){
+         Machine_NewRearProfile();
+         translate([0,-100]) Machine_NewRearProfile();
+       }
+      }
+    }
+    rotate([0,90,0]) rotate([90,0,0]) {
+      intersection(){
+       rotate_extrude(convexity=10, $fn=64)
+         rotate(90)
+         translate([ 0, -rearcurve_double_inrad ])
+         Machine_NewRearProfile();
+       translate([0,0,-500])
+         cube([500,500,1000]);
+      }
+    }
+    translate([1,0,-rearcurve_double_inrad])
+      rotate([0,-90,0]) rotate([0,0,-90])
+      linear_extrude(height= rearcurve_strt_len + 1)
       Machine_NewRearProfile();
-    translate([0,0,-500])
-      cube([500,500,1000]);
   }
 }
 
@@ -498,31 +518,7 @@ module Machine_Curves(){ ////toplevel
     translate([ rearcurve_strt_len,
                0,
                rearcurve_z_slop ]){
-      translate([ 1,
-                 0,
-                 0
-                 ]){
-       rotate([0,-90,0])rotate([0,0,-90]){
-         linear_extrude(height= rearcurve_strt_len + 1)
-         Machine_RearProfile();
-       }
-      }
-      translate([ 0,
-                 0,
-                 rearcurve_double_inrad ]) {
-       intersection(){
-         rotate([90,0,0]){
-           rotate_extrude(convexity=10, $fn=32) {
-             rotate([0,0,90]) translate([ 0,
-                         -rearcurve_double_inrad ]) {
-               Machine_RearProfile();
-             }
-           }
-         }
-         mirror([0,0,1])
-           translate([0,-75,0]) cube([150,150,150]);
-       }
-      }
+      Machine_NewRearCurve();
     }
   }
 }
@@ -557,9 +553,7 @@ 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];
+module FitTest_general(c0,sz){
   c = Rectangle_corners(c0, sz);
   brace = [7,7,9];
   difference(){
@@ -578,6 +572,18 @@ module FitTest(){ ////toplevel
   }
 }
 
+module FitTest_Entire(){ ////toplevel
+  FitTest_general([-40,-80], [275,180]);
+}
+
+module FitTest_RearCurve(){ ////toplevel
+  FitTest_general([110,0], [170,100]);
+}
+
+module FitTest_FrontCurve(){ ////toplevel
+  FitTest_general([110,-80], [170,80]);
+}
+
 module Tile02(){ ////toplevel
   sz = [100,170];
   c0 = tile02_tr + -sz;
@@ -743,3 +749,6 @@ module Demo(){ ////toplevel
 //Machine_Profile();
 //Machine_NewRearProfile();
 //Machine_NewRearCurve();
+//Machine_Curves();
+//Machine();
+//FitTest();