Add more stuff to the web interface

boxes.py

@@ -571,8 +571,8 @@ See --sy for format""")
                     help="inner height in mm")
             elif arg == "hi":
                 self.argparser.add_argument(
-                    "--hi",  action="store", type=float, default=None,
+                    "--hi",  action="store", type=float, default=0.0,
-                    help="inner height of inner walls in mm")
+                    help="inner height of inner walls in mm (leave to zero for same as outer walls)")
             else:
                 raise ValueError("No default for argument", arg)
 

bserver.py

@@ -11,8 +11,8 @@ from wsgiref.util import setup_testing_defaults
 from wsgiref.simple_server import make_server
 import wsgiref.util
 
-import box, box2, box3, flexbox, flexbox2, flexbox3, flextest, folder
+import box, box2, box3, drillbox, flexbox, flexbox2, flexbox3, flextest, folder
-import magazinefile, trayinsert, typetray
+import magazinefile, trayinsert, typetray, silverwarebox
 
 
 class ArgumentParserError(Exception): pass
@@ -29,9 +29,16 @@ class BServer:
             "Box" : box.Box(),
             "Box2" : box2.Box(),
             "Box3" : box3.Box(),
+            "DrillBox" : drillbox.Box(),
             "FlexBox" : flexbox.FlexBox(),
             "FlexBox2" : flexbox2.FlexBox(),
             "FlexBox3" : flexbox3.FlexBox(),
+            "FlexTest": flextest.FlexTest(),
+            "Folder": folder.Folder(),
+            "MagazinFile" : magazinefile.Box(),
+            "TrayInsert" : trayinsert.TrayInsert(),
+            "TypeTray" : typetray.TypeTray(),
+            "SilverwareBox" : silverwarebox.Silverware(),
             }
 
     def arg2html(self, a):
@@ -40,10 +47,10 @@ class BServer:
             return ""
         if isinstance(a, argparse._StoreTrueAction):
             return """<tr><td>%s</td><td><input name="%s" type="checkbox" value="%s"></td><td>%s</td></tr>\n""" % \
-            (name, name, a.default or "", a.help)
+            (name, name, a.default, a.help)
         
         return """<tr><td>%s</td><td><input name="%s" type="text" value="%s"></td><td>%s</td></tr>\n""" % \
-            (name, name, a.default or "", a.help)
+            (name, name, a.default, a.help)
     
     def args2html(self, args, msg=""):
         if msg:

drillbox.py

@@ -17,9 +17,9 @@
 from boxes import *
 
 class Box(Boxes):
-    def __init__(self, x, y, h):
+    def __init__(self):
         Boxes.__init__(self)
-        self.x, self.y, self.h = x, y, h
+        self.x, self.y, self.h = 120, 240, 60
 
     def holesx(self):
         self.fingerHolesAt(0, 5, self.x, angle=0)
@@ -72,6 +72,6 @@ class Box(Boxes):
         self.close()
 
 if __name__ == '__main__':
-    b = Box(120, 240, 60)
+    b = Box()
     b.parseArgs()
     b.render()

folder.py

@@ -23,7 +23,7 @@ class Folder(Boxes):
         Boxes.__init__(self)
         self.buildArgParser("x", "y", "h")
         self.argparser.add_argument(
-            "-r", action="store", type=float, default=10.0,
+            "--r", action="store", type=float, default=10.0,
             help="radius of the corners")
         self.argparser.set_defaults(h=20)
 

silverwarebox.py

@@ -65,7 +65,8 @@ class Silverware(Boxes):
     ### main
     ##################################################
 
-    def render(self, x, y, h, r):
+    def render(self):
+        x, y, h, r = 250, 250/1.618, 120, 30
         self.open(750, 450)
         t = self.thickness
         b = self.burn
@@ -85,4 +86,4 @@ class Silverware(Boxes):
 if __name__ == '__main__':
     b = Silverware()
     b.parseArgs()
-    b.render(250, 250/1.618, 120, 30)
+    b.render()