commit bfab5d460a90271f6a03570d9204993d56ed5c38 · cduck.me/drawsvg

+17 -1

drawing.py

···

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

     

       25
       25
        
                               self.viewBox[2], self.viewBox[3])

     

       26
       26
        
               self.elements = []

     

       27
       27
       +
               self.otherDefs = []

     

       27
       28
        
               self.pixelScale = 1

     

       28
       29
        
               self.renderWidth = None

     

       29
       30
        
               self.renderHeight = None

     
···

       72
       73
        
               self.elements.count(element)

     

       73
       74
        
           def reverse(self):

     

       74
       75
        
               self.elements.reverse()

     

       76
       76
       +
           def drawDef(self, obj, **kwargs):

     

       77
       77
       +
               if not hasattr(obj, 'writeSvgElement'):

     

       78
       78
       +
                   elements = obj.toDrawables(elements=elementsModule, **kwargs)

     

       79
       79
       +
               else:

     

       80
       80
       +
                   assert len(kwargs) == 0

     

       81
       81
       +
                   elements = (obj,)

     

       82
       82
       +
               self.otherDefs.extend(elements)

     

       83
       83
       +
           def appendDef(self, element):

     

       84
       84
       +
               self.otherDefs.append(element)

     

       75
       85
        
           def asSvg(self, outputFile=None):

     

       76
       86
        
               returnString = outputFile is None

     

       77
       87
        
               if returnString:

     
···

       92
       102
        
                   idStr = base + str(idIndex)

     

       93
       103
        
                   idIndex += 1

     

       94
       104
        
                   return idStr

     

       95
       95
       -
               prevSet = set()

     

       105
       105
       +
               prevSet = set((id(defn) for defn in self.otherDefs))

     

       96
       106
        
               def isDuplicate(obj):

     

       97
       107
        
                   nonlocal prevSet

     

       98
       108
        
                   dup = id(obj) in prevSet

     

       99
       109
        
                   prevSet.add(id(obj))

     

       100
       110
        
                   return dup

     

       111
       111
       +
               for element in self.otherDefs:

     

       112
       112
       +
                   try:

     

       113
       113
       +
                       element.writeSvgElement(outputFile)

     

       114
       114
       +
                       outputFile.write('\n')

     

       115
       115
       +
                   except AttributeError:

     

       116
       116
       +
                       pass

     

       101
       117
        
               for element in self.elements:

     

       102
       118
        
                   try:

     

       103
       119
        
                       element.writeSvgDefs(idGen, isDuplicate, outputFile)

+17 -2

elements.py

···

       72
       72
        
               return [v for v in self.args.values() if isinstance(v, defs.DrawingDef)]

     

       73
       73
        
           def __eq__(self, other):

     

       74
       74
        
               if isinstance(other, type(self)):

     

       75
       75
       -
                   return (self.tagName == other.tagName and

     

       75
       75
       +
                   return (self.TAG_NAME == other.TAG_NAME and

     

       76
       76
        
                           self.args == other.args)

     

       77
       77
        
               return False

     

       78
       78
        
       

     
···

       109
       109
        
               super().writeSvgDefs(idGen, isDuplicate, outputFile)

     

       110
       110
        
               for child in self.children:

     

       111
       111
        
                   child.writeSvgDefs(idGen, isDuplicate, outputFile)

     

       112
       112
       -
                   outputFile.write('\n')

     

       113
       112
        
       

     

       114
       113
        
       class NoElement(DrawingElement):

     

       115
       114
        
           ''' A drawing element that has no effect '''

     
···

       127
       126
        
               Any transform will apply to its children and other attributes will be

     

       128
       127
        
               inherited by its children. '''

     

       129
       128
        
           TAG_NAME = 'g'

     

       129
       129
       +
       

     

       130
       130
       +
       class Use(DrawingBasicElement):

     

       131
       131
       +
           ''' A copy of another element

     

       132
       132
       +
       

     

       133
       133
       +
               Specify the other element by its id: href='#otherElemId'. '''

     

       134
       134
       +
           TAG_NAME = 'use'

     

       135
       135
       +
           def __init__(self, otherElem, x, y, **kwargs):

     

       136
       136
       +
               y = -y

     

       137
       137
       +
               if isinstance(otherElem, str):

     

       138
       138
       +
                   otherElemId = otherElem

     

       139
       139
       +
               else:

     

       140
       140
       +
                   if otherElem.id is None:

     

       141
       141
       +
                       raise ValueError('otherElem must have an id')

     

       142
       142
       +
                   otherElemId = otherElem.id

     

       143
       143
       +
               href = '#{}'.format(otherElemId)

     

       144
       144
       +
               super().__init__(xlink__href=href, x=x, y=y, **kwargs)

     

       130
       145
        
       

     

       131
       146
        
       class Image(DrawingBasicElement):

     

       132
       147
        
           ''' A linked or embedded raster image '''