Changeset - c705c709565b
Parent rev.
Child rev.
[Not reviewed]
default
0 4 1
Laman - 8 years ago 2017-02-05 22:02:28

enhanced SVG, added pleb.svg circumventing a rendering bug in librsvg
5 files changed with 42 insertions and 18 deletions:
.hgignore
1
src/diana.py
4
3
src/drawer/svg.py
1
2
src/templ/templ-pleb.svg
18
src/templ/templ.svg
18
13
0 comments (0 inline, 0 general)
.hgignore
➞
Show inline comments
 
^\.
 
__pycache__/
 
^in/
 
^out/
 
\.pyc$
src/diana.py
➞
Show inline comments
 
import os
 
import re
 
import sys
 

			




	
	
	
		
 
from jinja2 import Environment,FileSystemLoader

			




	
	
	
		
 

			




	
	
	
		
 
import go

			




	
	
	
		
 
from go import BLACK,WHITE,EMPTY

			




	
	
	
		
 
from sgfParser.collection import Collection

			




	
	
	
		
 

			




	
	
	
		
 
from drawer.svg import Svg

			




	
	
	
		
 
from drawer.tikz import Tikz

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
templateDir=os.path.join(os.path.dirname(__file__),"templ")

			




	
	
	
		
 
with open(os.path.join(templateDir,"templ.svg")) as f:

			




	
	
	
		
 
	template=f.read()

			




	
	
	
		
 
env=Environment(loader=FileSystemLoader(templateDir))

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
if len(sys.argv)>1:

			




	
	
	
		
 
	files=sys.argv[1:]

			




	
	
	
		
 
else:

			




	
	
	
		
 
	sys.exit("no input file specified")

			




	
	
	
		
 

			




	
	
	
		
 
movesPerDiagram=75

			




	
	
	
		
 
minMovesPerDiagram=10

			




	
	
	
		
 

			




	
	
	
		
 
t=sys.stdout

			




	
	
	
		
 

			




	
	
		
 
@@ -90,25 +91,25 @@ def processFile(fileName):

			




	
	
	
		
 
					letters[(x,y)]=letter

			




	
	
	
		
 
					color='b' if localBoard[(x,y)]==EMPTY else 'w'

			




	
	
	
		
 
					diagram.addMove(x,y,color,letter)

			




	
	
	
		
 
					letter=chr(ord(letter)+1)

			




	
	
	
		
 
				overlays+="{0} = {1}\n".format(moveNumber+1,letters[(x,y)])

			




	
	
	
		
 
			# intersection occupied by a numbered stone

			




	
	
	
		
 
			else: overlays+="{0} = {1}\n".format(moveNumber+1,localBoard[(x,y)])

			




	
	
	
		
 
			

			




	
	
	
		
 
			moveNumber+=1

			




	
	
	
		
 
			

			




	
	
	
		
 
		# finish and save the diagram

			




	
	
	
		
 
		t=open(os.path.join("out","{0}-{1}.{2}".format(shortName,i+1,diagram.extension)),'w') # a new file

			




	
	
	
		
 
		t.write(diagram.render(template))

			




	
	
	
		
 
		t.write(diagram.render(env.get_template("templ.svg")))

			




	
	
	
		
 
		t.close()

			




	
	
	
		
 
			

			




	
	
	
		
 
	notes=open(os.path.join("out","{0}.txt".format(shortName)),'w')

			




	
	
	
		
 
	notes.write(overlays)

			




	
	
	
		
 
	notes.close()

			




	
	
	
		
 
	

			




	
	
	
		
 
