X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=sewing-table.scad.m4;h=4af88b176a06707f607cc29566f12109a225dd31;hb=60842d6ca0ff8c2b1a833a8848f7c1bdc136d23d;hp=03adc7f1cbb2d189845269f8c6a4a98e4bd0257f;hpb=e24b1be95d843e5f8f730cf02eeac37145d0a288;p=reprap-play.git

diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4
index 03adc7f..4af88b1 100644
--- a/sewing-table.scad.m4
+++ b/sewing-table.scad.m4
@@ -84,13 +84,13 @@ cutout_tile11_y = cutout_l_end_y_total - cutout_tile01_y;
 
 rearedge_len = 170;
 
-rearcurve_rad = 25.4;
 rearcurve_strt_len = 65;
-rearcurve_total_len = 84;
 
-rearcurve_rad_slop = 0.75;
+rearcurve_z_slop = 0.75;
 
-rearcurve_avoid_y = rearcurve_rad + 10;
+rearcurve_avoid_y = 35;
+
+rearcurve_double_inrad = 26.10 + 8.04;
 
 reartablet_z = 2.54;
 reartablet_x = 5 + 1;
@@ -418,8 +418,6 @@ module Machine_RearProfile(){
 }
 
 module Machine_Rear(){ ////toplevel
-  big_rad = rearcurve_total_len - rearcurve_strt_len + rearcurve_rad;
-  small_rad = rearcurve_rad + rearcurve_rad_slop;
   translate([ tile01_tr[0] - cutout_l_end_x + rearedge_len,
 	      cutout_tile11_y,
 	      0 ]){
@@ -431,36 +429,36 @@ module Machine_Rear(){ ////toplevel
       cube([ reartablet_x+1,
 	     reartablet_y+1,
 	     20 ]);
+  }
+  translate([ tile01_tr[0] - cutout_l_end_x + rearedge_len,
+	      cutout_tile11_y,
+	      0 ]){
     translate([ rearcurve_strt_len,
 		0,
-		0 ]){
-      translate([ 0,
+		rearcurve_z_slop ]){
+      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]);
 	}
       }
     }
@@ -632,4 +630,4 @@ module Demo(){ ////toplevel
 //Demo();
 
 //Machine_Profile();
-Machine_RearProfile();
+//Machine_RearProfile();