Fix hexHolesRectangle and add skip param

Use skip param to implement hexHolesCircle

TODO.txt

@@ -2,7 +2,6 @@
  * Make outer edge continuous even if other parts are drawn intermediately.
  * Fix burn compensation for building blocks (especially fingerHolesAt)
  * Fix hexHoles* (leftoover, grow to space, ...)
- * Add hexHolesCircle and may be other shapes
  * Try out box with fully mixed fF edges and check if all corners work properly
  * finish lamp
  * make fingerJointSettings depending on thickness?

boxes.py

@@ -10,7 +10,7 @@ class Boxes:
         self.thickness = thickness
         self.burn = 0.1
         self.fingerJointSettings = (10.0, 10.0)
-        self.fingerHoleEdgeWidth = 1.0 # multitudes of self.thickness
+        self.fingerHoleEdgeWidth = 1.0    # multitudes of self.thickness
         self.doveTailJointSettings = (10, 5, 50, 0.4) # width, depth, angle, radius
         self.flexSettings = (1.5, 3.0, 15.0) # line distance, connects, width
         self.output = "box.svg"
@@ -269,18 +269,44 @@ class Boxes:
         self.ctx.arc(-r, 0, r, 0, 2*math.pi)
         self.ctx.restore()
 
-    def hexHolesRectangle(self, x, y, r, b, style="circle"):
+    def hexHolesRectangle(self, x, y, r, b, style="circle", skip=None):
+        """
+        Fills a rectangle with holes.
+        r : radius of holes
+        b : space between holes
+        style : what types of holes (not yet implemented)
+        skip : function to check if hole should be present
+               gets x, y, r, b, posx, posy
+        """
         w = r+b/2.0
         dist = w * math.cos(math.pi/6.0)
-        # XXX leftover
-        cx = int(x // dist) # ???
-        cy = int(y // dist) # ???
-        self.moveTo(dist/2, r)
+
+        # how many half circles do fit
+        cx = int((x-2*r) // (w)) + 2
+        cy = int((y-2*r) // (dist)) + 2
+
+        # what's left on the sides
+        lx = (x - (2*r+(cx-2)*w))/2.0
+        ly = (y - (2*r+(cy-3)*dist))/2.0
+
         for i in xrange(cy//2):
-            for j in xrange(cx):
-                self.hole(2*j*w, i*4*dist, r)
-            for j in xrange(cx-1):
-                self.hole(2*j*w+w, i*4*dist + 2*dist, r)
+            for j in xrange((cx-(i%2))//2):
+                px = 2*j*w + r + lx
+                py = i*2*dist + r + ly
+                if i % 2:
+                    px += dist
+                if skip and skip(x, y, r, b, px, py):
+                    continue
+                self.hole(px, py, r)
+
+    def __skipcircle(self, x, y, r, b, posx, posy):
+        cx, cy = x/2.0, y/2.0
+        return ((((posx-cx)**2+(posy-cy)**2)**0.5) > (cx-r))
+
+    def hexHolesCircle(self, d, r, b, style="circle"):
+        d2 = d/2.0
+        self.hexHolesRectangle(d, d, r, b, style, self.__skipcircle)
+
 
     def hexHolesHex(self, h, r, b, style="circle", grow=None):
         self.ctx.rectangle(0, 0, h, h)

lamp.py

@@ -20,8 +20,8 @@ class Lamp(Boxes):
         self.ctx.save()
         d = 2*(r+w)
         self.roundedPlate(d, d, r)
-        self.moveTo(0, 0)
-        self.hexHolesHex(2*(r+w), 5, 3, grow='space')
+        self.moveTo(w/2.0, w/2.0)
+        self.hexHolesCircle(d-w, 5, 3)
         self.ctx.restore()
 
     def side(self, r, w, h):
@@ -72,8 +72,8 @@ class Lamp(Boxes):
 
         self.moveTo(0, 270)
 
-        #self.hexHolesHex(200, 20, 5)
-        #self.hexHolesRectangle(400, 200, 20, 5)
+        #self.hexHolesHex(200, 10, 5)
+        #self.hexHolesRectangle(400, 200, 11, 2)
 
         self.ctx.stroke()
         self.surface.flush()