diff options
| author | Alvin Penner <> | 2017-03-08 19:11:01 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx> | 2017-03-08 19:11:01 +0000 |
| commit | 4cd89565f68a984b3c52ae5a677f0a3f4427abba (patch) | |
| tree | 284c57d77a9e50cc365f1dc7869f756dbfbbb830 | |
| parent | msys2installdeps.sh - Fix broken for loops (thanks for noticing jazzynico!) a... (diff) | |
| download | inkscape-4cd89565f68a984b3c52ae5a677f0a3f4427abba.tar.gz inkscape-4cd89565f68a984b3c52ae5a677f0a3f4427abba.zip | |
Apply the Albin Penner fix for bug 1663362
Fixed bugs:
- https://launchpad.net/bugs/1663362
(bzr r15578)
| -rwxr-xr-x | share/extensions/hpgl_output.py | 15 | ||||
| -rwxr-xr-x | share/extensions/synfig_output.py | 10 |
2 files changed, 0 insertions, 25 deletions
diff --git a/share/extensions/hpgl_output.py b/share/extensions/hpgl_output.py index f31c3fc2d..58f82da71 100755 --- a/share/extensions/hpgl_output.py +++ b/share/extensions/hpgl_output.py @@ -20,7 +20,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # standard library import sys -from inkex import NSS # local libraries import hpgl_encoder import inkex @@ -45,18 +44,10 @@ class HpglOutput(inkex.Effect): self.OptionParser.add_option('--precut', action='store', type='inkbool', dest='precut', default='TRUE', help='Use precut') self.OptionParser.add_option('--flat', action='store', type='float', dest='flat', default=1.2, help='Curve flatness') self.OptionParser.add_option('--autoAlign', action='store', type='inkbool', dest='autoAlign', default='TRUE', help='Auto align') - self.DOCROTATE = "{http://www.inkscape.org/namespaces/inkscape}document_rotation" def effect(self): self.options.debug = False # get hpgl data - svg = self.document.getroot() - xpathStr = '//sodipodi:namedview' - nv = svg.xpath(xpathStr, namespaces=NSS) - document_rotate = "0" - if nv != []: - document_rotate = nv[0].get(self.DOCROTATE) - nv[0].set(self.DOCROTATE,"0") myHpglEncoder = hpgl_encoder.hpglEncoder(self) try: self.hpgl, debugObject = myHpglEncoder.getHpgl() @@ -65,13 +56,9 @@ class HpglOutput(inkex.Effect): # issue error if no paths found inkex.errormsg(_("No paths where found. Please convert all objects you want to save into paths.")) self.hpgl = '' - if nv != [] and document_rotate: - nv[0].set("inkscape:document_rotation",document_rotate) return else: type, value, traceback = sys.exc_info() - if nv != [] and document_rotate: - nv[0].set("inkscape:document_rotation",document_rotate) raise ValueError, ("", type, value), traceback # convert raw HPGL to HPGL hpglInit = 'IN' @@ -80,8 +67,6 @@ class HpglOutput(inkex.Effect): if self.options.speed > 0: hpglInit += ';VS%d' % self.options.speed self.hpgl = hpglInit + self.hpgl + ';SP0;PU0,0;IN; ' - if nv != [] and document_rotate: - nv[0].set("inkscape:document_rotation",document_rotate) def output(self): # print to file diff --git a/share/extensions/synfig_output.py b/share/extensions/synfig_output.py index 461078951..06a9c6e72 100755 --- a/share/extensions/synfig_output.py +++ b/share/extensions/synfig_output.py @@ -1046,17 +1046,11 @@ def extract_width(style, width_attrib, mtx): ###### Main Class ######################################### class SynfigExport(SynfigPrep): def __init__(self): - svg = self.document.getroot() - xpathStr = '//http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd}:namedview' - res = svg.xpath(xpathStr, namespaces=inkex.NSS) - self.document_rotate = res[0].get("inkscape:document_rotation") - res[0].set("inkscape:document_rotation","0") SynfigPrep.__init__(self) def effect(self): # Prepare the document for exporting SynfigPrep.effect(self) - svg = self.document.getroot() width = get_dimension(svg.get("width", 1024)) height = get_dimension(svg.get("height", 768)) @@ -1078,10 +1072,6 @@ class SynfigExport(SynfigPrep): root_canvas.append(layer) d.get_root_tree().write(sys.stdout) - svg = self.document.getroot() - xpathStr = '//http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd}:namedview' - res = svg.xpath(xpathStr, namespaces=inkex.NSS) - res[0].set("inkscape:document_rotation",self.document_rotate) def convert_node(self, node, d): """Convert an SVG node to a list of Synfig layers""" |
