From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 10 Feb 2016 21:44:00 +0000 (+0000)
Subject: Merge branch 'master' of chiark:/u/ianmdlvl/reprap/play
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=commitdiff_plain;h=a764a01a9074ddced157c166f5fc0b924bc1fc8c;hp=f4b292ecf8dc222722d86489316952844ded1924

Merge branch 'master' of chiark:/u/ianmdlvl/reprap/play
---

diff --git a/filamentspool.scad b/filamentspool.scad
index c3ac373..fe29eea 100644
--- a/filamentspool.scad
+++ b/filamentspool.scad
@@ -290,35 +290,6 @@ module ArmEnd(length=armend_length){ ////toplevel
     }
   }
 
-  for (otherside=[0,1]) {
-    for (circum = [300:100:1500]) {
-      assign(rad = circum / tau)
-	assign(fn = str("filamentspool-number-n",circum,".dxf"))
-	assign(rotateoffset = [0, totalwidth/2, 0])
-	assign(xlen = rad - real_exteffrad) {
-	if (xlen >= numbers_tick_width/2
-	    + (otherside ? numbers_height_allow : 0) &&
-	    xlen <= length - (otherside ? 0 : numbers_height_allow))
-	  translate([xlen, -armendwallthick,
-		     -armendbasethick + (totalheight - numbers_tick_len)/2])
-	  translate(rotateoffset)
-	  rotate([0,0, otherside*180])
-	  translate(-rotateoffset){
-	    translate([-numbers_tick_width/2, -1, 0])
-	      cube([numbers_tick_width, numbers_relief+1, numbers_tick_len]);
-	    translate([numbers_tick_width/2 + numbers_tick_linespc,
-		       1,
-		       numbers_tick_len])
-	      rotate([90,0,0])
-	      rotate([0,0,-90])
-	      linear_extrude(height= numbers_relief+1)
-	      //    scale(templatescale)
-	      import(file=fn, convexity=100);
-	  }
-      }
-    }
-  }
-
   difference(){
     union(){
       difference(){
@@ -342,6 +313,36 @@ module ArmEnd(length=armend_length){ ////toplevel
 	}
       }
     }
+
+    for (otherside=[0,1]) {
+      for (circum = [300:100:1500]) {
+	assign(rad = circum / tau)
+	  assign(fn = str("filamentspool-number-n",circum,".dxf"))
+	  assign(rotateoffset = [0, totalwidth/2, 0])
+	  assign(xlen = rad - real_exteffrad) {
+	  if (xlen >= numbers_tick_width/2
+	      + (otherside ? numbers_height_allow : 0) &&
+	      xlen <= length - (otherside ? 0 : numbers_height_allow))
+	    translate([xlen, -armendwallthick,
+		       -armendbasethick + (totalheight - numbers_tick_len)/2])
+	    translate(rotateoffset)
+	    rotate([0,0, otherside*180])
+	    translate(-rotateoffset){
+	      translate([-numbers_tick_width/2, -1, 0])
+		cube([numbers_tick_width, numbers_relief+1, numbers_tick_len]);
+	      translate([numbers_tick_width/2 + numbers_tick_linespc,
+			 1,
+			 numbers_tick_len])
+		rotate([90,0,0])
+		rotate([0,0,-90])
+		linear_extrude(height= numbers_relief+1)
+		//    scale(templatescale)
+		import(file=fn, convexity=100);
+	    }
+	}
+      }
+    }
+
     if (usedove()){
       translate([0, -armendwallthick, -armendbasethick])
 	Commitid_BestCount_M([length/3, totalwidth]);