Corrected error message

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,6 +20,7 @@ import os.path
 
 import filecheck
 import colors
+from polyomino import Cross,Disk,Staircase,Square2
 
 class Command_prompt(Label):
     
@@ -338,9 +339,15 @@ class Command_prompt(Label):
         if argv[1]=="color":
             self.run_set_color(argv)
             return
+        elif argv[1]=="shape":
+            self.run_set_shape(argv)
+            return
         elif argv[1]=="grid":
             self.run_set_grid(argv)
             return
+        elif argv[1]=="voronoi":
+            self.run_set_voronoi(argv)
+            return
         elif argv[1]=="zoom":
             self.run_set_zoom(argv)
         else:
@@ -350,7 +357,7 @@ class Command_prompt(Label):
     # set color
     def run_set_color(self,argv):
         if len(argv)<3:
-            self.message="error: 'set color' command was run with without anargument -- usage: 'set color <color_descriptor>'"
+            self.message="error: 'set color' command was run with without an argument -- usage: 'set color <color_descriptor>'"
             return
         # find color name in list
         for color in colors.xcolor_names:
@@ -372,6 +379,23 @@ class Command_prompt(Label):
             return
         self.app.painter.set_color(color)
 
+    # set particle shape
+    def run_set_shape(self,argv):
+        if len(argv)<3:
+            self.message="error: 'set shape' command was run with without an argument -- usage: 'set shape <shape_descriptor>'"
+            return
+        elif argv[2]=="cross":
+            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|staircase|2square"
+            return
+
     # toggle grid
     def run_set_grid(self,argv):
         if len(argv)==2:
@@ -392,6 +416,19 @@ class Command_prompt(Label):
                 return
             self.app.painter.set_grid(mesh)
 
+    # toggle Voronoi cells
+    def run_set_voronoi(self,argv):
+        if len(argv)==2:
+            # no argument: set to toggle
+            self.app.painter.set_voronoi(-1)
+        elif argv[2]=="on":
+            self.app.painter.set_voronoi(1)
+        elif argv[2]=="off":
+            self.app.painter.set_voronoi(0)
+        else:
+            self.message="error: unrecognized argument '"+argv[2]+"' -- usage 'set voronoi [on|off]'"
+            return
+
     # set zoom level (changes size of elements)
     def run_set_zoom(self,argv):
         if len(argv)==2:

src/element.py

@@ -95,8 +95,20 @@ class Element_square(Element):
         *(coordx-0.5*self.size*painter.base_size,coordy-0.5*self.size*self.aspect*painter.base_size)
         ))
 
+    # 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)
+        dy=math.floor(0.5*self.size*self.aspect/lattice.spacing)
+        for i in range(-dx,dx+1):
+            for j in range(-dy,dy+1):
+                out.append(Point(self.pos.x+i*lattice.spacing,self.pos.y+j*lattice.spacing))
+        return out
+
+
     # check whether an element interacts with square
-    # TODO: this only works if element is a square!
+    # TODO: this only works if element is a rectangle!
     def check_interaction(self,element):
         # allow for error
         return max(abs(element.pos.x-self.pos.x)/(self.size+element.size),abs(element.pos.y-self.pos.y)/(self.size*self.aspect+element.size*element.aspect))<1/2-1e-11
@@ -106,7 +118,7 @@ class Element_square(Element):
         return max(abs(self.pos.x-x.x),abs(self.pos.y-x.y)/self.aspect)<=1/2
 
     # check whether an element is touching self
-    # TODO: this only works if element is a square!
+    # TODO: this only works if element is a rectangle!
     def check_touch(self,element):
         # allow for error
         if in_interval(max(abs(element.pos.x-self.pos.x)/(self.size+element.size),abs(element.pos.y-self.pos.y)/(self.size*self.aspect+element.size*element.aspect)),1/2-1e-11,1/2+1e-11):
@@ -114,7 +126,7 @@ class Element_square(Element):
         return False
 
     # find position along a line that comes in contact with the line going through element.pos in direction v
-    # TODO: this only works if element is a square!
+    # TODO: this only works if element is a rectangle!
     def move_on_line_to_stick(self,element,v):
         size_x=(self.size+element.size)/2
         size_y=(self.size*self.aspect+element.size*element.aspect)/2
