commit bfab5d460a90271f6a03570d9204993d56ed5c38 · cduck.me/drawsvg

+17 -1

drawing.py

···

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

     

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

     

       26
        
               self.elements = []

     

       0
        
       
     

       27
        
               self.pixelScale = 1

     

       28
        
               self.renderWidth = None

     

       29
        
               self.renderHeight = None

     
···

       72
        
               self.elements.count(element)

     

       73
        
           def reverse(self):

     

       74
        
               self.elements.reverse()

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       75
        
           def asSvg(self, outputFile=None):

     

       76
        
               returnString = outputFile is None

     

       77
        
               if returnString:

     
···

       92
        
                   idStr = base + str(idIndex)

     

       93
        
                   idIndex += 1

     

       94
        
                   return idStr

     

       95
       -
               prevSet = set()

     

       96
        
               def isDuplicate(obj):

     

       97
        
                   nonlocal prevSet

     

       98
        
                   dup = id(obj) in prevSet

     

       99
        
                   prevSet.add(id(obj))

     

       100
        
                   return dup

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       101
        
               for element in self.elements:

     

       102
        
                   try:

     

       103
        
                       element.writeSvgDefs(idGen, isDuplicate, outputFile)

···

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

     

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

     

       26
        
               self.elements = []

     

       27
       +
               self.otherDefs = []

     

       28
        
               self.pixelScale = 1

     

       29
        
               self.renderWidth = None

     

       30
        
               self.renderHeight = None

     
···

       73
        
               self.elements.count(element)

     

       74
        
           def reverse(self):

     

       75
        
               self.elements.reverse()

     

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

     

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

     

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

     

       79
       +
               else:

     

       80
       +
                   assert len(kwargs) == 0

     

       81
       +
                   elements = (obj,)

     

       82
       +
               self.otherDefs.extend(elements)

     

       83
       +
           def appendDef(self, element):

     

       84
       +
               self.otherDefs.append(element)

     

       85
        
           def asSvg(self, outputFile=None):

     

       86
        
               returnString = outputFile is None

     

       87
        
               if returnString:

     
···

       102
        
                   idStr = base + str(idIndex)

     

       103
        
                   idIndex += 1

     

       104
        
                   return idStr

     

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

     

       106
        
               def isDuplicate(obj):

     

       107
        
                   nonlocal prevSet

     

       108
        
                   dup = id(obj) in prevSet

     

       109
        
                   prevSet.add(id(obj))

     

       110
        
                   return dup

     

       111
       +
               for element in self.otherDefs:

     

       112
       +
                   try:

     

       113
       +
                       element.writeSvgElement(outputFile)

     

       114
       +
                       outputFile.write('\n')

     

       115
       +
                   except AttributeError:

     

       116
       +
                       pass

     

       117
        
               for element in self.elements:

     

       118
        
                   try:

     

       119
        
                       element.writeSvgDefs(idGen, isDuplicate, outputFile)

+17 -2

elements.py

···

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

     

       73
        
           def __eq__(self, other):

     

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

     

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

     

       76
        
                           self.args == other.args)

     

       77
        
               return False

     

       78
        
       

     
···

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

     

       110
        
               for child in self.children:

     

       111
        
                   child.writeSvgDefs(idGen, isDuplicate, outputFile)

     

       112
       -
                   outputFile.write('\n')

     

       113
        
       

     

       114
        
       class NoElement(DrawingElement):

     

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

     
···

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

     

       128
        
               inherited by its children. '''

     

       129
        
           TAG_NAME = 'g'

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       130
        
       

     

       131
        
       class Image(DrawingBasicElement):

     

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

···

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

     

       73
        
           def __eq__(self, other):

     

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

     

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

     

       76
        
                           self.args == other.args)

     

       77
        
               return False

     

       78
        
       

     
···

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

     

       110
        
               for child in self.children:

     

       111
        
                   child.writeSvgDefs(idGen, isDuplicate, outputFile)

     

       0
        
       
     

       112
        
       

     

       113
        
       class NoElement(DrawingElement):

     

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

     
···

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

     

       127
        
               inherited by its children. '''

     

       128
        
           TAG_NAME = 'g'

     

       129
       +
       

     

       130
       +
       class Use(DrawingBasicElement):

     

       131
       +
           ''' A copy of another element

     

       132
       +
       

     

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

     

       134
       +
           TAG_NAME = 'use'

     

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

     

       136
       +
               y = -y

     

       137
       +
               if isinstance(otherElem, str):

     

       138
       +
                   otherElemId = otherElem

     

       139
       +
               else:

     

       140
       +
                   if otherElem.id is None:

     

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

     

       142
       +
                   otherElemId = otherElem.id

     

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

     

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

     

       145
        
       

     

       146
        
       class Image(DrawingBasicElement):

     

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