commit 3b500a95d9f6e81dd8a5ad1a8929cc63bbf9c285 · cduck.me/drawsvg

+1

drawSvg/defs.py

···

       71
       71
        
       

     

       72
       72
        
       class FilterItem(DrawingDefSub):

     

       73
       73
        
           ''' A child of Filter with any tag name'''

     

       74
       74
       +
           hasContent = False

     

       74
       75
        
           def __init__(self, tag_name, **args):

     

       75
       76
        
               super().__init__(**args)

     

       76
       77
        
               self.TAG_NAME = tag_name

+5 -4

drawSvg/drawing.py

···

       45
       45
        
                   if k[-1] == '-':

     

       46
       46
        
                       k = k[:-1]

     

       47
       47
        
                   self.svgArgs[k] = v

     

       48
       48
       +
               self.idIndex = 0

     

       48
       49
        
           def setRenderSize(self, w=None, h=None):

     

       49
       50
        
               self.renderWidth = w

     

       50
       51
        
               self.renderHeight = h

     
···

       67
       68
        
               else:

     

       68
       69
        
                   return self.renderWidth, self.renderHeight

     

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

     

       71
       71
       +
               if obj is None:

     

       72
       72
       +
                   return

     

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

     

       71
       74
        
                   elements = obj.toDrawables(elements=elementsModule, **kwargs)

     

       72
       75
        
               else:

     
···

       112
       115
        
               elementsModule.writeXmlNodeArgs(self.svgArgs, outputFile)

     

       113
       116
        
               outputFile.write('>\n<defs>\n')

     

       114
       117
        
               # Write definition elements

     

       115
       115
       -
               idIndex = 0

     

       116
       118
        
               def idGen(base=''):

     

       117
       117
       -
                   nonlocal idIndex

     

       118
       118
       -
                   idStr = self.idPrefix + base + str(idIndex)

     

       119
       119
       -
                   idIndex += 1

     

       119
       119
       +
                   idStr = self.idPrefix + base + str(self.idIndex)

     

       120
       120
       +
                   self.idIndex += 1

     

       120
       121
        
                   return idStr

     

       121
       122
        
               prevSet = set((id(defn) for defn in self.otherDefs))

     

       122
       123
        
               def isDuplicate(obj):

+2 -2

drawSvg/elements.py

···

       312
       312
        
               '.jpeg':'image/jpeg',

     

       313
       313
        
               '.jpg': 'image/jpeg',

     

       314
       314
        
               '.png': 'image/png',

     

       315
       315
       +
               '.svg': 'image/svg+xml',

     

       315
       316
        
               '.tif': 'image/tiff',

     

       316
       317
        
               '.tiff':'image/tiff',

     

       317
       318
        
               '.pdf': 'application/pdf',

     
···

       335
       336
        
                                         Warning)

     

       336
       337
        
                   if mimeType is None:

     

       337
       338
        
                       mimeType = self.MIME_DEFAULT

     

       338
       338
       -
                       warnings.warn('Unspecified image type; assuming png'.format(ext),

     

       339
       339
       -
                                     Warning)

     

       339
       339
       +
                       warnings.warn('Unspecified image type; assuming png', Warning)

     

       340
       340
        
               if data is not None:

     

       341
       341
        
                   embed = True

     

       342
       342
        
               if embed and data is None: