commit 4eddc547b83c5156f76c81d69bd45d496f6a3224 · cduck.me/drawsvg

+5 -3

drawing.py

···

       10
       10
        
       

     

       11
       11
        
               Supports iPython: If a Drawing is the last line of a cell, it will be

     

       12
       12
        
               displayed as an SVG below. '''

     

       13
       13
       -
           def __init__(self, width, height, origin=(0,0)):

     

       13
       13
       +
           def __init__(self, width, height, origin=(0,0), **svgArgs):

     

       14
       14
        
               assert float(width) == width

     

       15
       15
        
               assert float(height) == height

     

       16
       16
        
               self.width = width

     
···

       27
       27
        
               self.pixelScale = 1

     

       28
       28
        
               self.renderWidth = None

     

       29
       29
        
               self.renderHeight = None

     

       30
       30
       +
               self.svgArgs = svgArgs

     

       30
       31
        
           def setRenderSize(self, w=None, h=None):

     

       31
       32
        
               self.renderWidth = w

     

       32
       33
        
               self.renderHeight = h

     
···

       78
       79
        
               imgWidth, imgHeight = self.calcRenderSize()

     

       79
       80
        
               startStr = '''<?xml version="1.0" encoding="UTF-8"?>

     

       80
       81
        
       <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"

     

       81
       81
       -
            width="{}" height="{}" viewBox="{} {} {} {}">'''.format(

     

       82
       82
       +
            width="{}" height="{}" viewBox="{} {} {} {}"'''.format(

     

       82
       83
        
                   imgWidth, imgHeight, *self.viewBox)

     

       83
       84
        
               endStr = '</svg>'

     

       84
       85
        
               outputFile.write(startStr)

     

       85
       85
       -
               outputFile.write('\n<defs>\n')

     

       86
       86
       +
               elementsModule.writeXmlNodeArgs(self.svgArgs, outputFile)

     

       87
       87
       +
               outputFile.write('>\n<defs>\n')

     

       86
       88
        
               # Write definition elements

     

       87
       89
        
               idIndex = 0

     

       88
       90
        
               def idGen(base='d'):

+10 -7

elements.py

···

       12
       12
        
       

     

       13
       13
        
       # TODO: Support drawing ellipses without manually using Path

     

       14
       14
        
       

     

       15
       15
       +
       def writeXmlNodeArgs(args, outputFile):

     

       16
       16
       +
           for k, v in args.items():

     

       17
       17
       +
               if v is None: continue

     

       18
       18
       +
               k = k.replace('__', ':')

     

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

     

       20
       20
       +
               if isinstance(v, defs.DrawingDef):

     

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

     

       22
       22
       +
               outputFile.write(' {}="{}"'.format(k,v))

     

       23
       23
       +
       

     

       15
       24
        
       

     

       16
       25
        
       class DrawingElement:

     

       17
       26
        
           ''' Base class for drawing elements

     
···

       40
       49
        
           def writeSvgElement(self, outputFile):

     

       41
       50
        
               outputFile.write('<')

     

       42
       51
        
               outputFile.write(self.TAG_NAME)

     

       43
       43
       -
               for k, v in self.args.items():

     

       44
       44
       -
                   if v is None: continue

     

       45
       45
       -
                   k = k.replace('__', ':')

     

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

     

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

     

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

     

       49
       49
       -
                   outputFile.write(' {}="{}"'.format(k,v))

     

       52
       52
       +
               writeXmlNodeArgs(self.args, outputFile)

     

       50
       53
        
               if not self.hasContent:

     

       51
       54
        
                   outputFile.write(' />')

     

       52
       55
        
               else: