sewing-table: replace Machine_Rear with new profile-based version

diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4
index d632040c72f09ca7df4ab8d14a4cb4a19955d43f..173391464896fe789a76de967c1af494f75a97d7 100644 (file)
--- a/sewing-table.scad.m4
+++ b/sewing-table.scad.m4
@@ -92,6 +92,8 @@ rearcurve_rad_slop = 0.75;
 
 rearcurve_avoid_y = rearcurve_rad + 10;
 
+rearcurve_double_inrad = 26.10 + 8.04;
+
 reartablet_z = 2.54;
 reartablet_x = 5 + 1;
 reartablet_y = 5;
@@ -438,33 +440,29 @@ module Machine_Rear(){ ////toplevel
     translate([ rearcurve_strt_len,
                0,
                0 ]){
-      translate([ 0,
+      translate([ 1,
                  0,
-                 -rearcurve_rad
+                 0
                  ]){
-       rotate([0,-90,0]){
-         rotate([0,0, 360/8/2])
-           cylinder(r = small_rad, h= rearcurve_strt_len);
+       rotate([0,-90,0])rotate([0,0,-90]){
+         linear_extrude(height= rearcurve_strt_len + 1)
+         Machine_RearProfile();
        }
       }
       translate([ 0,
                  0,
-                 big_rad - rearcurve_rad ]) {
+                 rearcurve_double_inrad ]) {
        intersection(){
          rotate([90,0,0]){
-           rotate_extrude(convexity=10) {
-             translate([ big_rad,
-                         0 ]) {
-               hull(){
-                 circle(r= small_rad);
-                 translate([200,0])
-                   circle(r= small_rad);
-               }
+           rotate_extrude(convexity=10, $fn=32) {
+             rotate([0,0,90]) translate([ 0,
+                         -rearcurve_double_inrad ]) {
+               Machine_RearProfile();
              }
            }
          }
          mirror([0,0,1])
-           cube([150,150,150]);
+           translate([0,-75,0]) cube([150,150,150]);
        }
       }
     }
@@ -636,4 +634,4 @@ module Demo(){ ////toplevel
 //Demo();
 
 //Machine_Profile();
-Machine_RearProfile();
+//Machine_RearProfile();