diff options
| author | Sebastian Wüst <sebi@timewaster.de> | 2014-04-28 13:03:44 +0000 |
|---|---|---|
| committer | Sebastian Wüst <sebi@timewaster.de> | 2014-04-28 13:03:44 +0000 |
| commit | 1ddcb3036710fa1f6f98aa613f17d651e5a5ea0a (patch) | |
| tree | 71cc359ddce483360cbc443b2cda754a6004a9cc | |
| parent | Update CMake Files (diff) | |
| download | inkscape-1ddcb3036710fa1f6f98aa613f17d651e5a5ea0a.tar.gz inkscape-1ddcb3036710fa1f6f98aa613f17d651e5a5ea0a.zip | |
changed default unit for hpgl importer to real world unit mm
(bzr r13314)
| -rw-r--r-- | share/extensions/hpgl_decoder.py | 13 | ||||
| -rw-r--r-- | share/extensions/hpgl_input.py | 4 |
2 files changed, 9 insertions, 8 deletions
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' diff --git a/share/extensions/hpgl_input.py b/share/extensions/hpgl_input.py index d85a5edd6..a85c32b34 100644 --- a/share/extensions/hpgl_input.py +++ b/share/extensions/hpgl_input.py @@ -36,8 +36,8 @@ parser.add_option('--showMovements', action='store', type='inkbool', dest='showM (options, args) = parser.parse_args(inkex.sys.argv[1:]) # needed to initialize the document -options.docWidth = 210.0 * 3.5433070866 # 210mm to pixels (DIN A4) -options.docHeight = 297.0 * 3.5433070866 # 297mm to pixels (DIN A4) +options.docWidth = 210.0 # 210mm (DIN A4) +options.docHeight = 297.0 # 297mm (DIN A4) # read file fobj = open(args[0], 'r') |