Connector tool: make connectors avoid the convex hull of shapes.

(bzr r8857.1.2)

6 files changed, 80 insertions, 9 deletions

diff --git a/share/extensions/Barcode/EAN13.py b/share/extensions/Barcode/EAN13.py
index 3450893fc..c79b7749d 100644
--- a/share/extensions/Barcode/EAN13.py
+++ b/share/extensions/Barcode/EAN13.py
@@ -42,8 +42,8 @@ class Object(Barcode):
 		if len(number) == 12:
 			number = number + self.getChecksum(number)
 		else:
-			if not self.varifyChecksum(number):
-				sys.stderr.write("EAN13 Checksum not correct for this barcode, omit last charicter to generate new checksum.\n")
+			if not self.verifyChecksum(number):
+				sys.stderr.write("EAN13 Checksum not correct for this barcode, omit last character to generate new checksum.\n")
 				return
 
 		result = result + guardBar
@@ -83,9 +83,9 @@ class Object(Barcode):
 
 		return str(z)
 
-	def varifyChecksum(self, number):
-		new = self.getChecksum(number[:12])
-		existing = number[12]
+	def verifyChecksum(self, number):
+		new = self.getChecksum(number[:-1])
+		existing = number[-1]
 		return new == existing
 
 	def getStyle(self, index):
diff --git a/share/extensions/Barcode/EAN5.py b/share/extensions/Barcode/EAN5.py
new file mode 100644
index 000000000..9113566a3
--- /dev/null
+++ b/share/extensions/Barcode/EAN5.py
@@ -0,0 +1,67 @@
+''' 
+Copyright (C) 2007 Martin Owens 
+Copyright (C) 2009 Aaron C Spike 
+
+Thanks to Lineaire Chez of Inkbar ( www.inkbar.lineaire.net ) 
+
+This program is free software; you can redistribute it and/or modify 
+it under the terms of the GNU General Public License as published by 
+the Free Software Foundation; either version 2 of the License, or 
+(at your option) any later version. 
+
+This program is distributed in the hope that it will be useful, 
+but WITHOUT ANY WARRANTY; without even the implied warranty of 
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+GNU General Public License for more details. 
+
+You should have received a copy of the GNU General Public License 
+along with this program; if not, write to the Free Software 
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
+'''
+
+from Base import Barcode
+import sys
+
+mapLeftFamily = [
+    [ "0001101","0011001","0010011","0111101","0100011","0110001","0101111","0111011","0110111","0001011" ], #L
+    [ "0100111","0110011","0011011","0100001","0011101","0111001","0000101","0010001","0001001","0010111" ], #G
+]
+mapFamily  = [ '11000','10100','10010','10001','01100','00110','00011','01010','01001','00101' ]
+
+startBar = '01011';
+sepBar = '01';
+
+class Object(Barcode):
+    def encode(self, number):
+        result = []
+        self.x += 110.0             # horizontal offset so it does not overlap EAN13
+        self.y -= self.height + 5   # move the text to the top
+        if len(number) != 5 or not number.isdigit():
+            sys.stderr.write("Can not encode '" + number + "' into EAN5 Barcode, Size must be 5 numbers only\n")
+            return
+
+        check = self.getChecksum(number)
+        family = mapFamily[check]
+
+        for i in range(5):
+            mapLeft = mapLeftFamily[int(family[i])]
+            result.append(mapLeft[int(number[i])])
+
+        self.label = number[0]
+        for i in range(1,5):
+            self.label += ' ' + number[i]
+        self.inclabel = self.label
+        return startBar + '01'.join(result)
+
+    def getChecksum(self, number):
+        return sum([int(n)*int(m) for n,m in zip(number, '39393')]) % 10
+
+    def getStyle(self, index):
+        result = { 'width' : '1', 'top' : int(self.y) + self.height + 5 + int(self.fontSize()), 'write' : True }
+        if index==0: # White Space
+            result['write'] = False
+        elif index==1: # Black Bar
+            result['height'] = int(self.height)
+        elif index==2: # Guide Bar
+            result['height'] = int(self.height) + 5
+        return result
diff --git a/share/extensions/Barcode/Makefile.am b/share/extensions/Barcode/Makefile.am
index 338c01c10..fd5f1663b 100644
--- a/share/extensions/Barcode/Makefile.am
+++ b/share/extensions/Barcode/Makefile.am
@@ -9,6 +9,7 @@ barcode_SCRIPTS = \
 	Code93.py \
 	EAN13.py \
 	EAN8.py \
+	EAN5.py \
 	__init__.py \
 	RM4CC.py \
 	UPCA.py \
diff --git a/share/extensions/Barcode/UPCA.py b/share/extensions/Barcode/UPCA.py
index b67d0830b..89c97eed6 100644
--- a/share/extensions/Barcode/UPCA.py
+++ b/share/extensions/Barcode/UPCA.py
@@ -33,8 +33,8 @@ class Object(EAN13.Object):
 		if len(number) == 11:
 			number = number + self.getChecksum(number)
 		else:
-			if not self.varifyChecksum(number):
-				sys.stderr.write("EAN13 Checksum not correct for this barcode, omit last charicter to generate new checksum.\n")
+			if not self.verifyChecksum(number):
+				sys.stderr.write("UPC-A Checksum not correct for this barcode, omit last character to generate new checksum.\n")
 				return
 
 		result = result + guardBar
diff --git a/share/extensions/Barcode/UPCE.py b/share/extensions/Barcode/UPCE.py
index 0ad518680..b41e94e8c 100644
--- a/share/extensions/Barcode/UPCE.py
+++ b/share/extensions/Barcode/UPCE.py
@@ -47,8 +47,8 @@ class Object(EAN13.Object):
 		if not echeck:
 			echeck = self.getChecksum(number)
 		else:
-			if not self.varifyChecksum(number + echeck):
-				sys.stderr.write("UPC-E Checksum not correct for this barcode, omit last charicter to generate new checksum.\n")
+			if not self.verifyChecksum(number + echeck):
+				sys.stderr.write("UPC-E Checksum not correct for this barcode, omit last character to generate new checksum.\n")
 				return
 
 		number = self.ConvertAtoE(number)
diff --git a/share/extensions/Barcode/__init__.py b/share/extensions/Barcode/__init__.py
index a455c3b7c..b2257ebcb 100644
--- a/share/extensions/Barcode/__init__.py
+++ b/share/extensions/Barcode/__init__.py
@@ -74,6 +74,9 @@ def getBarcode(format, param={}):
 		elif format in ['ean13', 'ucc13','jan']:
 			import EAN13
 			return EAN13.Object(param)
+		elif format == 'ean5':
+			import EAN5
+			return EAN5.Object(param)
 		elif format in ['ean8', 'ucc8']:
 			import EAN8
 			return EAN8.Object(param)