From cb70e9ce70a09843870323314ebf939cbb9b35f0 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 13 Feb 2016 22:26:01 +0000
Subject: [PATCH] sealing-box, bike-lipo-box: combine $sealingbox_sz out of
 _xbox et al (nfc)

---
 bike-lipo-box.scad  | 14 +++++---------
 sealing-box.scad.m4 | 12 ++++++------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/bike-lipo-box.scad b/bike-lipo-box.scad
index 6ad60b0..850200b 100644
--- a/bike-lipo-box.scad
+++ b/bike-lipo-box.scad
@@ -73,14 +73,14 @@ ts_totx = 30;
 ts_toty = 25;
 ts_totz_inner = 8;
 
+ts_box_sz = [ts_totx, ts_toty, ts_totz_inner];
+
 $sealingbox_wallth = wallthick;
 $sealingbox_floorth = wallthick;
 $sealingbox_ceilth = wallthick;
 
 module TestSealBox(){ ////toplevel
-  $sealingbox_xbox = ts_totx;
-  $sealingbox_ybox = ts_toty;
-  $sealingbox_zbox = ts_totz_inner;
+  $sealingbox_sz = ts_box_sz;
 
   SealingBox_RectBox();
   ts_cidoff = ($sealingbox_cnrrad * (1-.7) + wallthick * .8) * [1,1];
@@ -89,9 +89,7 @@ module TestSealBox(){ ////toplevel
 }
 
 module TestSealLid(){ ////toplevel
-  $sealingbox_xbox = ts_totx;
-  $sealingbox_ybox = ts_toty;
-  $sealingbox_zbox = ts_totz_inner;
+  $sealingbox_sz = ts_box_sz;
 
   difference(){
     SealingBox_RectLid();
@@ -112,9 +110,7 @@ module TestSealLidPrint(){ ////toplevel
 }
 
 module ProfileDemos(){ ////toplevel
-  $sealingbox_xbox = ts_totx;
-  $sealingbox_ybox = ts_toty;
-  $sealingbox_zbox = ts_totz_inner;
+  $sealingbox_sz = ts_box_sz;
 
   SealingBox_WallProfile();
   color("blue") SealingBox_FloorProfile();
diff --git a/sealing-box.scad.m4 b/sealing-box.scad.m4
index 2c06917..31f7f65 100644
--- a/sealing-box.scad.m4
+++ b/sealing-box.scad.m4
@@ -6,9 +6,9 @@
 //      1. include <sealing-box.scad>
 //      2. assign() values to (xxx these should be $ variables)
 //           $sealingbox_wallth
-//           $sealingbox_xbox (outer dimension)
-//           $sealingbox_ybox (outer dimension)
-//           $sealingbox_zbox (inner dimension)
+//           $sealingbox_sz[0] (outer dimension)
+//           $sealingbox_sz[1] (outer dimension)
+//           $sealingbox_sz[2] (inner dimension)
 //           $sealingbox_ceilth
 //           $sealingbox_floorth
 //           $sealingbox_wallth
@@ -30,9 +30,9 @@
 $sealingbox_cnrrad = 10;
 
 m4_define(`BoxLocals',`
-  xbox = $sealingbox_xbox;
-  ybox = $sealingbox_ybox;
-  zbox = $sealingbox_zbox;
+  xbox = $sealingbox_sz[0];
+  ybox = $sealingbox_sz[1];
+  zbox = $sealingbox_sz[2];
   wall = $sealingbox_wallth;
   floorth = $sealingbox_floorth;
   ceilth = $sealingbox_ceilth;
-- 
2.30.2