@@ -160,7 +172,7 @@ class Element_square(Element):
         return closest-element.pos
 
     # move along edge of square
-    # TODO: this only works if element is a square!
+    # TODO: this only works if element is a rectangle!
     def move_along(self,delta,element):
         size_x=(self.size+element.size)/2
         size_y=(self.size*self.aspect+element.size*element.aspect)/2
@@ -270,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

@@ -40,6 +40,10 @@ def read_cli():
                 # lattice
                 if c=='L':
                     flag="lattice"
+                else:
+                    print("error: unrecognized option '"+c+"'\n", file=sys.stderr)
+                    exit(-1)
+
 
         else:
             # read lattice argument
@@ -60,6 +64,51 @@ def read_cli():
                 if ret<0:
                     print(message,file=sys.stderr)
                     exit(-1)
+                preread_conf(openfile)
+
+# read command line arguments from configuration file
+def preread_conf(file):
+    global lattice
+    try:
+        ff=open(file,"r")
+    except:
+        return
+
+    # counter
+    i=0
+    try:
+        lines=ff.readlines()
+    except:
+        print("error: could not read the contents of file '"+file+"'", file=sys.stderr)
+        exit(-1)
+
+    for line in lines:
+        i+=1
+        # remove newline
+        line=line[:len(line)-1]
+        # ignore comments
+        if '#' in line:
+            line=line[:line.find('#')]
+        # ignore empty lines
+        if len(line)==0:
+            continue
+
+        # read options
+        if line[0]=='%':
+            # ignore empty line
+            if len(line)==1:
+                continue
+            [key,val]=line[1:].split('=',1)
+            if key=="lattice":
+                # test the specification
+                (obj,message)=Lattice.new(val)
+                if obj==None:
+                    print("error: line "+str(i)+" in file '"+file+"': "+message,file=sys.stderr)
+                    exit(-1)
+                lattice=val
+
+    ff.close()
+
 
 # read cli
 read_cli()

src/lattice.py

@@ -73,4 +73,22 @@ class Lattice_square(Lattice):
             return (Lattice_square(spacing=spacing),"")
         except:
             return (None,"error: '"+spec+"' is not a valid specification for the square lattice: should be 'square[:spacing]'")
+
+    # distance on the lattice between (x1,x2) and (y1,y2)
+    def distance(self, x1, x2, y1, y2):
+        return round((abs(x1-y1)+abs(x2-y2))/self.spacing)
+
+    # distance between a lattice site and a particle
+    def distance_to_particle(self, x1, x2, particle):
+        mindist=self.distance_to_element(x1, x2, particle.elements[0])
+        for i in range(1,len(particle.elements)):
+            mindist=min(self.distance_to_element(x1, x2, particle.elements[i]),mindist)
+        return mindist
+    # distance between a lattice site and an element
+    def distance_to_element(self, x1, x2, element):
+        pts=element.lattice_points(self)
+        mindist=self.distance(x1, x2, pts[0].x, pts[0].y)
+        for i in range(1,len(pts)):
+            mindist=min(self.distance(x1, x2, pts[i].x, pts[i].y),mindist)
+        return mindist
         

src/painter.py

@@ -18,10 +18,10 @@ import sys
 import math
 from kivy.uix.widget import Widget
 from kivy.core.window import Window
-from kivy.graphics import Color,Line
+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
 
@@ -35,6 +35,12 @@ class Painter(Widget):
         # list of particles
         self.particles=[]
 
+        # shape of particle to add next
+        self.shape=Cross
+
+        # color of particle to add next
+        self.color=(0,0,1)
+
         # underlying lattice
         self.lattice=None
 
@@ -121,6 +127,12 @@ class Painter(Widget):
                 if particle.grid>0:
                     self.draw_grid(particle.elements[0].pos,particle.grid)
 
+            # draw Voronoi cells
+            if self.lattice!=None:
+                for particle in self.particles:
+                    if particle.voronoi>0:
+                        self.draw_voronoi(particle)
+
             for particle in self.particles:
                 particle.draw(self,alpha=0.5)
 
@@ -154,6 +166,55 @@ class Painter(Widget):
             Line(points=(0,self.pos_tocoord_y(yy),self.width,self.pos_tocoord_y(yy)))
             yy-=mesh
 
