From eeb07bfb443a0d1ac76d068c265c45cc144508be Mon Sep 17 00:00:00 2001
From: Matthias Neeracher <microtherion@gmail.com>
Date: Wed, 24 Nov 2021 05:07:43 +0100
Subject: [PATCH] Tweak placement

---
 battery-case-generator.py | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/battery-case-generator.py b/battery-case-generator.py
index 1b7b0e9..6063b04 100755
--- a/battery-case-generator.py
+++ b/battery-case-generator.py
@@ -52,7 +52,7 @@ args.plug_edge     = args.interior_edge-args.thickness
 args.exterior_edge = args.interior_edge+2.0*args.thickness
 args.interior_leg  = (args.interior_edge-args.horizontal_finger-args.kerf)/2-args.corner_inset
 finger_length      = args.interior_edge-2.0*args.corner_inset
-args.n_hor_fingers = int(finger_length/args.horizontal_finger/2)
+args.n_hor_fingers = max(int(finger_length/args.horizontal_finger/2), 1)
 args.exterior_leg  = (finger_length-(2*args.n_hor_fingers-1)*args.horizontal_finger+args.kerf)/2
 args.exterior_slot = (args.exterior_edge-args.horizontal_finger+args.kerf)/2
 args.n_ver_fingers = int(args.height/args.vertical_finger/2)
@@ -62,8 +62,9 @@ args.slots         = [args.vertical_finger*2.5-args.thickness*0.5, args.vertical
 if args.verbose:
     print(args, file=sys.stderr)
 
-DIMX   = 5.0*args.grid*args.dimension
-DIMY   = 2.5*args.grid*args.dimension+args.height+3.0*args.thickness
+BOX    = 2.0*args.exterior_edge+5.0
+DIMX   = 3.0*BOX
+DIMY   = 2.0*BOX+args.height+3.0*args.thickness
 PI3    = math.pi/3
 
 HOLES  = ''
@@ -289,15 +290,15 @@ def draw_case(x0, y0, h, slots):
             HOLES += '<rect x="%.2f" y="%.2f" width="%.2f" height="%.2f"/>\n' % (x, y, w, h)
 
 print('<svg viewBox="0 0 %.2f %.2f" width="%.2fmm" height="%.2fmm" stroke-width="0.1" xmlns="http://www.w3.org/2000/svg">' % (DIMX, DIMY, DIMX, DIMY))
-draw_grid(0.65*args.grid*args.dimension, 0.60*args.grid*args.dimension)
-draw_plane(0.65*args.grid*args.dimension, 0.60*args.grid*args.dimension, 'interior')
-draw_grid(1.90*args.grid*args.dimension, 0.60*args.grid*args.dimension)
-draw_plane(1.90*args.grid*args.dimension, 0.60*args.grid*args.dimension, 'interior')
-draw_plane(3.15*args.grid*args.dimension, 0.60*args.grid*args.dimension, 'bottom')
-draw_plane(0.65*args.grid*args.dimension, 1.70*args.grid*args.dimension, 'rim')
-draw_plane(0.65*args.grid*args.dimension, 1.70*args.grid*args.dimension, 'plug')
-draw_plane(2.00*args.grid*args.dimension, 1.70*args.grid*args.dimension, 'lid')
-draw_plane(2.00*args.grid*args.dimension, 1.70*args.grid*args.dimension, 'plug_mark')
-draw_case(0.05*args.grid*args.dimension, 2.30*args.grid*args.dimension, args.height, args.slots)
+draw_grid(0.5*BOX, 0.5*BOX)
+draw_plane(0.5*BOX, 0.5*BOX, 'interior')
+draw_grid(1.5*BOX, 0.5*BOX)
+draw_plane(1.5*BOX, 0.5*BOX, 'interior')
+draw_plane(0.5*BOX, 1.5*BOX, 'bottom')
+draw_plane(1.5*BOX, 1.5*BOX, 'rim')
+draw_plane(1.5*BOX, 1.5*BOX, 'plug')
+draw_plane(2.5*BOX, 1.5*BOX, 'lid')
+draw_plane(2.5*BOX, 1.5*BOX, 'plug_mark')
+draw_case(0.05*args.grid*args.dimension, 2.0*BOX, args.height, args.slots)
 print('<g fill="none" stroke="red">', HOLES, '</g>', '<g fill="none" stroke="blue">', MARKS, '</g>', '<g fill="none" stroke="black">', SHAPES, '</g>', sep='\n')
 print('</svg>')