commit 3dd6e44b87603bfb62c02c27d3c01f35387fbb39 · cduck.me/drawsvg

+24 -9
drawSvg/drawing.py
···

       3
       3
        
       import base64

     

       4
       4
        
       import urllib.parse

     

       5
       5
        
       import re

     

       6
       6
       +
       from collections import defaultdict

     

       6
       7
        
       

     

       7
       8
        
       from . import Raster

     

       8
       9
        
       from . import elements as elementsModule

     
···

       32
       33
        
               self.viewBox = (self.viewBox[0], -self.viewBox[1]-self.viewBox[3],

     

       33
       34
        
                               self.viewBox[2], self.viewBox[3])

     

       34
       35
        
               self.elements = []

     

       36
       36
       +
               self.orderedElements = defaultdict(list)

     

       35
       37
        
               self.otherDefs = []

     

       36
       38
        
               self.pixelScale = 1

     

       37
       39
        
               self.renderWidth = None

     
···

       67
       69
        
                   return self.renderWidth, self.height * s

     

       68
       70
        
               else:

     

       69
       71
        
                   return self.renderWidth, self.renderHeight

     

       70
       70
       -
           def draw(self, obj, **kwargs):

     

       72
       72
       +
           def draw(self, obj, *, z=None, **kwargs):

     

       71
       73
        
               if obj is None:

     

       72
       74
        
                   return

     

       73
       75
        
               if not hasattr(obj, 'writeSvgElement'):

     
···

       75
       77
        
               else:

     

       76
       78
        
                   assert len(kwargs) == 0

     

       77
       79
        
                   elements = (obj,)

     

       78
       78
       -
               self.extend(elements)

     

       79
       79
       -
           def append(self, element):

     

       80
       80
       -
               self.elements.append(element)

     

       81
       81
       -
           def extend(self, iterable):

     

       82
       82
       -
               self.elements.extend(iterable)

     

       80
       80
       +
               self.extend(elements, z=z)

     

       81
       81
       +
           def append(self, element, *, z=None):

     

       82
       82
       +
               if z is not None:

     

       83
       83
       +
                   self.orderedElements[z].append(element)

     

       84
       84
       +
               else:

     

       85
       85
       +
                   self.elements.append(element)

     

       86
       86
       +
           def extend(self, iterable, *, z=None):

     

       87
       87
       +
               if z is not None:

     

       88
       88
       +
                   self.orderedElements[z].extend(iterable)

     

       89
       89
       +
               else:

     

       90
       90
       +
                   self.elements.extend(iterable)

     

       83
       91
        
           def insert(self, i, element):

     

       84
       92
        
               self.elements.insert(i, element)

     

       85
       93
        
           def remove(self, element):

     
···

       101
       109
        
               self.otherDefs.extend(elements)

     

       102
       110
        
           def appendDef(self, element):

     

       103
       111
        
               self.otherDefs.append(element)

     

       112
       112
       +
           def allElements(self):

     

       113
       113
       +
               ''' Returns self.elements and self.orderedElements as a single list. '''

     

       114
       114
       +
               output = list(self.elements)

     

       115
       115
       +
               for z in sorted(self.orderedElements):

     

       116
       116
       +
                   output.extend(self.orderedElements[z])

     

       117
       117
       +
               return output

     

       104
       118
        
           def asSvg(self, outputFile=None):

     

       105
       119
        
               returnString = outputFile is None

     

       106
       120
        
               if returnString:

     
···

       131
       145
        
                       outputFile.write('\n')

     

       132
       146
        
                   except AttributeError:

     

       133
       147
        
                       pass

     

       134
       134
       -
               for element in self.elements:

     

       148
       148
       +
               allElements = self.allElements()

     

       149
       149
       +
               for element in allElements:

     

       135
       150
        
                   try:

     

       136
       151
        
                       element.writeSvgDefs(idGen, isDuplicate, outputFile, False)

     

       137
       152
        
                   except AttributeError:

     
···

       139
       154
        
               outputFile.write('</defs>\n')

     

       140
       155
        
               # Generate ids for normal elements

     

       141
       156
        
               prevDefSet = set(prevSet)

     

       142
       142
       -
               for element in self.elements:

     

       157
       157
       +
               for element in allElements:

     

       143
       158
        
                   try:

     

       144
       159
        
                       element.writeSvgElement(idGen, isDuplicate, outputFile, True)

     

       145
       160
        
                   except AttributeError:

     

       146
       161
        
                       pass

     

       147
       162
        
               prevSet = prevDefSet

     

       148
       163
        
               # Write normal elements

     

       149
       149
       -
               for element in self.elements:

     

       164
       164
       +
               for element in allElements:

     

       150
       165
        
                   try:

     

       151
       166
        
                       element.writeSvgElement(idGen, isDuplicate, outputFile, False)

     

       152
       167
        
                       outputFile.write('\n')