sewing-table: NewRearCurve: correct z

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

diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4
index 8f2d6f7565895ff96ede7373fdaaa4286c658a13..5935aaccd5e6848b84a641911b257fe4c70ea10a 100644 (file)
--- a/sewing-table.scad.m4
+++ b/sewing-table.scad.m4
@@ -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]);
   }
 }