# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1398278536 -7200
# Node ID 0906a130dae4c2720226db076b955cafece7acb9
# Parent  39f5c2c18dc22998c8501d9b01b75a3a3f1f9375
Improved the expression of the inner edge cutouts.

diff -r 39f5c2c18dc2 -r 0906a130dae4 cartridge.scad
--- a/cartridge.scad	Wed Apr 23 20:33:02 2014 +0200
+++ b/cartridge.scad	Wed Apr 23 20:42:16 2014 +0200
@@ -80,10 +80,12 @@
 	front = 2;
 	back = 3.5;
 	top = 3;
-	front_left = 1.5;
-	front_right = front_left;
-	back_left = 1.5;
-	back_right = back_left;
+	front_side = 1.5;
+	front_left = front_side;
+	front_right = front_side;
+	back_side = 1.5;
+	back_left = back_side;
+	back_right = back_side;
 	bottom = 2;
 
 	/* Label details. */
@@ -108,16 +110,20 @@
 	top_groove_width = 1.0;
 	top_groove_depth = 2.0;
 
-	/* Space for the back inside the front. */
+	/*
+	Space for the inner edge of the back inside the front.
+	Offsets are measured from the outside surfaces.
+	*/
 
 	inner_top_front_cutout_width = width - back_left - back_right;
 	inner_top_front_cutout_depth = 1.0;
-	inner_top_front_cutout_offset = 2.0; /* from top outer surface */
+	inner_top_front_cutout_height = 1.0;
+	inner_top_front_cutout_offset = top - inner_top_front_cutout_height;
 
 	inner_side_front_cutout_height = height - inner_top_front_cutout_offset;
 	inner_side_front_cutout_width = 0.5;
 	inner_side_front_cutout_depth = 1.0;
-	inner_side_front_cutout_offset = 1.0; /* from side outer surface */
+	inner_side_front_cutout_offset = front_side - inner_side_front_cutout_width;
 
 	back_cavity_width = 68.0;
 	back_cavity_inner_width = 65.0;
@@ -367,10 +373,10 @@
 
 		translate([0, -inner_top_front_cutout_depth / 2, height / 2 -
 			inner_top_front_cutout_offset -
-			inner_top_front_cutout_depth / 2])
+			inner_top_front_cutout_height / 2])
 			cube([inner_top_front_cutout_width,
 				inner_top_front_cutout_depth,
-				inner_top_front_cutout_depth], center = true);
+				inner_top_front_cutout_height], center = true);
 
 		translate([width / 2 - inner_side_front_cutout_offset -
 			inner_side_front_cutout_width / 2,