From 296a35455287aeecbb960b36b15402bf7b237d1c Mon Sep 17 00:00:00 2001
From: Florian Festi <ffesti@redhat.com>
Date: Tue, 16 Apr 2013 12:22:20 +0900
Subject: [PATCH] Use roundedPlate as base plate

---
 silverwarebox.py | 36 +++++++-----------------------------
 1 file changed, 7 insertions(+), 29 deletions(-)

diff --git a/silverwarebox.py b/silverwarebox.py
index 845e024..5e62947 100755
--- a/silverwarebox.py
+++ b/silverwarebox.py
@@ -7,35 +7,13 @@ class Silverware(Boxes):
     ### Parts
     ####################################################################
 
-    def basePlate(self, x=100, y=100, r=0):
-        self.ctx.save()
-        self.moveTo(r, 0)
-
-        # two walls
-        self.fingerHolesAt(x/3.0-r, 0, 0.5*y-self.thickness)
-        self.fingerHolesAt(x*2/3.0-r, 0, 0.5*y-self.thickness)
-
-        self.fingerJoint(0.5*x-r)
-        self.fingerJoint(0.5*x-r)
-
-        self.corner(90, r)
-
-        # Middle wall
-        self.fingerHolesAt(y/2.0-r, 0, x)
-
-        self.fingerJoint(y-2*r)
-        self.corner(90, r)
-
-        # single wall
-        self.fingerHolesAt(x/2.0-r, 0, 0.5*y-self.thickness)
-
-        self.fingerJoint(x-2*r)
-
-        self.corner(90, r)
-        self.fingerJoint(y-2*r)
-        self.corner(90, r)
-
-        self.ctx.restore()
+    def basePlate(self, x, y, r):
+        self.roundedPlate(x, y, r, callback=[
+                lambda: self.fingerHolesAt(x/3.0-r, 0, 0.5*y-self.thickness),
+                lambda: self.fingerHolesAt(x/6.0, 0, 0.5*y-self.thickness),
+                lambda: self.fingerHolesAt(y/2.0-r, 0, x),
+                lambda: self.fingerHolesAt(x/2.0-r, 0, 0.5*y-self.thickness)
+                ])
 
     def wall(self, x=100, y=100, h=100, r=0):
         self.surroundingWall(x,y,r,h, bottom='finger', callback={