def addSeparator( self ): """add separator on circles.""" if self.mRadius not in self.mSeparators: e = SVGdraw.circle( self.mDataMiddleX, self.mDataMiddleY, self.mRadius, fill="none", stroke = "rgb(%i,%i,%i)" % self.mGridColour, stroke_width = self.mGridStrokeWidth ) self.addWheelElement( e, self.mPlaneGrid ) self.mSeparators[self.mRadius] = 1
def fill(self,elt): pattern=SVGdraw.SVGelement('pattern',attributes= {"height":"15","width":"15", "patternUnits":"userSpaceOnUse", "patternContentUnits":"userSpaceOnUse", "id":"ermine%04d"%blazon.Ordinary.id}) blazon.Ordinary.id+=1 pattern.addElement(self.color1.fill(SVGdraw.rect(x="0",y="0",width="15",height="15"))) pattern.addElement(self.color2.fill(SVGdraw.SVGelement('path', attributes={"d": "M1,5 c1,-1 1.5,-4 1.5,-4 c0,0 .5,3 1.5,4 l-1.5,1.5 z"}))) pattern.addElement(self.color2.fill(SVGdraw.circle(cx="1.5",cy="2", r=".5"))) pattern.addElement(self.color2.fill(SVGdraw.circle(cx="2.5",cy="1", r=".5"))) pattern.addElement(self.color2.fill(SVGdraw.circle(cx="3.5",cy="2", r=".5"))) pattern.addElement(self.color2.fill(SVGdraw.SVGelement('path', attributes={"d": "M8.5,12.5 c1,-1 1.5,-4 1.5,-4 c0,0 .5,3 1.5,4 l-1.5,1.5 z"}))) pattern.addElement(self.color2.fill(SVGdraw.circle(cx="9",cy="9.5", r=".5"))) pattern.addElement(self.color2.fill(SVGdraw.circle(cx="10",cy="8.5", r=".5"))) pattern.addElement(self.color2.fill(SVGdraw.circle(cx="11",cy="9.5", r=".5"))) blazon.Ordinary.defs.append(pattern) elt.attributes["fill"]="url(#%s)"%pattern.attributes["id"] return elt
def getElements( self, node_id, x, y ): e = [] colour = self.getColour( node_id, x, y ) if self.mPlotSymbol == "circle": e.append( SVGdraw.circle( x + self.mFontSize / 2, y, self.mFontSize/2, stroke = "rgb(%i,%i,%i)" % BLACK, fill = "rgb(%i,%i,%i)" % colour) ) elif self.mPlotSymbol == "square": e.append( SVGdraw.rect( x, y-self.mFontSize/2, self.mFontSize, self.mFontSize, stroke = "rgb(%i,%i,%i)" % BLACK, fill = "rgb(%i,%i,%i)" % colour) ) return e
def addDuplication( self, entries, map_gene2pos, height, url = None, with_separator=True, link_to_previous = False, quality2symbol = {}, quality2mask = {}): """add a dot in row/col.""" mi, ma = None, 0 pos = bisect.bisect( self.mColourThresholds, height ) master_colour = self.mColours[pos] chrs = {} points = [] if not link_to_previous: self.mPreviousPoints = {} ######################################################## ######################################################## ######################################################## ## convert gene list to a set of points ######################################################## for species, transcript, gene, quality in entries: chr, strand, first_res, last_res = map_gene2pos[gene] chrs[chr] = 1 pos1 = self.getPosition( chr, strand, first_res ) pos2 = self.getPosition( chr, strand, last_res ) a = min( pos1, pos2 ) b = max( pos1, pos2 ) if mi == None: mi = a else: mi = min(a, mi) ma = max(b, ma) points.append( (pos1, pos2, gene, quality, chr) ) ######################################################## ######################################################## ######################################################## ## decide whether we need to increment the radius ######################################################## cis = len(chrs) == 1 old_radius = self.mRadius is_overlap = False if cis: if not self.mLastChr: self.mLastChr = chr if chr != self.mLastChr: self.mRadius = self.mRadiusFallBack self.mLastMax = ma self.mPreviousMax = ma self.mLastChr = chr else: if self.mPreviousMax + self.mMinDistance > mi: ## overlap due to close proximitiy self.mRadius += self.mRadiusIncrement if with_separator: self.addSeparator() ## true overlap if self.mPreviousMax > mi: is_overlap = True elif self.mLastMax + self.mMinDistance > mi: pass else: self.mRadius = self.mRadiusFallBack self.mLastMax = max(self.mLastMax, ma) else: if self.mLastMax > mi: self.mRadius += self.mRadiusIncrement if with_separator: self.addSeparator() self.mPreviousMin = mi self.mPreviousMax = ma self.mPreviousCis = cis self.mRadiusMax = max(self.mRadius, self.mRadiusMax) ######################################################## ######################################################## ######################################################## ## draw points ######################################################## link_colour = master_colour link_rad_width = self.mLinkRadStrokeWidth link_arc_width = self.mLinkArcStrokeWidth new_points = {} for pos1, pos2, gene, quality, chr in points: angle = self.getAngle( (pos1 + pos2) / 2 ) x,y = self.getPosOnArc( angle, self.mRadius ) try: symbol = quality2symbol[quality] except KeyError: symbol = "rect" if quality in quality2mask: colour = self.mLinkColourSymbolMasked link_colour = self.mLinkColourMasked link_rad_width = self.mLinkStrokeWidthMasked link_arc_width = self.mLinkStrokeWidthMasked else: colour = master_colour if gene in self.mPreviousPoints: continue new_points[gene] = (x, y, angle, quality, chr) if symbol == "circle": ee = SVGdraw.circle( x, y, self.mLinkSymbolSize, fill = "rgb(%i,%i,%i)" % colour, stroke="black", stroke_width = self.mLinkStrokeWidthSymbol ) elif symbol == "rect": ee = SVGdraw.rect( x-self.mLinkSymbolSize/2, y-self.mLinkSymbolSize/2, self.mLinkSymbolSize, self.mLinkSymbolSize, fill = "rgb(%i,%i,%i)" % colour, stroke="black", stroke_width = self.mLinkStrokeWidthSymbol ) if url: e = SVGdraw.link( url % gene ) e.addElement( ee ) else: e = ee self.addWheelElement( e ) ######################################################## ######################################################## ######################################################## ## write all arcs in between old points and new points ## cis: circular arc ## trans: radial arc ######################################################## angles = [] for x1,y1,angle1,quality1,chr1 in new_points.values(): ## reduce clutter by not writing arc to the same angle for x2,y2,angle2,quality2,chr2 in self.mPreviousPoints.values(): for a in angles: if a - self.mAngleResolution < angle2 < a + self.mAngleResolution: break else: angles.append( angle2 ) d = SVGdraw.pathdata( x1, y1 ) if chr1 == chr2: d.relellarc( self.mRadius, self.mRadius, 0, 0, 1, x2-x1, y2-y1 ) link_width = link_rad_width else: d.relellarc( self.mRadius * 2, self.mRadius * 2, 0, 0, 0, x2-x1, y2-y1 ) link_width = link_arc_width e = SVGdraw.path( d, fill = "none", stroke = "rgb(%i,%i,%i)" % link_colour, stroke_width = link_width ) self.addWheelElement(e, self.mPlaneLinks) ## plot lines between new points new_genes = new_points.keys() for g1 in range(len(new_genes)-1): x1,y1,angle1,quality1,chr1 = new_points[new_genes[g1]] for g2 in range(g1+1, len(new_genes)): x2,y2,angle2,quality2,chr2 = new_points[new_genes[g2]] for a in angles: if a - self.mAngleResolution < angle2 < a + self.mAngleResolution: break else: angles.append( angle2 ) d = SVGdraw.pathdata( x1, y1 ) if chr1 == chr2: d.relellarc( self.mRadius, self.mRadius, 0, 0, 1, x2-x1, y2-y1 ) link_width = link_rad_width else: d.relellarc( self.mRadius * 2, self.mRadius * 2, 0, 0, 0, x2-x1, y2-y1 ) link_width = link_arc_width e = SVGdraw.path( d, fill = "none", stroke = "rgb(%i,%i,%i)" % link_colour, stroke_width = link_width ) self.addWheelElement(e, self.mPlaneLinks) ## add new points to old points for k, v in new_points.items(): self.mPreviousPoints[k] = v
def dbgPt(x,y,c='red',d=5): debugw.append(SVG.circle(x,y,d, 'white', c, '2'))
def build(self): SvgBaseChangeset.build(self) (fgc, bgc) = (self._strokecolor, self._fillcolor) txc = self._textcolor if 'firstchangeset' in self._classes: (fgc, bgc) = (bgc, fgc) if 'lastchangeset' in self._classes: bgc = SvgColor('black') txc = SvgColor('white') widgets = [] if self._shape == 'circle': widgets.append(SVG.circle(self._position[0], self._position[1], self._radius, bgc, fgc, self._parent.strokewidth())) if self._enhance: (x,y) = self._position (d,hr) = (self._radius*SQRT3/2, self._radius/2) widgets.append(SVG.line(x-d,y-hr,x+d,y-hr, fgc, self._parent.strokewidth())) widgets.append(SVG.line(x-d,y+hr,x+d,y+hr, fgc, self._parent.strokewidth())) elif self._shape == 'square': r = UNIT/6 size = self._radius-r widgets.append(SVG.rect(self._position[0]-size, self._position[1]-size, 2*size, 2*size, bgc, fgc, self._parent.strokewidth())) outline.attributes['rx'] = r outline.attributes['ry'] = r elif self._shape == 'hexa': (x,y) = self._position (r,hr) = (self._radius, self._radius/2) pd = SVG.pathdata() pd.move(x,y-r) pd.line(x+r,y-hr) pd.line(x+r,y+hr) pd.line(x,y+r) pd.line(x-r,y+hr) pd.line(x-r,y-hr) pd.line(x,y-r) widgets.append(SVG.path(pd, bgc, fgc, self._parent.strokewidth())) else: raise AssertionError, \ "unsupported changeset shape (%d)" % self._revision title = SVG.text(self._position[0], self._position[1] + UNIT/6, str(self._revision), self._parent.fontsize(), self._parent.fontname()) title.attributes['style'] = 'fill:%s; text-anchor: middle' % txc.rgb() widgets.append(title) g = SVG.group('grp%d' % self._revision, elements=widgets) link = "%s/changeset/%d" % (self._parent.urlbase(), self._revision) self._link = SVG.link(link, elements=[g]) if self._revision: self._link.attributes['style'] = \ 'color: %s; background-color: %s' % \ (self._strokecolor, self._fillcolor) self._link.attributes['id'] = 'rev%d' % self._revision self._link.attributes['class'] = ' '.join(self._classes)
def svgout(self, stroke_width=0.3, scale=20, circle_radius=0.3, startat=None, coloriter=None, crossings=True, circradius=None, circscale=1): # if circradius is some positive number, try to draw a circular(!) diagram # circscale is how much to scale the y-dimension by (how thick a circle) # try: # if type(SVGdraw)!=type(__builtins__): # raise Exception("SVGdraw not a module?") # return None # except NameError: # raise Exception("No SVGDraw found") # return None cols = [ '#000000', '#800000', '#808000', '#008080', '#000080', '#ff2000', '#ffff20', '#20ffff', '#0020ff', '#ff0080', '#ff8000', '#8000ff', '#80ff00' ] if circradius: sz = (2 * self.ymax * circscale + 2 + 2 * circradius) svg = SVGdraw.svg( width="%dpx" % (sz * scale), height="%dpx" % (sz * scale), viewBox=[-sz + self.xmodulus / 2.0, -sz, 2 * sz, 2 * sz]) def transform(x, y): # Have to flip it over... r = self.ymax * circscale + circradius - y * circscale theta = 2 * math.pi * x / self.xmodulus - math.pi return [ sz / 2 + r * math.cos(theta), sz / 2 + r * math.sin(theta) ] else: svg = SVGdraw.svg( width="%dpx" % ((self.xmodulus + 2) * scale), height="%dpx" % ((self.ymax + 2) * scale), viewBox=[-1, -1, self.xmodulus + 2, self.ymax + 2]) def transform(x, y): return [x, y] defs = SVGdraw.defs(id="defs") plusmask = SVGdraw.SVGelement("mask", attributes={"id": "plusmask"}) minusmask = SVGdraw.SVGelement("mask", attributes={"id": "minusmask"}) if circradius: sz = 1 + 2 * self.ymax * circscale + 2 * circradius # Whatever, something big. r = SVGdraw.rect(x=-sz, y=-sz, width=sz * 2, height=sz * 2, fill='white') else: r = SVGdraw.rect(x=-1, y=-1, width=self.xmodulus + 2, height=self.ymax + 2, fill='white') plusmask.addElement(r) minusmask.addElement(r) defs.addElement(plusmask) defs.addElement(minusmask) svg.addElement(defs) maingroup = SVGdraw.group(id="main") # I've come to expect them this way up... maingroup.attributes['transform']='scale(1,-1) translate(0,%d)'% \ (-self.ymax) svg.addElement(maingroup) # Positive slopes and negative slopes. plus = SVGdraw.group(id="plus", mask="url(#plusmask)") minus = SVGdraw.group(id="minus", mask="url(#minusmask)") maingroup.addElement(plus) maingroup.addElement(minus) circgroup = SVGdraw.group(id="circgroup") maingroup.addElement(circgroup) strands = self.strands(self.pivots[0]) circuit = None if coloriter is None: if len(strands) > 1: # Multistranded; color it by strand. def multicoloriter(): counter = 0 lastcircuit = None while True: if circuit != lastcircuit: lastcircuit = circuit counter += 1 yield cols[counter % len(cols)] coloriter = multicoloriter() else: def singlecoloriter(): # for singlestranders! colcounter = 0 colordiv = len(self.pivots) / 6 while True: yield cols[int(colcounter / colordiv) % len(cols)] colcounter += 1 coloriter = singlecoloriter() for circuit in strands: # If there's a startat parameter, and it appears in this list, # slosh the list around so it's first if startat and startat in circuit: ind = circuit.index(startat) circuit = circuit[ind:] + circuit[0:ind] for i in range(0, len(circuit)): here = circuit[i] nxt = circuit[(i + 1) % len(circuit)] col = coloriter.next() if type(col) == int: # let iterator generate indexes col = cols[col % len(cols)] if circradius: path = [here, nxt] else: path = self.pathbetween(here, nxt) pathstring = "" for j in range(0, len(path), 2): # Had hoped that transform() would have been enough, but we need # to go through all the intermediate lattice-points when doing # circular plots, to curve around in the right direction. if circradius: betweens = self.pointsbetween(path[j], path[j + 1]) pathstring += " M %f %f " % tuple( transform(path[j].x, path[j].y)) for k in range(0, len(betweens)): pathstring+=" L %f %f "% \ tuple(transform(betweens[k].x,betweens[k].y)) pathstring+="L %f %f "% \ tuple(transform(path[j+1].x, path[j+1].y)) else: pathstring+=" M %f %f L %f %f"% \ (tuple(transform(path[j].x,path[j].y)+ transform(path[j+1].x,path[j+1].y))) pathelt = SVGdraw.path(pathstring, stroke_width=stroke_width, stroke=col, fill="none") if self.slopebetween(here, nxt) > 0: plus.addElement(pathelt) else: minus.addElement(pathelt) for i in self.pivots: cr = transform(i.x, i.y) c = SVGdraw.circle(cx=cr[0], cy=cr[1], r=circle_radius, fill='black') circgroup.addElement(c) if not circradius: # Mark the wraparound point. circgroup.addElement(SVGdraw.path("M 0 -1 l 0 %d M %d -1 l 0 %d"% \ (self.ymax+2,self.xmodulus, self.ymax+2), stroke='black', stroke_width=0.03)) # Somehow I want to *note* when a knot is single-strand or # multistrand. circgroup.addElement( SVGdraw.text(x=0.2, y=0, text=str(len(strands)), fill='#000408', font_size=1, font_family='sans-serif', transform='scale(1,-1)')) if crossings: # Try multistrand crossings? (not working right) # Need *ALL* the crossing points though. oncircuit = [] for circuit in strands: oncircuit.extend(self.oncircuit(circuit)) masked = set() over = 0 masks = [minusmask, plusmask] # How about this? For each horizontal line _that has intersections on it_, # all crossings go in one direction, and that direction alternates. # # How do we find those lines? points = [] for circuit in strands: for i in range(0, len(circuit)): here = circuit[i] nxt = circuit[(i + 1) % len(circuit)] points += self.pointsbetween(here, nxt) heights = [] howmanyhits = dict() for p in points: howmanyhits[p] = howmanyhits.get(p, 0) + 1 howmanyhits = [(p, howmanyhits[p]) for p in howmanyhits.keys()] howmanyhits = filter((lambda x: x[1] > 1), howmanyhits) heights = [x[0].y for x in howmanyhits] heights.sort() # No "sort unique" so just keep track of the last one we saw and skip it. # DOESN'T WORK EITHER BUT BETTER THAN BEFORE XXXXXX # (testing with python ./knots.py -l 18 17 6 32 6 37) Works with more # symmetrical designs. last = None for h in heights: if h == last: continue last = h mask = masks[over] over = 1 - over for x in range(0, self.xmodulus, 2): p = Point((x if not h % 2 else x + 1), h, self) if p in self.pivots: continue # Skip pivot-points. tp1 = transform(p.x - 0.5, p.y - 0.5) tp2 = transform(p.x - 0.5, p.y + 0.5) tp3 = transform(p.x + 0.5, p.y + 0.5) tp4 = transform(p.x + 0.5, p.y - 0.5) tp = transform(p.x, p.y) if circradius: r = SVGdraw.circle(fill="black", cx=tp[0], cy=tp[1], r=0.6) else: angle = 45 r=SVGdraw.polygon(fill="black", points=[tp1,tp2,tp3,tp4], transform="rotate(%f,%f,%f)"% \ (angle, tp[0], tp[1])) mask.addElement(r) # maingroup.addElement(r) # If it's on the edge, duplicate it on the other side # for ease of viewing. if p.x == 0 and not circradius: mask.addElement( SVGdraw.rect(x=self.xmodulus - 0.5, y=p.y - 0.5, width=1, height=1, fill="#111", transform="rotate(45,%d,%d)" % (self.xmodulus, p.y))) return svg
def svgout(self,stroke_width=0.3,scale=20,circle_radius=0.3, startat=None,coloriter=None,crossings=True,circradius=None,circscale=1): # if circradius is some positive number, try to draw a circular(!) diagram # circscale is how much to scale the y-dimension by (how thick a circle) # try: # if type(SVGdraw)!=type(__builtins__): # raise Exception("SVGdraw not a module?") # return None # except NameError: # raise Exception("No SVGDraw found") # return None cols=['#000000', '#800000', '#808000', '#008080', '#000080', '#ff2000', '#ffff20', '#20ffff', '#0020ff', '#ff0080', '#ff8000', '#8000ff', '#80ff00'] if circradius: sz=(2*self.ymax*circscale+2+2*circradius) svg=SVGdraw.svg(width="%dpx"%(sz*scale), height="%dpx"%(sz*scale), viewBox=[-sz+self.xmodulus/2.0, -sz, 2*sz, 2*sz]) def transform(x,y): # Have to flip it over... r=self.ymax*circscale+circradius-y*circscale theta=2*math.pi*x/self.xmodulus-math.pi return [sz/2+r*math.cos(theta), sz/2+r*math.sin(theta)] else: svg=SVGdraw.svg(width="%dpx"%((self.xmodulus+2)*scale), height="%dpx"%((self.ymax+2)*scale), viewBox=[-1, -1, self.xmodulus+2, self.ymax+2]) def transform(x,y): return [x,y] defs=SVGdraw.defs(id="defs") plusmask=SVGdraw.SVGelement("mask", attributes={"id":"plusmask"}) minusmask=SVGdraw.SVGelement("mask", attributes={"id":"minusmask"}) if circradius: sz=1+2*self.ymax*circscale+2*circradius # Whatever, something big. r=SVGdraw.rect(x=-sz, y=-sz, width=sz*2,height=sz*2,fill='white') else: r=SVGdraw.rect(x=-1,y=-1,width=self.xmodulus+2,height=self.ymax+2, fill='white') plusmask.addElement(r) minusmask.addElement(r) defs.addElement(plusmask) defs.addElement(minusmask) svg.addElement(defs) maingroup=SVGdraw.group(id="main") # I've come to expect them this way up... maingroup.attributes['transform']='scale(1,-1) translate(0,%d)'% \ (-self.ymax) svg.addElement(maingroup) # Positive slopes and negative slopes. plus=SVGdraw.group(id="plus",mask="url(#plusmask)") minus=SVGdraw.group(id="minus",mask="url(#minusmask)") maingroup.addElement(plus) maingroup.addElement(minus) circgroup=SVGdraw.group(id="circgroup") maingroup.addElement(circgroup) strands=self.strands(self.pivots[0]) circuit=None if coloriter is None: if len(strands)>1: # Multistranded; color it by strand. def multicoloriter(): counter=0 lastcircuit=None while True: if circuit != lastcircuit: lastcircuit=circuit counter+=1 yield cols[counter%len(cols)] coloriter=multicoloriter() else: def singlecoloriter(): # for singlestranders! colcounter=0 colordiv=len(self.pivots)/6 while True: yield cols[int(colcounter/colordiv)%len(cols)] colcounter+=1 coloriter=singlecoloriter() for circuit in strands: # If there's a startat parameter, and it appears in this list, # slosh the list around so it's first if startat and startat in circuit: ind=circuit.index(startat) circuit=circuit[ind:]+circuit[0:ind] for i in range(0,len(circuit)): here=circuit[i] nxt=circuit[(i+1)%len(circuit)] col=coloriter.next() if type(col)==int: # let iterator generate indexes col=cols[col%len(cols)] if circradius: path=[here,nxt] else: path=self.pathbetween(here,nxt) pathstring="" for j in range(0,len(path),2): # Had hoped that transform() would have been enough, but we need # to go through all the intermediate lattice-points when doing # circular plots, to curve around in the right direction. if circradius: betweens=self.pointsbetween(path[j],path[j+1]) pathstring+=" M %f %f "%tuple(transform(path[j].x,path[j].y)) for k in range(0,len(betweens)): pathstring+=" L %f %f "% \ tuple(transform(betweens[k].x,betweens[k].y)) pathstring+="L %f %f "% \ tuple(transform(path[j+1].x, path[j+1].y)) else: pathstring+=" M %f %f L %f %f"% \ (tuple(transform(path[j].x,path[j].y)+ transform(path[j+1].x,path[j+1].y))) pathelt=SVGdraw.path(pathstring,stroke_width=stroke_width, stroke=col,fill="none") if self.slopebetween(here,nxt)>0: plus.addElement(pathelt) else: minus.addElement(pathelt) for i in self.pivots: cr=transform(i.x, i.y) c=SVGdraw.circle(cx=cr[0], cy=cr[1], r=circle_radius, fill='black') circgroup.addElement(c) if not circradius: # Mark the wraparound point. circgroup.addElement(SVGdraw.path("M 0 -1 l 0 %d M %d -1 l 0 %d"% \ (self.ymax+2,self.xmodulus, self.ymax+2), stroke='black', stroke_width=0.03)) # Somehow I want to *note* when a knot is single-strand or # multistrand. circgroup.addElement(SVGdraw.text(x=0.2,y=0, text=str(len(strands)), fill='#000408', font_size=1, font_family='sans-serif', transform='scale(1,-1)')) if crossings: # Try multistrand crossings? (not working right) # Need *ALL* the crossing points though. oncircuit=[] for circuit in strands: oncircuit.extend(self.oncircuit(circuit)) masked=set() over=0 masks=[minusmask,plusmask] # How about this? For each horizontal line _that has intersections on it_, # all crossings go in one direction, and that direction alternates. # # How do we find those lines? points=[] for circuit in strands: for i in range(0,len(circuit)): here=circuit[i] nxt=circuit[(i+1)%len(circuit)] points+=self.pointsbetween(here,nxt) heights=[] howmanyhits=dict() for p in points: howmanyhits[p]=howmanyhits.get(p,0)+1 howmanyhits=[(p,howmanyhits[p]) for p in howmanyhits.keys()] howmanyhits=filter((lambda x: x[1]>1), howmanyhits) heights=[x[0].y for x in howmanyhits] heights.sort() # No "sort unique" so just keep track of the last one we saw and skip it. # DOESN'T WORK EITHER BUT BETTER THAN BEFORE XXXXXX # (testing with python ./knots.py -l 18 17 6 32 6 37) Works with more # symmetrical designs. last=None for h in heights: if h==last: continue last=h mask=masks[over] over=1-over for x in range(0,self.xmodulus,2): p=Point((x if not h%2 else x+1),h,self) if p in self.pivots: continue # Skip pivot-points. tp1=transform(p.x-0.5, p.y-0.5) tp2=transform(p.x-0.5, p.y+0.5) tp3=transform(p.x+0.5, p.y+0.5) tp4=transform(p.x+0.5, p.y-0.5) tp=transform(p.x, p.y) if circradius: r=SVGdraw.circle(fill="black", cx=tp[0], cy=tp[1], r=0.6) else: angle=45 r=SVGdraw.polygon(fill="black", points=[tp1,tp2,tp3,tp4], transform="rotate(%f,%f,%f)"% \ (angle, tp[0], tp[1])) mask.addElement(r) # maingroup.addElement(r) # If it's on the edge, duplicate it on the other side # for ease of viewing. if p.x==0 and not circradius: mask.addElement(SVGdraw.rect(x=self.xmodulus-0.5, y=p.y-0.5, width=1, height=1, fill="#111", transform= "rotate(45,%d,%d)"% (self.xmodulus,p.y))) return svg