Fix write: color

TeX/jam.sty

@@ -28,3 +28,21 @@
   \fill[color=#1]#2++(0.5,0.5)--++(0,1)--++(-1,0)--++(0,-1)--++(-1,0)--++(0,-1)--++(1,0)--++(0,-1)--++(1,0)--++(0,1)--++(1,0)--++(0,1)--++(-1,0);
   \draw[color=black]#2++(0.5,0.5)--++(0,1)--++(-1,0)--++(0,-1)--++(-1,0)--++(0,-1)--++(1,0)--++(0,-1)--++(1,0)--++(0,1)--++(1,0)--++(0,1)--++(-1,0);
 }
+
+% 3-staircase (color #1, position #2)
+\def\staircase#1#2{
+  \fill[color=#1]#2++(-0.5,-0.5)--++(3,0)--++(0,1)--++(-1,0)--++(0,1)--++(-1,0)--++(0,1)--++(-1,0)--++(0,-3);
+  \draw[color=black]#2++(-0.5,-0.5)--++(3,0)--++(0,1)--++(-1,0)--++(0,1)--++(-1,0)--++(0,1)--++(-1,0)--++(0,-3);
+}
+
+% disk (color #1, position #2)
+\def\disk#1#2{
+  \fill[color=#1]#2circle(2.5);
+  \draw[color=black]#2circle(2.5);
+}
+
+% square (color #1, position #2)
+\def\square#1#2{
+  \fill[color=#1]#2++(-1,-1)--++(0,2)--++(2,0)--++(0,-2)--cycle;
+  \draw[color=black]#2++(-1,-1)--++(0,2)--++(2,0)--++(0,-2)--cycle;
+}

src/command_prompt.py

@@ -20,7 +20,7 @@ import os.path
 
 import filecheck
 import colors
-from polyomino import Cross,Disk
+from polyomino import Cross,Disk,Staircase,Square2
 
 class Command_prompt(Label):
     
@@ -388,6 +388,10 @@ class Command_prompt(Label):
             self.app.painter.shape=Cross
         elif argv[2]=="disk":
             self.app.painter.shape=Disk
+        elif argv[2]=="staircase":
+            self.app.painter.shape=Staircase
+        elif argv[2]=="2square":
+            self.app.painter.shape=Square2
         else:
             self.message="error: unrecognized shape '"+argv[2]+"'; supported shapes are cross|disk"
             return

src/element.py

@@ -282,3 +282,16 @@ class Element_circle(Element):
     def move_along(self,delta,element):
         x=element.pos-self.pos+delta
         return x/l_2(x)*(element.size+self.size)/2+self.pos-element.pos
+
+    # for use with lattices
+    # list of lattice points covered by square
+    def lattice_points(self,lattice):
+        out=[]
+        dx=math.floor(0.5*self.size/lattice.spacing)
+        for i in range(-dx,dx+1):
+            for j in range(-dx,dx+1):
+                if lattice.spacing*lattice.spacing*(i*i+j*j)<=self.size*self.size/4:
+                    out.append(Point(self.pos.x+i*lattice.spacing,self.pos.y+j*lattice.spacing))
+        return out
+
+

src/jam

@@ -61,10 +61,10 @@ def read_cli():
             else:
                 openfile=arg
                 (ret,message)=filecheck.check_edit(openfile)
-                preread_conf(openfile)
                 if ret<0:
                     print(message,file=sys.stderr)
                     exit(-1)
+                preread_conf(openfile)
 
 # read command line arguments from configuration file
 def preread_conf(file):
@@ -72,8 +72,7 @@ def preread_conf(file):
     try:
         ff=open(file,"r")
     except:
-        print("error: could not read file '"+file+"' (this should not happen and is probably a bug)", file=sys.stderr)
-        exit(-1)
+        return
 
     # counter
     i=0

src/painter.py

@@ -21,7 +21,7 @@ from kivy.core.window import Window
 from kivy.graphics import Color,Line,Rectangle
 
 from point import Point
-from polyomino import Cross,Disk
+from polyomino import Cross,Disk,Staircase,Square2
 
 from tools import remove_fromlist
 
@@ -176,41 +176,43 @@ class Painter(Widget):
             while self.pos_tocoord_x(xx)<self.width:
                 yy=pos.y
                 while self.pos_tocoord_y(yy)<self.height:
-                    if self.is_in_voronoi(xx,yy,particle):
-                        self.draw_voronoi_site(xx,yy,particle.color)
+                    self.draw_voronoi_site(xx,yy,particle.color,self.is_in_voronoi(xx,yy,particle))
                     yy+=self.lattice.spacing
                 yy=pos.y-self.lattice.spacing
                 while self.pos_tocoord_y(yy)>0:
-                    if self.is_in_voronoi(xx,yy,particle):
-                        self.draw_voronoi_site(xx,yy,particle.color)
+                    self.draw_voronoi_site(xx,yy,particle.color,self.is_in_voronoi(xx,yy,particle))
                     yy-=self.lattice.spacing
                 xx+=self.lattice.spacing
             xx=pos.x-self.lattice.spacing
             while self.pos_tocoord_x(xx)>0:
                 yy=pos.y
                 while self.pos_tocoord_y(yy)<self.height:
-                    if self.is_in_voronoi(xx,yy,particle):
-                        self.draw_voronoi_site(xx,yy,particle.color)
+                    self.draw_voronoi_site(xx,yy,particle.color,self.is_in_voronoi(xx,yy,particle))
                     yy+=self.lattice.spacing
                 yy=pos.y-self.lattice.spacing
                 while self.pos_tocoord_y(yy)>0:
-                    if self.is_in_voronoi(xx,yy,particle):
-                        self.draw_voronoi_site(xx,yy,particle.color)
+                    self.draw_voronoi_site(xx,yy,particle.color,self.is_in_voronoi(xx,yy,particle))
                     yy-=self.lattice.spacing
                 xx-=self.lattice.spacing
     # check whether a site is in the Voronoi cell of a particle
     def is_in_voronoi(self,x,y,particle):
         d_to_particle=self.lattice.distance_to_particle(x,y,particle)
+        # count how many are in voronoi cell
+        count=1
         # TODO: start  with a particle that is close to x,y
         for q in self.particles:
-            if q!=particle and self.lattice.distance_to_particle(x,y,q)<d_to_particle:
-                return False
-        return True
+            dd=self.lattice.distance_to_particle(x,y,q)
+            if q!=particle and dd<d_to_particle:
+                return 0
+            if dd==d_to_particle:
+                count+=1
+        return count
     # draw a site in a Voronoi cell
-    def draw_voronoi_site(self,x,y,color):
-        Color(color[0],color[1],color[2],0.25)
-        #Color(1,0,0,alpha=0.25)
-        Rectangle(pos=(self.pos_tocoord_x(x-0.5),self.pos_tocoord_y(y-0.5)),size=(self.base_size,self.base_size))
+    def draw_voronoi_site(self,x,y,color,count):
+        if count==0:
+            return
+        Color(color[0],color[1],color[2],1-count*0.1)
+        Rectangle(pos=(self.pos_tocoord_x(x-0.5*self.lattice.spacing),self.pos_tocoord_y(y-0.5*self.lattice.spacing)),size=(self.base_size*self.lattice.spacing,self.base_size*self.lattice.spacing))
 
 
 
@@ -313,6 +315,9 @@ class Painter(Widget):
                 # record relative position of click with respect to reference
                 if self.undermouse!=None:
                     self.offset=Point(touchx,touchy)-self.undermouse.elements[0].pos
+                    # snap to lattice
+                    if self.lattice!=None:
+                        self.offset=self.lattice.nearest(self.offset)
 
                 # no modifiers
                 if self.modifiers==[]:
@@ -359,13 +364,17 @@ class Painter(Widget):
         # only respond to touch in drawing area
         if self.collide_point(*touch.pos):
             # convert to logical
-            touchx=self.coord_topos_x(touch.x)
-            touchy=self.coord_topos_y(touch.y)
+            touchc=Point(self.coord_topos_x(touch.x),self.coord_topos_y(touch.y))
+
+            # snap to lattice
+            if self.lattice!=None:
+                touchc=self.lattice.nearest(touchc)
 
             # only move on left click
             if touch.button=="left" and self.modifiers==[] and self.undermouse!=None:
                 # attempted move determined by the relative position to the relative position of click within self.undermouse
-                delta=self.adjust_move(Point(touchx,touchy)-(self.offset+self.undermouse.elements[0].pos),0)
+                delta=self.adjust_move(touchc-(self.offset+self.undermouse.elements[0].pos),0)
+
 
                 # snap to lattice
                 if self.lattice!=None:
@@ -536,10 +545,16 @@ class Painter(Widget):
         # save state (particle shape, zoom, lattice)
         if self.shape==Cross:
             ff.write("%shape=cross\n")
-        else:
+        elif self.shape==Disk:
             ff.write("%shape=disk\n")
+        elif self.shape==Staircase:
+            ff.write("%shape=staircase\n")
+        elif self.shape==Square2:
+            ff.write("%shape=2square\n")
+        else:
+            print("bug: unrecognized shape in write: '"+str(self.shape)+"'")
         ff.write("%zoom={:1.1f}\n".format(self.base_size/50))
-        ff.write("%color={:d},{:d},{:d}\n".format(self.color[0],self.color[1],self.color[2]))
+        ff.write("%color={:1.1f},{:1.1f},{:1.1f}\n".format(self.color[0],self.color[1],self.color[2]))
         if self.lattice != None:
             ff.write("%lattice="+self.lattice.type+':'+str(self.lattice.spacing)+"\n")
         for particle in self.particles:
@@ -547,6 +562,10 @@ class Painter(Widget):
                 ff.write("{:d};".format(CROSS_INDEX))
             elif type(particle)==Disk:
                 ff.write("{:d};".format(DISK_INDEX))
+            elif type(particle)==Staircase:
+                ff.write("{:d};".format(STAIRCASE_INDEX))
+            elif type(particle)==Square2:
+                ff.write("{:d};".format(SQUARE2_INDEX))
             ff.write("{:05.2f},{:05.2f};{:3.1f},{:3.1f},{:3.1f}\n".format(particle.elements[0].pos.x,particle.elements[0].pos.y,particle.color[0],particle.color[1],particle.color[2]))
         ff.close()
 
@@ -649,6 +668,10 @@ class Painter(Widget):
                 candidate=Cross(pos.x,pos.y,color=color)
             elif particle_type==DISK_INDEX:
                 candidate=Disk(pos.x,pos.y,color=color)
+            elif particle_type==STAIRCASE_INDEX:
+                candidate=Staircase(pos.x,pos.y,color=color)
+            elif particle_type==SQUARE2_INDEX:
+                candidate=Square2(pos.x,pos.y,color=color)
             else:
                 print("warning: ignoring line "+str(i)+" in file '"+file+"': unrecognized particle type: '"+entries[0]+"'",file=sys.stderr)
                 continue
@@ -685,6 +708,12 @@ class Painter(Widget):
         for particle in self.particles:
             if type(particle)==Cross:
                 ff.write("\cross{"+colors.closest_color(particle.color,colors.xcolor_names)+"}")
+            elif type(particle)==Disk:
+                ff.write("\disk{"+colors.closest_color(particle.color,colors.xcolor_names)+"}")
+            elif type(particle)==Staircase:
+                ff.write("\staircase{"+colors.closest_color(particle.color,colors.xcolor_names)+"}")
+            elif type(particle)==Square2:
+                ff.write("\square{"+colors.closest_color(particle.color,colors.xcolor_names)+"}")
             ff.write("{{({:05.2f},{:05.2f})}};\n".format(particle.elements[0].pos.x-self.particles[0].elements[0].pos.x,particle.elements[0].pos.y-self.particles[0].elements[0].pos.y))
 
         ff.write("\\end{tikzpicture}\n")
@@ -702,5 +731,7 @@ class Painter(Widget):
 # global variables (used like precompiler variables)
 CROSS_INDEX=1
 DISK_INDEX=2
+STAIRCASE_INDEX=3
+SQUARE2_INDEX=4
 
 

src/polyomino.py

@@ -123,3 +123,57 @@ class Cross(Polyomino):
 class Disk(Polyomino):
     def __init__(self,x,y,**kwargs):
         super(Disk,self).__init__(**kwargs,elements=[Element_circle(x,y,size=kwargs.get("size",1.0))])
+
+# 3-staircase
+class Staircase(Polyomino):
+    def __init__(self,x,y,**kwargs):
+        super(Staircase,self).__init__(**kwargs,elements=[\
+        Element_square(x,y+1,1,aspect=3),\
+        Element_square(x+1,y,1),\
+        Element_square(x+1,y+1,1),\
+        Element_square(x+2,y,1)\
+        ])
+
+    # redefine stroke to avoid lines between touching elements
+    def stroke(self,painter):
+        # convert to graphical coordinates
+        coordx=painter.pos_tocoord_x(self.elements[0].pos.x)
+        coordy=painter.pos_tocoord_y(self.elements[0].pos.y)
+
+        Color(1,1,1)
+        Line(points=(
+        *(coordx-0.5*painter.base_size,coordy-1.5*painter.base_size),
+        *(coordx+2.5*painter.base_size,coordy-1.5*painter.base_size),
+        *(coordx+2.5*painter.base_size,coordy-0.5*painter.base_size),
+        *(coordx+1.5*painter.base_size,coordy-0.5*painter.base_size),
+        *(coordx+1.5*painter.base_size,coordy+0.5*painter.base_size),
+        *(coordx+0.5*painter.base_size,coordy+0.5*painter.base_size),
+        *(coordx+0.5*painter.base_size,coordy+1.5*painter.base_size),
+        *(coordx-0.5*painter.base_size,coordy+1.5*painter.base_size),
+        *(coordx-0.5*painter.base_size,coordy-1.5*painter.base_size),
+        ))
+
+# 2-square
+class Square2(Polyomino):
+    def __init__(self,x,y,**kwargs):
+        super(Square2,self).__init__(**kwargs,elements=[\
+        Element_square(x,y,1),\
+        Element_square(x+1,y,1),\
+        Element_square(x,y+1,1),\
+        Element_square(x+1,y+1,1)\
+        ])
+
+    # redefine stroke to avoid lines between touching elements
+    def stroke(self,painter):
+        # convert to graphical coordinates
+        coordx=painter.pos_tocoord_x(self.elements[0].pos.x)
+        coordy=painter.pos_tocoord_y(self.elements[0].pos.y)
+
+        Color(1,1,1)
+        Line(points=(
+        *(coordx-0.5*painter.base_size,coordy-0.5*painter.base_size),
+        *(coordx+1.5*painter.base_size,coordy-0.5*painter.base_size),
+        *(coordx+1.5*painter.base_size,coordy+1.5*painter.base_size),
+        *(coordx-0.5*painter.base_size,coordy+1.5*painter.base_size),
+        *(coordx-0.5*painter.base_size,coordy-0.5*painter.base_size),
+        ))