diff options
| author | Liam P. White <inkscapebronyat-signgmaildotcom> | 2014-04-29 01:00:39 +0000 |
|---|---|---|
| committer | Liam P. White <inkscapebronyat-signgmaildotcom> | 2014-04-29 01:00:39 +0000 |
| commit | eca72e61451c8deae7f2f5fbaa9885aec946c790 (patch) | |
| tree | 76d436abbbe469e0bc3b4a254e0ab6e5b4525e3b /share | |
| parent | Update to trunk (diff) | |
| parent | when removing LPE, with 'flattening' option, don't recalculate/rewrite ellips... (diff) | |
| download | inkscape-eca72e61451c8deae7f2f5fbaa9885aec946c790.tar.gz inkscape-eca72e61451c8deae7f2f5fbaa9885aec946c790.zip | |
Update to trunk and fix issues
(bzr r13090.1.67)
Diffstat (limited to 'share')
| -rwxr-xr-x | share/extensions/dxf_input.py | 2 | ||||
| -rw-r--r-- | share/extensions/hpgl_decoder.py | 13 | ||||
| -rw-r--r-- | share/extensions/hpgl_input.py | 4 |
3 files changed, 10 insertions, 9 deletions
diff --git a/share/extensions/dxf_input.py b/share/extensions/dxf_input.py index 235b9ae8f..7ca176c92 100755 --- a/share/extensions/dxf_input.py +++ b/share/extensions/dxf_input.py @@ -322,7 +322,7 @@ def generate_ellipse(xc, yc, xm, ym, w, a1, a2): def generate_gcodetools_point(xc, yc): path= 'm %s,%s 2.9375,-6.34375 0.8125,1.90625 6.84375,-6.84375 0,0 0.6875,0.6875 -6.84375,6.84375 1.90625,0.8125 z' % (xc,yc) - attribs = {'d': path, inkex.addNS('dxfpoint','inkscape'):'1', 'style': 'stroke:#ff0000;fill:#ff0000'} + attribs = {'d': path, inkex.addNS('dxfpoint','inkscape'):'1', 'style': 'stroke:none;fill:#ff0000'} inkex.etree.SubElement(layer, 'path', attribs) def get_line(): 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') |