+    # draw the discrete Voronoi cell of a particle
+    def draw_voronoi(self,particle):
+        # only works for lattices
+        if self.lattice!=None:
+            pos=particle.elements[0].pos
+            # loop over all points
+            xx=pos.x
+            while self.pos_tocoord_x(xx)<self.width:
+                yy=pos.y
+                while self.pos_tocoord_y(yy)<self.height:
+                    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:
+                    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:
+                    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:
+                    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:
+            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,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))
+
+
 
     # respond to keyboard
     def on_key_down(self, keyboard, keycode, text, modifiers):
@@ -229,8 +290,7 @@ class Painter(Widget):
 
             # create new particle
             if touch.button=="right":
-                new=Cross(touchx,touchy)
-                #new=Disk(touchx,touchy)
+                new=self.shape(touchx,touchy,color=self.color)
                 # snap to lattice
                 if self.lattice!=None:
                     new.move(self.lattice.nearest_delta(new.elements[0].pos))
@@ -255,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==[]:
@@ -301,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:
@@ -438,6 +505,9 @@ class Painter(Widget):
 
     # set color of selected particles
     def set_color(self,color):
+        # set color for next particles
+        self.color=color
+        # set color of selected particles
         for particle in self.selected:
             particle.color=color
         # redraw
@@ -457,15 +527,45 @@ class Painter(Widget):
         # redraw
         self.draw()
 
+    # set voronoi for selected particles
+    def set_voronoi(self, onoff):
+        for particle in self.selected:
+            if onoff==0:
+                particle.voronoi=False
+            elif onoff==1:
+                particle.voronoi=True
+            elif onoff==-1:
+                particle.voronoi=not particle.voronoi
+        # redraw
+        self.draw()
 
     # write configuration to file
     def write(self,file):
         ff=open(file,"w")
+        # save state (particle shape, zoom, lattice)
+        if self.shape==Cross:
+            ff.write("%shape=cross\n")
+        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={: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:
             if type(particle)==Cross:
                 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()
 
@@ -500,12 +600,35 @@ class Painter(Widget):
             if len(line)==0:
                 continue
 
+            # read options
+            if line[0]=='%':
+                # ignore empty line
+                if len(line)==1:
+                    continue
+                [key,val]=line[1:].split('=',1)
+                if key=="shape":
+                    self.app.command_prompt.run_set_shape(["set","shape",val])
+                elif key=="zoom":
+                    self.app.command_prompt.run_set_zoom(["set","zoom",val])
+                elif key=="color":
+                    color_str=val.split(',')
+                    try:
+                        self.set_color((float(color_str[0]),float(color_str[1]),float(color_str[2])))
+                    except:
+                        print("warning: ignoring line "+str(i)+" in file '"+file+"': color '"+color_str+"' cannot be read",file=sys.stderr)
+                # lattice is handled by main function
+                elif key=="lattice":
+                    continue
+                else:
+                    print("warning: ignoring line "+str(i)+" in file '"+file+"': unrecognized option '"+key+"'",file=sys.stderr)
+                continue
+
             entries=line.split(";")
             # skip line if improperly formatted
             if len(entries)>3:
-                print("warning: ignoring line "+str(i)+" in file '"+file+"': more than three ';' spearated entries in '"+line+"'",file=sys.stderr)
+                print("warning: ignoring line "+str(i)+" in file '"+file+"': more than three ';' separated entries in '"+line+"'",file=sys.stderr)
             if len(entries)<2:
-                print("warning: ignoring line "+str(i)+" in file '"+file+"': fewer than two ';' spearated entries in '"+line+"'",file=sys.stderr)
+                print("warning: ignoring line "+str(i)+" in file '"+file+"': fewer than two ';' separated entries in '"+line+"'",file=sys.stderr)
                 continue
 
             # position
@@ -545,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
@@ -581,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")
@@ -598,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

@@ -29,6 +29,9 @@ class Polyomino():
         # mesh of background grid (no grid for mesh size 0)
         self.grid=kwargs.get("grid",0)
 
+        # draw Voronoi cell
+        self.voronoi=kwargs.get("voronoi",False)
+
     # draw function
     def draw(self,painter,**kwargs):
         alpha=kwargs.get("alpha",1)
@@ -120,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),
+        ))