sewing-table: RoundCorner rework: use new centres

diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4
index 3132b11658153ebe30aa0ce3356dd20d24974bae..a407c7aaab41cae439d68b5ff2a638e4551b20f4 100644 (file)
--- a/sewing-table.scad.m4
+++ b/sewing-table.scad.m4
@@ -281,10 +281,8 @@ module RoundCornerCut(ci) {
   ROUNDCORNER_VARS;
   difference(){
     RoundCorner_selector(ci, -0.1);
   ROUNDCORNER_VARS;
   difference(){
     RoundCorner_selector(ci, -0.1);

-    INREFFRAME(this_cnr, right_cnr) INREFFRAME_EDGE {
-      translate([bigr, bigr, 0])
-       cylinder(center=true, h=20, r= bigr);
-    }
+    translate(concat(ctr,[0]))
+      cylinder(center=true, h=20, r= bigr);

   }
 }
 
   }
 }
 


@@ -292,15 +290,16 @@ module RoundCornerAdd(ci) {
   ROUNDCORNER_VARS;
   intersection(){
     RoundCorner_selector(ci, +0.1);
   ROUNDCORNER_VARS;
   intersection(){
     RoundCorner_selector(ci, +0.1);

-    INREFFRAME(this_cnr, right_cnr) INREFFRAME_EDGE {
-      translate([bigr, bigr, 0])
+    INREFFRAME_EDGE {
+      translate(concat(ctr,[0])){

        rotate_extrude(convexity=10, $fn=50)
        rotate_extrude(convexity=10, $fn=50)

-       translate([bigr, 0])
-       difference(){
+         translate([bigr, 0])
+         difference(){

          circle(r= round_edge_rad, $fn=50);
          mirror([1,1])
            square([20,20]);
          circle(r= round_edge_rad, $fn=50);
          mirror([1,1])
            square([20,20]);

-        }
+       }
+      }

     }
   }
 }
     }
   }
 }