commit 80843996d0928f13bd729c254559b8b038614a02 · cduck.me/drawsvg

-2

drawSvg/defs.py

···

       6
       6
        
           ''' Parent class of SVG nodes that must be direct children of <defs> '''

     

       7
       7
        
           def getSvgDefs(self):

     

       8
       8
        
               return (self,)

     

       9
       9
       -
           def writeSvgDefs(self, idGen, isDuplicate, outputFile):

     

       10
       10
       -
               DrawingElement.writeSvgDefs(idGen, isDuplicate, outputFile)

     

       11
       9
        
       

     

       12
       10
        
       class DrawingDefSub(DrawingParentElement):

     

       13
       11
        
           ''' Parent class of SVG nodes that are meant to be descendants of a Def '''

+13 -12

drawSvg/elements.py

···

       19
       19
        
               k = k.replace('_', '-')

     

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

     

       21
       21
        
                   k = k[:-1]

     

       22
       22
       -
               if isinstance(v, defs.DrawingDef):

     

       23
       23
       -
                   v = 'url(#{})'.format(v.id)

     

       22
       22
       +
               if isinstance(v, defs.DrawingElement):

     

       23
       23
       +
                   if k == 'xlink:href':

     

       24
       24
       +
                       v = '#{}'.format(v.id)

     

       25
       25
       +
                   else:

     

       26
       26
       +
                       v = 'url(#{})'.format(v.id)

     

       24
       27
        
               outputFile.write(' {}="{}"'.format(k,v))

     

       25
       28
        
       

     

       26
       29
        
       

     
···

       35
       38
        
           def writeSvgDefs(self, idGen, isDuplicate, outputFile):

     

       36
       39
        
               for defn in self.getSvgDefs():

     

       37
       40
        
                   if isDuplicate(defn): continue

     

       41
       41
       +
                   defn.writeSvgDefs(idGen, isDuplicate, outputFile)

     

       38
       42
        
                   defn.id = idGen()

     

       39
       43
        
                   defn.writeSvgElement(outputFile)

     

       40
       44
        
                   outputFile.write('\n')

     
···

       71
       75
        
                   tags.  This will not be called if hasContent is False. '''

     

       72
       76
        
               raise RuntimeError('This element has no content')

     

       73
       77
        
           def getSvgDefs(self):

     

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

     

       78
       78
       +
               return [v for v in self.args.values()

     

       79
       79
       +
                       if isinstance(v, defs.DrawingElement)]

     

       75
       80
        
           def __eq__(self, other):

     

       76
       81
        
               if isinstance(other, type(self)):

     

       77
       82
        
                   return (self.TAG_NAME == other.TAG_NAME and

     
···

       132
       137
        
       class Use(DrawingBasicElement):

     

       133
       138
        
           ''' A copy of another element

     

       134
       139
        
       

     

       135
       135
       -
               Specify the other element by its id: href='#otherElemId'. '''

     

       140
       140
       +
               The other element becomes an SVG def shared between all Use elements

     

       141
       141
       +
               that reference it. '''

     

       136
       142
        
           TAG_NAME = 'use'

     

       137
       143
        
           def __init__(self, otherElem, x, y, **kwargs):

     

       138
       144
        
               y = -y

     

       139
       139
       -
               if isinstance(otherElem, str):

     

       140
       140
       -
                   otherElemId = otherElem

     

       141
       141
       -
               else:

     

       142
       142
       -
                   if otherElem.id is None:

     

       143
       143
       -
                       raise ValueError('otherElem must have an id')

     

       144
       144
       -
                   otherElemId = otherElem.id

     

       145
       145
       -
               href = '#{}'.format(otherElemId)

     

       146
       146
       -
               super().__init__(xlink__href=href, x=x, y=y, **kwargs)

     

       145
       145
       +
               if isinstance(otherElem, str) and not otherElem.startswith('#'):

     

       146
       146
       +
                   otherElem = '#' + otherElem

     

       147
       147
       +
               super().__init__(xlink__href=otherElem, x=x, y=y, **kwargs)

     

       147
       148
        
       

     

       148
       149
        
       class Image(DrawingBasicElement):

     

       149
       150
        
           ''' A linked or embedded raster image '''