print("processing:")

			




	
	
	
		
 
for item in files:

			




	
	
	
		
 
	# relativně vůči work directory nebo vůči skriptu?

			




	
	
	
		
 
	# item=os.path.join(os.path.dirname(__file__),item)

			




	
	
	
		
 
	if os.path.isfile(item):

			




	
	
	
		
 
		print("{0}... ".format(item),end="")

			




        

    


    
    

    

        

                

                    src/drawer/svg.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -39,26 +39,25 @@ class Svg:

			




	
	
	
		
 
		self._index[(x,y)]=(len(self._index),DiagramPoint(x,y,color,label))

			




	
	
	
		
 

			




	
	
	
		
 
	def addLabel(self,x,y,label):

			




	
	
	
		
 
		self._index[(x,y)]=(len(self._index),DiagramPoint(x,y,"",label))

			




	
	
	
		
 

			




	
	
	
		
 
	def render(self, template):

			




	
	
	
		
 
		points = [p for (i,p) in sorted(self._index.values())]

			




	
	
	
		
 

			




	
	
	
		
 
		stones = [p for p in points if p.color and not p.label]

			




	
	
	
		
 
		moves = [p for p in points if p.color and p.label]

			




	
	
	
		
 
		labels = [p for p in points if not p.color and p.label]

			




	
	
	
		
 

			




	
	
	
		
 
		svg = Template(template)

			




	
	
	
		
 
		params = {"boardSize":self.boardSize, "padding":self.padding, "stones":stones, "moves":moves, "labels":labels}

			




	
	
	
		
 

			




	
	
	
		
 
		return svg.render(params)

			




	
	
	
		
 
		return template.render(params)

			




	
	
	
		
 

			




	
	
	
		
 
	# def getFontSize(self,text):

			




	
	
	
		
 
	# 	if len(text)<2: return round(0.7*c)

			




	
	
	
		
 
	# 	elif len(text)<3: return round(0.55*c)

			




	
	
	
		
 
	# 	else: return round(0.4*c)

			




	
	
	
		
 
	#

			




	
	
	
		
 
	# def writeLabel(self,x,y,label,color):

			




	
	
	
		
 
	# 	label=str(label)

			




	
	
	
		
 
	# 	fontSize=self.getFontSize(label)

			




	
	
	
		
 
	# 	self.content+='  <text x="{0}" y="{1}" class="{2}" font-size="{3}">{4}</text>\n'.format(padding+x*c, padding+y*c+0.35*fontSize, color, fontSize, label)

			




        

    


    
    

    

        

                

                    src/templ/templ-pleb.svg
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
new file 100644

			




	
	
	
		
 
{% extends "templ.svg" %}

			




	
	
	
		
 

			




	
	
	
		
 
{% block style %}

			




	
	
	
		
 
rect{fill:white;stroke:black;stroke-width:1px}

			




	
	
	
		
 
text{font-family:"DejaVu Sans";text-anchor:middle;}

			




	
	
	
		
 
line{stroke:black;stroke-width:0.7px}

			




	
	
	
		
 
circle{stroke:black}

			




	
	
	
		
 
circle.b, text.w, text.e{fill:black}

			




	
	
	
		
 
circle.w, text.b{fill:white}

			




	
	
	
		
 
circle.e {stroke:none;fill:white}

			




	
	
	
		
 
{% endblock %}

			




	
	
	
		
 

			




	
	
	
		
 
{% macro labeledPoint(p) %}

			




	
	
	
		
 
<g transform="translate({{(p.x*cellSize) | round(2)}},{{(p.y*cellSize) | round(2)}})">

			




	
	
	
		
 
	<circle class="{{p.color or 'e'}}" cx="0" cy="0" r="{{stoneRadius|round(2)}}"/>

			




	
	
	
		
 
	<text class="{{p.color or 'e'}}" y="0.4em">{{p.label}}</text>

			




	
	
	
		
 
