From 29a7a6608555af13c54eb51d8bb41a6afe567363 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beat=20J=C3=A4ckle?= <beat@git.jdmweb2.ch>
Date: Sat, 18 Dec 2021 22:30:16 +0100
Subject: [PATCH] load CH-Kreuz as python module, not as svg file

---
 CH-Kreuz_7mm.svg | 14 --------------
 ch_kreuz.py      | 20 ++++++++++++++++++++
 qrr.py           |  6 +++---
 3 files changed, 23 insertions(+), 17 deletions(-)
 delete mode 100755 CH-Kreuz_7mm.svg
 create mode 100644 ch_kreuz.py

diff --git a/CH-Kreuz_7mm.svg b/CH-Kreuz_7mm.svg
deleted file mode 100755
index f1296f3..0000000
--- a/CH-Kreuz_7mm.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 20.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg width="7mm" height="7mm" version="1.1" id="Ebene_2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 19.8 19.8" style="enable-background:new 0 0 19.8 19.8;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-	.st1{fill:none;stroke:#FFFFFF;stroke-width:1.4357;stroke-miterlimit:10;}
-</style>
-<polygon points="18.3,0.7 1.6,0.7 0.7,0.7 0.7,1.6 0.7,18.3 0.7,19.1 1.6,19.1 18.3,19.1 19.1,19.1 19.1,18.3 19.1,1.6 19.1,0.7 "/>
-<rect x="8.3" y="4" class="st0" width="3.3" height="11"/>
-<rect x="4.4" y="7.9" class="st0" width="11" height="3.3"/>
-<polygon class="st1" points="0.7,1.6 0.7,18.3 0.7,19.1 1.6,19.1 18.3,19.1 19.1,19.1 19.1,18.3 19.1,1.6 19.1,0.7 18.3,0.7 
-	1.6,0.7 0.7,0.7 "/>
-</svg>
diff --git a/ch_kreuz.py b/ch_kreuz.py
new file mode 100644
index 0000000..6f2453e
--- /dev/null
+++ b/ch_kreuz.py
@@ -0,0 +1,20 @@
+#!/usr/bin/env python3
+
+import svgutils.transform as st
+
+
+def swisscross():
+    return st.fromstring(
+            '<?xml version="1.0" encoding="utf-8"?>\
+            <svg width="7mm" height="7mm" version="1.1" id="Ebene_2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"\
+                 viewBox="0 0 19.8 19.8" style="enable-background:new 0 0 19.8 19.8;" xml:space="preserve">\
+            <style type="text/css">\
+                .st0{fill:#FFFFFF;}\
+                .st1{fill:none;stroke:#FFFFFF;stroke-width:1.4357;stroke-miterlimit:10;}\
+            </style>\
+            <polygon points="18.3,0.7 1.6,0.7 0.7,0.7 0.7,1.6 0.7,18.3 0.7,19.1 1.6,19.1 18.3,19.1 19.1,19.1 19.1,18.3 19.1,1.6 19.1,0.7 "/>\
+            <rect x="8.3" y="4" class="st0" width="3.3" height="11"/>\
+            <rect x="4.4" y="7.9" class="st0" width="11" height="3.3"/>\
+            <polygon class="st1" points="0.7,1.6 0.7,18.3 0.7,19.1 1.6,19.1 18.3,19.1 19.1,19.1 19.1,18.3 19.1,1.6 19.1,0.7 18.3,0.7 1.6,0.7 0.7,0.7 "/>\
+            </svg>'
+            ).getroot()
diff --git a/qrr.py b/qrr.py
index 1d7bef8..299d360 100755
--- a/qrr.py
+++ b/qrr.py
@@ -3,8 +3,8 @@
 import os.path
 import qrcode
 import qrcode.image.svg
-import svgutils.transform as st
-
+from svgutils import transform as st
+from ch_kreuz import swisscross as get_swisscross
 
 class qr_rechnung():
     data = ''
@@ -39,7 +39,7 @@ class qr_rechnung():
 
         qrcode = st.fromfile(filepath)
         offset = self.calc_move_offset(qrcode.get_size()[0])
-        swisscross = st.fromfile("CH-Kreuz_7mm.svg").getroot()
+        swisscross = get_swisscross()
         swisscross.moveto(
             x=offset['offset'],
             y=offset['offset'],