From b80bd88072f1823f4120e57eb07a423ea17f62f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20W=C3=BCst?= <sebi@timewaster.de>
Date: Mon, 21 Apr 2014 17:21:40 +0200
Subject: ensure backwards compatibility with old hpgl exports

(bzr r13295)
---
 share/extensions/hpgl_decoder.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'share/extensions/hpgl_decoder.py')

diff --git a/share/extensions/hpgl_decoder.py b/share/extensions/hpgl_decoder.py
index c195b21e3..06cf566a3 100644
--- a/share/extensions/hpgl_decoder.py
+++ b/share/extensions/hpgl_decoder.py
@@ -112,7 +112,7 @@ class hpglDecoder:
     def getParameters(self, parameterString):
         # process coordinates
         if parameterString.strip() == '':
-            return []
+            parameterString = '0,0;'
         # remove command delimiter
         parameterString = parameterString.replace(';', '').strip()
         # split parameter
-- 
cgit v1.2.3


From 1ddcb3036710fa1f6f98aa613f17d651e5a5ea0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20W=C3=BCst?= <sebi@timewaster.de>
Date: Mon, 28 Apr 2014 15:03:44 +0200
Subject: changed default unit for hpgl importer to real world unit mm

(bzr r13314)
---
 share/extensions/hpgl_decoder.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'share/extensions/hpgl_decoder.py')

diff --git a/share/extensions/hpgl_decoder.py b/share/extensions/hpgl_decoder.py
index 06cf566a3..e909790b7 100644
--- a/share/extensions/hpgl_decoder.py
+++ b/share/extensions/hpgl_decoder.py
@@ -37,20 +37,21 @@ class hpglDecoder:
         '''
         self.hpglString = hpglString
         self.options = options
-        self.scaleX = options.resolutionX / 90.0 # dots/inch to dots/pixels
-        self.scaleY = options.resolutionY / 90.0 # dots/inch to dots/pixels
+        self.scaleX = options.resolutionX / 25.4 # dots/inch to dots/mm
+        self.scaleY = options.resolutionY / 25.4 # dots/inch to dots/mm
         self.warning = ''
         self.textMovements = _("Movements")
         self.textPenNumber = _("Pen #")
 
     def getSvg(self):
         # prepare document
-        self.doc = inkex.etree.parse(StringIO('<svg xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" width="%s" height="%s"></svg>' %
-            (self.options.docWidth, self.options.docHeight)))
+        self.doc = inkex.etree.parse(StringIO('<svg xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="%smm" height="%smm" viewBox="0 0 %s %s"></svg>' %
+            (self.options.docWidth, self.options.docHeight, self.options.docWidth, self.options.docHeight)))
+        inkex.etree.SubElement(self.doc.getroot(), inkex.addNS('namedview', 'sodipodi'), {inkex.addNS('document-units', 'inkscape'): 'mm'})
         actualLayer = 0
         self.layers = {}
         if self.options.showMovements:
-            self.layers[0] = inkex.etree.SubElement(self.doc.getroot(), 'g', {inkex.addNS('groupmode', 'inkscape'): 'layer', inkex.addNS('label', 'inkscape'): self.textMovements})
+            self.layers[0] = inkex.etree.SubElement(self.doc.getroot(), 'g', {inkex.addNS('groupmode', 'inkscape'): 'layer', inkex.addNS('label', 'inkscape'): self.textMovements, 'id': self.textMovements})
         # parse paths
         hpglData = self.hpglString.split(';')
         if len(hpglData) < 3:
@@ -101,7 +102,7 @@ class hpglDecoder:
             self.layers[layerNumber]
         except KeyError:
             self.layers[layerNumber] = inkex.etree.SubElement(self.doc.getroot(), 'g',
-                {inkex.addNS('groupmode', 'inkscape'): 'layer', inkex.addNS('label', 'inkscape'): self.textPenNumber + layerNumber})
+                {inkex.addNS('groupmode', 'inkscape'): 'layer', inkex.addNS('label', 'inkscape'): self.textPenNumber + layerNumber, 'id': self.textPenNumber + layerNumber})
 
     def addPathToLayer(self, path, layerNumber):
         lineColor = '000000'
-- 
cgit v1.2.3