X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=sewing-table.scad.m4;h=af8e7367d10b7e2e0f8e3af34a031886ba0afb66;hb=ce542d09247fda4bc66da5c8ef74dc993479d377;hp=8f2d6f7565895ff96ede7373fdaaa4286c658a13;hpb=d4f9630ab8406a4b0703fd91ecf002a0e92bf8bb;p=reprap-play.git

diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4
index 8f2d6f7..af8e736 100644
--- 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;
@@ -427,22 +427,43 @@ module Machine_NewRearProfile(){
   // best not to edit the posbox size if poss - just move it
   posbox = 10 * ([7.2333,-14.1267] - [-16.2289,40.0289]); // box, Green
   sideline = -10 * ([-6.2400,13.5600] - [-2.4467,28.2556]); // line, Blue
+  scaleline = 10 * dist2d([-1.1911,-20.4800], [-11.2600,4.0578]); // Green2
+  scaleline_mm = 12+5+10+5+3;
   sh = -[abs(posbox[0]), abs(posbox[1])];
   rot = atan2(-sideline[0], sideline[1]);
-  echo("SH",sh,rot);
-  rotate(rot) translate(sh){
+  sc = scaleline_mm / scaleline;
+  echo("SH",sh,rot,sc);
+  scale(sc) rotate(rot) translate(sh){
     import("sewing-table-rear-profile.dxf", convexity=10); // spline, Pink3
   }
 }
 
 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, 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]);
   }
 }
 
@@ -495,31 +516,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();
     }
   }
 }
@@ -555,8 +552,8 @@ 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];
+  sz = [275,180];
+  c0 = [-40,-80];
   c = Rectangle_corners(c0, sz);
   brace = [7,7,9];
   difference(){
@@ -740,3 +737,6 @@ module Demo(){ ////toplevel
 //Machine_Profile();
 //Machine_NewRearProfile();
 //Machine_NewRearCurve();
+//Machine_Curves();
+//Machine();
+//FitTest();