filamentspool: Reorg so axle hole is subtracted from whole hub, indentation (nfc...

diff --git a/filamentspool.scad b/filamentspool.scad
index 5e52e627cd1926ccf825b7ecc9b3da75905b42e0..05b539283d84ee19ea5006c7ff269fd73dd0bfd2 100644 (file)
--- a/filamentspool.scad
+++ b/filamentspool.scad
@@ -243,33 +243,33 @@ module Hub(){ ////toplevel
   holewidth = DoveClipPairSane_width() - hubstemwidth*2;
   difference(){
     union(){
-  difference(){
-    cylinder($fn=60, h=hublthick, r=hubbigrad);
-    translate([0,0,-1])
-      cylinder($fn=30, h=hublthick+2, r=(hubbigrad-hublwidth));
-  }
-    cylinder(h=hubaxlelen, r=axlerad+hublwidth);
-  for (ang=[0,120,240])
-    rotate([0,0,ang]) {
-      difference() {
-       translate([hubeffrad,0,0])
-         DoveClipPairSane(h=doveclipheight,
-                          baseextend = (hubeffrad - DoveClip_depth()
-                                        - hubbigrad + hublwidth));
-       if (hole>hublwidth && holewidth > 2) {
-         translate([hubbigrad + hublwidth, -holewidth/2, -1])
-           cube([hole, holewidth, hublthick+2]);
-       }
+      difference(){
+       cylinder($fn=60, h=hublthick, r=hubbigrad);
+       translate([0,0,-1])
+         cylinder($fn=30, h=hublthick+2, r=(hubbigrad-hublwidth));
       }
+      cylinder(h=hubaxlelen, r=axlerad+hublwidth);
+      for (ang=[0,120,240])
+       rotate([0,0,ang]) {
+         difference() {
+           translate([hubeffrad,0,0])
+             DoveClipPairSane(h=doveclipheight,
+                              baseextend = (hubeffrad - DoveClip_depth()
+                                            - hubbigrad + hublwidth));
+           if (hole>hublwidth && holewidth > 2) {
+             translate([hubbigrad + hublwidth, -holewidth/2, -1])
+               cube([hole, holewidth, hublthick+2]);
+           }
+         }
+       }
+      for (ang = [0 : 60 : 359])
+       rotate([0,0,ang]) rotate([90,0,0]) {
+         translate([0,0,-hublwidth/2])
+           linear_extrude(height=hublwidth)
+           polygon([[xmin,0.05], [xmax,0.05],
+                    [xmax,hublthick-0.2], [xmin, hubaxlelen-0.2]]);
+       }
     }
-  for (ang = [0 : 60 : 359])
-    rotate([0,0,ang]) rotate([90,0,0]) {
-      translate([0,0,-hublwidth/2])
-       linear_extrude(height=hublwidth)
-       polygon([[xmin,0.05], [xmax,0.05],
-                [xmax,hublthick-0.2], [xmin, hubaxlelen-0.2]]);
-    }
-}
     translate([0,0,-1]) cylinder($fn=60, h=hubaxlelen+2, r=axlerad);
   }
 }