From 895063f2bc8a460f40c6215406d3eb4bcbfdf910 Mon Sep 17 00:00:00 2001
From: Brandon King <kingb@caltech.edu>
Date: Fri, 1 May 2009 00:21:58 +0000
Subject: [PATCH] Updated container and freezer labels to be larger by request
 of Lorian.

---
 samplebc/samples/views.py         | 18 +++++++------
 templates/zpl_container_label.txt | 36 +++++++++-----------------
 templates/zpl_freezer_label.txt   | 42 +++++++++++--------------------
 3 files changed, 37 insertions(+), 59 deletions(-)

diff --git a/samplebc/samples/views.py b/samplebc/samples/views.py
index d1e6c3e..ff6ea26 100644
--- a/samplebc/samples/views.py
+++ b/samplebc/samples/views.py
@@ -229,10 +229,11 @@ def container_print(request, container_id):
         return HttpResponse('Container (%s) does not exist!' % (container_id))
     
     params = {}
-    params['line1'] = __center_line('', 10)
-    params['line2'] = __center_line('', 14)
-    params['line3'] = __center_line('%s' % (container.name[16:16+15]), 15)
-    params['container_name'] = __center_line(container.name[0:16], 16)
+    params['container_name'] = __center_line(container.name[0:17], 17)
+    params['line1'] = __center_line('%s' % (container.name[17:34]), 17)
+    params['line2'] = __center_line('%s' % (container.name[34:51]), 17)
+    params['line3'] = __center_line('%s' % (container.name[51:68]), 17)
+    params['line4'] = __center_line('%s' % (container.name[68:85]), 17)
     params['barcode'] = 'cntr|%s' % (container.uuid)
     params['symbol'] = ''
     
@@ -411,10 +412,11 @@ def freezer_print(request, freezer_id):
         return HttpResponse('Freezer (%s) does not exist!' % (freezer_id))
     
     params = {}
-    params['line1'] = __center_line('', 10)
-    params['line2'] = __center_line('', 14)
-    params['line3'] = __center_line('Temp: %s C' % (freezer.temperature), 15)
-    params['freezer_name'] = __center_line(freezer.name, 16)
+    params['freezer_name'] = __center_line(freezer.name, 17)
+    params['line1'] = __center_line('%s' % (freezer.name[17:34]), 17)
+    params['line2'] = __center_line('%s' % (freezer.name[34:51]), 17)
+    params['line3'] = __center_line('%s' % (freezer.name[51:68]), 17)
+    params['line4'] = __center_line('Temp: %s C' % (freezer.temperature), 17)
     params['barcode'] = 'frzr|%s' % (freezer.uuid)
     params['symbol'] = ''
     
diff --git a/templates/zpl_container_label.txt b/templates/zpl_container_label.txt
index 61ba9b6..8362c4d 100644
--- a/templates/zpl_container_label.txt
+++ b/templates/zpl_container_label.txt
@@ -6,41 +6,29 @@
 ^FX-------------------------
 ^FX Container ID
 ^FX-------------------------
-^FO105,167
-^CF0,24^FD{{ container_name }}^FS
+^FO5,30
+^CF0,42^FD{{ container_name }}^FS
 
 ^FX-------------------------
 ^FX Content
 ^FX-------------------------
 
 ^FX Line 1 (max_length=10)
-^FO135,113
-^CF0,16^FD{{ line1 }}^FS
+^FO5,70
+^CF0,42^FD{{ line1 }}^FS
 
 ^FX Line 2 (max_length=14)
-^FO120,131
-^CF0,16^FD{{ line2 }}^FS
+^FO5,110
+^CF0,42^FD{{ line2 }}^FS
 
 ^FX Line 3 (max_length=15)
-^FO115,149
-^CF0,16^FD{{ line3 }}^FS
+^FO5,150
+^CF0,42^FD{{ line3 }}^FS
 
-^FX-------------------------
-^FX Slot #
-^FX
-^FX (75 - (54 / 2)) / 2 == 24
-^FX x_center = (175 + 30 + 24)
-^FX x = x_center - 24 + 4
-^FX y = x_center - 24 + 4 - (28/2)
-^FX-------------------------
-^FO209,195
-^CF0,28^FD{{ symbol }}^FS
+^FX Line 4 (max_length=15)
+^FO5,190
+^CF0,42^FD{{ line4 }}^FS
 
-^FX-------------------------
-^FX Circle - Temp
-^FX-------------------------
-^FX FO100,100
-^FX GC150,1^FS
 
 ^FX-------------------------
 ^FX Datamatrix Barcode
@@ -48,7 +36,7 @@
 ^FX h=w=<#col>*3 
 ^FX upper_left_coords=(175-(w/2), 250-6-h)
 ^FX-------------------------
-^FO148,188
+^FO148,230
 ^BXN,3,200
 ^FD{{ barcode }}^FS
 
diff --git a/templates/zpl_freezer_label.txt b/templates/zpl_freezer_label.txt
index cdfd78c..fd68c54 100644
--- a/templates/zpl_freezer_label.txt
+++ b/templates/zpl_freezer_label.txt
@@ -6,41 +6,29 @@
 ^FX-------------------------
 ^FX Freezer ID
 ^FX-------------------------
-^FO105,167
-^CF0,24^FD{{ freezer_name }}^FS
+^FO5,30
+^CF0,42^FD{{ freezer_name }}^FS
 
 ^FX-------------------------
 ^FX Content
 ^FX-------------------------
 
-^FX Line 1 (max_length=10)
-^FO135,113
-^CF0,16^FD{{ line1 }}^FS
+^FX Line 1 (max_length=17)
+^FO5,70
+^CF0,42^FD{{ line1 }}^FS
 
-^FX Line 2 (max_length=14)
-^FO120,131
-^CF0,16^FD{{ line2 }}^FS
+^FX Line 2 (max_length=17)
+^FO5,110
+^CF0,42^FD{{ line2 }}^FS
 
-^FX Line 3 (max_length=15)
-^FO115,149
-^CF0,16^FD{{ line3 }}^FS
+^FX Line 3 (max_length=17)
+^FO5,150
+^CF0,42^FD{{ line3 }}^FS
 
-^FX-------------------------
-^FX Slot #
-^FX
-^FX (75 - (54 / 2)) / 2 == 24
-^FX x_center = (175 + 30 + 24)
-^FX x = x_center - 24 + 4
-^FX y = x_center - 24 + 4 - (28/2)
-^FX-------------------------
-^FO209,195
-^CF0,28^FD{{ symbol }}^FS
+^FX Line 4 (max_length=17)
+^FO5,190
+^CF0,32^FD{{ line4 }}^FS
 
-^FX-------------------------
-^FX Circle - Temp
-^FX-------------------------
-^FX FO100,100
-^FX GC150,1^FS
 
 ^FX-------------------------
 ^FX Datamatrix Barcode
@@ -48,7 +36,7 @@
 ^FX h=w=<#col>*3 
 ^FX upper_left_coords=(175-(w/2), 250-6-h)
 ^FX-------------------------
-^FO148,188
+^FO148,230
 ^BXN,3,200
 ^FD{{ barcode }}^FS
 
-- 
2.30.2