</g>

			




	
	
	
		
 
{% endmacro %}

			




        

    


    
    

    

        

                

                    src/templ/templ.svg
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
<?xml version="1.0" standalone="no"?>

			




	
	
	
		
 
<?xml version="1.0" encoding="utf-8"?>

			




	
	
	
		
 
{% set cellSize=boardSize/18 %}

			




	
	
	
		
 
{% set stoneRadius=cellSize/2-1 %}

			




	
	
	
		
 

			




	
	
	
		
 
<svg width="{{boardSize+padding*2}}" height="{{boardSize+padding*2}}" version="1.1" xmlns="http://www.w3.org/2000/svg" alignment-baseline="center">

			




	
	
	
		
 
{% if not labeledPoint %}

			




	
	
	
		
 
	{% macro labeledPoint(p) %}

			




	
	
	
		
 
	<g class="{{p.color or 'e'}}" transform="translate({{(p.x*cellSize) | round(2)}},{{(p.y*cellSize) | round(2)}})">

			




	
	
	
		
 
		<circle cx="0" cy="0" r="{{stoneRadius|round(2)}}"/>

			




	
	
	
		
 
		<text y="0.4em">{{p.label}}</text>

			




	
	
	
		
 
	</g>

			




	
	
	
		
 
	{% endmacro %}

			




	
	
	
		
 
{% endif %}

			




	
	
	
		
 

			




	
	
	
		
 
<svg width="{{boardSize+padding*2}}" height="{{boardSize+padding*2}}" version="1.1" xmlns="http://www.w3.org/2000/svg">

			




	
	
	
		
 
	<defs>

			




	
	
	
		
 
		<style type="text/css"><![CDATA[

			




	
	
	
		
 
			rect{fill:white;stroke:black;stroke-width:1}

			




	
	
	
		
 
		{% block style %}

			




	
	
	
		
 
			rect{fill:white;stroke:black;stroke-width:1px}

			




	
	
	
		
 
			text{font-family:"DejaVu Sans";text-anchor:middle;}

			




	
	
	
		
 
			line{stroke:black;stroke-width:0.7}

			




	
	
	
		
 
			line{stroke:black;stroke-width:0.7px}

			




	
	
	
		
 
			circle{stroke:black}

			




	
	
	
		
 
			circle.b, .b circle, .w text, .e text{fill:black}

			




	
	
	
		
 
			circle.w, .w circle, .b text{fill:white}

			




	
	
	
		
 
			.e circle {stroke:none;fill:white}

			




	
	
	
		
 
		{% endblock %}

			




	
	
	
		
 
		]]></style>

			




	
	
	
		
 
	</defs>

			




	
	
	
		
 
	<g width="{{boardSize}}" height="{{boardSize}}" transform="translate({{padding}},{{padding}})">

			




	
	
	
		
 
	<g transform="translate({{padding}},{{padding}})">

			




	
	
	
		
 
		<rect x="0" y="0" width="{{boardSize}}" height="{{boardSize}}"/>

			




	
	
	
		
 
		{# grid #}

			




	
	
	
		
 
		{% for i in range(1,18) %}

			




	
	
	
		
 
			<line x1="0" x2="{{boardSize}}" y1="{{(i*cellSize) | round(2)}}" y2="{{(i*cellSize) | round(2)}}"/>

			




	
	
	
		
 
			<line x1="{{(i*cellSize) | round(2)}}" x2="{{(i*cellSize) | round(2)}}" y1="0" y2="{{boardSize}}"/>

			




	
	
	
		
 
		{% endfor %}

			




	
	
	
		
 

			




	
	
	
		
 
		{# stars #}

			




	
	
	
		
 
		{% for y in [3,9,15] %}

			




	
	
	
		
 
			{% for x in [3,9,15] %}

			




	
	
	
		
 
		  <circle cx="{{(x*cellSize) | round(2)}}" cy="{{(y*cellSize) | round(2)}}" r="2" class="b"/>

			




	
	
	
		
 
			{% endfor %}

			




	
	
	
		
 
		{% endfor %}

			




	
	
	
		
 

			




	
	
	
		
 
		{# stones #}

			




	
	
	
		
 
		{% for p in stones %}

			




	
	
	
		
 
			<circle cx="{{(p.x*cellSize) | round(2)}}" cy="{{(p.y*cellSize) | round(2)}}" r="{{stoneRadius|round(2)}}" class="{{p.color}}"/>

			




	
	
	
		
 
		{% endfor %}

			




	
	
	
		
 

			




	
	
	
		
 
		{# moves #}

			




	
	
	
		
 
		{% for p in moves %}

			




	
	
	
		
 
			<g width="{{cellSize|round(2)}}" height="{{cellSize|round(2)}}" class="{{p.color}}" transform="translate({{(p.x*cellSize) | round(2)}},{{(p.y*cellSize) | round(2)}})">

			




	
	
	
		
 
				<circle cx="0" cy="0" r="{{stoneRadius|round(2)}}"/>

			




	
	
	
		
 
				<text y="0.4em">{{p.label}}</text>

			




	
	
	
		
 
			</g>

			




	
	
	
		
 
			{{labeledPoint(p)}}

			




	
	
	
		
 
		{% endfor %}

			




	
	
	
		
 

			




	
	
	
		
 
		{# labels #}

			




	
	
	
		
 
		{% for p in labels %}

			




	
	
	
		
 
			<g width="{{cellSize|round(2)}}" height="{{cellSize|round(2)}}" class="e" transform="translate({{(p.x*cellSize) | round(2)}},{{(p.y*cellSize) | round(2)}})">

			




	
	
	
		
 
				<circle cx="0" cy="0" r="{{stoneRadius|round(2)}}"/>

			




	
	
	
		
 
				<text y="0.4em">{{p.label}}</text>

			




	
	
	
		
 
			</g>

			




	
	
	
		
 
			{{labeledPoint(p)}}

			




	
	
	
		
 
		{% endfor %}

			




	
	
	
		
 
	</g>

			




	
	
	
		
 
</svg>

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: Sirius-560
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2023 by various authors & licensed under GPLv3.
            – Support