filamentspool: Fix a bug in dove version introduced with nondove: difference() scope...

[reprap-play.git] / filamentspool.scad

diff --git a/filamentspool.scad b/filamentspool.scad
index 4952aece509d11c0345c8df00311f32827ec89be..bb3c6783636661d37db2985b49785c1ec31e2f9d 100644 (file)
--- a/filamentspool.scad
+++ b/filamentspool.scad
@@ -54,7 +54,7 @@ overclipcupgap=5;
 overclipdepth=15;
 overcliproundr=2.0;
 overclipthick=1.0;
-overclipcupnextgap=20;
+overclipcupnextgap=selsz(20,20,20);
 
 hubaxlelen = selsz(25, 87.5, 87.5);
 echo(hubaxlelen);
@@ -66,8 +66,8 @@ wingspoke=2.5;
 wingsize=6;
 wingthick=3;
 
-armendwallthick=2.5;
-armendbasethick=1.2;
+armendwallthick=selsz(2.5, 2.5, 2.5);
+armendbasethick=selsz(1.2, 1.2, 1.2);
 
 axlehorizoffset = 12.5;
 axlevertheight = 100;
@@ -289,8 +289,8 @@ module Hub(){ ////toplevel
       cylinder(h=hubaxlelen, r=axlerad+hublwidth);
       for (ang=[0 : 360/num_arms : 359])
        rotate([0,0,ang]) {
-         difference() {
-           if (usedove()){
+         if (usedove()){
+           difference() {
              translate([hubeffrad,0,0])
                DoveClipPairSane(h=doveclipheight,
                                 baseextend = (hubeffrad - DoveClip_depth()
@@ -299,25 +299,25 @@ module Hub(){ ////toplevel
                translate([hubbigrad + hublwidth, -holewidth/2, -1])
                  cube([hole, holewidth, hublthick+2]);
              }
-           } else {
-             difference(){
-               translate([0,
-                          -nondove_allwidth/2,
-                          0])
-                 cube([hubeffrad + nondove_armhole_x
-                       + nondove_armhole_hole/2 + nondove_armhole_support,
-                       nondove_allwidth,
-                       nondove_armhole_wall + totalheight]);
-               translate([hubeffrad - nondove_armhole_slop_x,
-                          -nondove_allwidth/2
-                          + nondove_armhole_wall - nondove_armhole_slop,
-                          nondove_armhole_wall])
-                 cube([nondove_armhole_x + 50,
-                       totalwidth + nondove_armhole_slop*2,
-                       totalheight + 1]);
-               translate([hubeffrad + nondove_armhole_x, 0, -20])
-                  cylinder(r= nondove_armhole_hole/2, h=50, $fn=10);
-             }
+           }
+         } else {
+           difference(){
+             translate([0,
+                        -nondove_allwidth/2,
+                        0])
+               cube([hubeffrad + nondove_armhole_x
+                     + nondove_armhole_hole/2 + nondove_armhole_support,
+                     nondove_allwidth,
+                     nondove_armhole_wall + totalheight]);
+             translate([hubeffrad - nondove_armhole_slop_x,
+                        -nondove_allwidth/2
+                        + nondove_armhole_wall - nondove_armhole_slop,
+                        nondove_armhole_wall])
+               cube([nondove_armhole_x + 50,
+                     totalwidth + nondove_armhole_slop*2,
+                     totalheight + 1]);
+             translate([hubeffrad + nondove_armhole_x, 0, -20])
+               cylinder(r= nondove_armhole_hole/2, h=50, $fn=10);
            }
          }
        }