Dependencies in README

LICENSE

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

README.md

@@ -0,0 +1,73 @@
+Jam is visualization software for hard-core lattice particle systems. It is
+designed to explore configurations of particles while enforcing that no two
+particles overlap.
+
+**Jam is a work in progress and is nowhere near ready for production.**
+
+
+# Basic usage
+
+Run with
+```bash
+  ./src/jam [configuration_file]
+```
+where `[configuration_file]` is an optional argument that specifies a file with
+a list of particle positions that will be loaded on initial execution.
+
+
+# Dependencies
+
+Jam is written in Python 3, and uses Kivy to run the GUI.
+
+
+# User interface
+
+  * `<right-click>`: create a new particle under the mouse pointer (if the
+    particle fits)
+
+  * `<shift><left-click>`: select/unselect multiple particles
+
+  * `<left-click>` and drag: move selected particle(s).
+
+  * `backspace`: delete selected particle(s)
+
+
+# Commands
+
+Commands can be executed by typing `:` (similarly to vim).
+
+  * `:q`: exit
+
+  * `:w [path_to_file]`: Write particle configuration to file. This will not
+    overwrite existing files; use `:w!` to overwrite.
+
+  * `:e <path_to_file>`: edit file.
+
+  * `:export <path_to_file>`: Export configuration to LaTeX (using TikZ)
+
+  * `:set color <color_spec>`: Set color of selected particles to
+    `<color_spec>`. The supported format for `<color_spec>` is either `r,g,b`
+    with `r`, `g`, and `b` in [0,1], or one of
+    `red|green|blue|brown|lime|orange|pink|purple|teal|violet|cyan|magenta|yellow|olive|black|darkgray|gray|lightgray|white`.
+
+  * `:set zoom <zoom_level>`: Scale all particles by `<zoom_level>`.
+
+  * `:set grid [on|off]`: Add a visual grid centered on one of the selected
+    particles. The size of the mesh can be specified by passing
+    `:set grid <size_of_mesh>`.
+
+
+# Current developments
+
+So far, Jam only supports cross-shaped particles, but work is in progress to
+support arbitrary shapes consisting of rectangles, circle arcs and triangles
+(check out the `dev` branch to follow the progress).
+
+Support for lattice configurations is also ongoing.
+
+
+# License
+
+Jam is distributed under the Apache 2.0 License.
+
+Copyright 2021-2023 Ian Jauslin

TeX/jam.sty

@@ -1,3 +1,17 @@
+% Copyright 2021-2023 Ian Jauslin
+% 
+% Licensed under the Apache License, Version 2.0 (the "License");
+% you may not use this file except in compliance with the License.
+% You may obtain a copy of the License at
+% 
+%     http://www.apache.org/licenses/LICENSE-2.0
+% 
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS,
+% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+% See the License for the specific language governing permissions and
+% limitations under the License.
+
 % square lattice (width #1, height #2, origin #3, spacing #4)
 \def\grid#1#2#3{
   \foreach\i in {0,...,#2}{

src/colors.py

@@ -1,3 +1,17 @@
+# Copyright 2021-2023 Ian Jauslin
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # find named color that is closest to rgb values
 def closest_color(rgb,names):
     name=""

src/command_prompt.py

@@ -1,3 +1,17 @@
+# Copyright 2021-2023 Ian Jauslin
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 from kivy.uix.label import Label
 from kivy.core.window import Window
 from kivy.graphics import Color,Rectangle

src/filecheck.py

@@ -1,3 +1,17 @@
+# Copyright 2021-2023 Ian Jauslin
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 import os.path
 
 # check that a file can be edited

src/jam

@@ -1,69 +1,31 @@
 #!/usr/bin/env python3
 
-import sys
+# Copyright 2021-2023 Ian Jauslin
-import os.path,os
+# 
-import filecheck
+# Licensed under the Apache License, Version 2.0 (the "License");
-from lattice import Lattice
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
-## read cli before loading kivy, in case there are errors
-
-# read cli
-openfile=""
-lattice=""
-def read_cli():
-    global openfile
-    global lattice
-
-    # init flag
-    flag=""
-
-    # loop over arguments
-    for arg in sys.argv[1:]:
-        # option flag
-        if arg[0]=='-':
-            # loop over options
-            for c in arg[1:]:
-                # lattice
-                if c=='L':
-                    flag="lattice"
-
-        else:
-            # read lattice argument
-            if flag=="lattice":
-                # test the specification
-                (obj,message)=Lattice.new(arg)
-                if obj==None:
-                    print(message,file=sys.stderr)
-                    exit(-1)
-                lattice=arg
-                # reset flag
-                flag=""
-
-            # no flags
-            else:
-                openfile=arg
-                (ret,message)=filecheck.check_edit(openfile)
-                if ret<0:
-                    print(message,file=sys.stderr)
-                    exit(-1)
-
-# read cli
-read_cli()
-
-
-## import kivy
-
-# disable kivy argument parser
-os.environ["KIVY_NO_ARGS"] = "1"
 
 from kivy.app import App
 from kivy.uix.widget import Widget
 from kivy.uix.boxlayout import BoxLayout
 from kivy.config import Config
+import sys
+import os.path
 
 from painter import Painter
 from status_bar import Status_bar
 from command_prompt import Command_prompt
+import filecheck
 
 # App class
 class Jam_app(App):
@@ -74,9 +36,6 @@ class Jam_app(App):
         # the file open for editing
         self.openfile=kwargs.get("openfile","")
 
-        # the lattice open for editing
-        self.lattice=kwargs.get("lattice","")
-
         # readonly mode
         self.readonly=False
 
@@ -104,20 +63,24 @@ class Jam_app(App):
             # set readonly mode
             self.readonly=not os.access(self.openfile,os.W_OK)
 
-        # load lattice
-        if self.lattice!="":
-            (obj,message)=Lattice.new(self.lattice)
-            self.painter.set_lattice(obj)
-
         return layout
 
 
-
 # disable red circles on right click
 Config.set('input', 'mouse', 'mouse,disable_multitouch')
 # do not exit on escape
 Config.set('kivy', 'exit_on_escape', 0)
 
+# read cli
+openfile=""
+if len(sys.argv)==2:
+    openfile=sys.argv[1]
+    # check file
+    (ret,message)=filecheck.check_edit(openfile)
+    if ret<0:
+        print(message,file=sys.stderr)
+        exit(-1)
+
 # run
 if __name__ == '__main__':
-    Jam_app(openfile=openfile,lattice=lattice).run()
+    Jam_app(openfile=openfile).run()

src/jam.kv

@@ -1,5 +1,19 @@
 #: kivy 2.0.0
 
+# Copyright 2021-2023 Ian Jauslin
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 <Status_bar>:
   canvas.before:
     Color:

src/lattice.py

@@ -1,60 +0,0 @@
-from point import Point
-
-# parent class of all lattices
-class Lattice():
-    def __init__(self,**kwargs):
-        self.type=kwargs.get("type","")
-
-    # lattice point nearest to point
-    # overwrite in subclasses
-    def nearest(self,point):
-        return point
-
-    # delta to nearest point
-    def nearest_delta(self,point):
-        return self.nearest(point)-point
-
-    # draw lattice
-    # overwrite in subclasses
-    def draw(self,painter):
-        return
-
-    # return the lattice according to a specification
-    def new(spec):
-        specs=spec.split(":")
-        # check type of lattice
-        if specs[0]=="square":
-            return Square_lattice.new_square(specs[1:],spec)
-        else:
-            return(None,"error: unrecognized lattice type: '"+specs[0]+"'")
-
-
-# square lattice
-class Square_lattice(Lattice):
-    def __init__(self,**kwargs):
-
-        self.spacing=kwargs.get("spacing",1.)
-
-        super(Square_lattice,self).__init__(**kwargs,type="square")
-
-    # lattice point nearest to point
-    def nearest(self,point):
-        return Point(round(point.x/self.spacing)*self.spacing,round(point.y/self.spacing)*self.spacing)
-
-    # draw
-    def draw(self,painter):
-        painter.draw_grid(Point(self.spacing/2,self.spacing/2),self.spacing)
-
-    # return the lattice according to a specification
-    def new_square(specs,spec):
-        # no optional args
-        if len(specs)==0:
-            return (Square_lattice(),"")
-        if len(specs)>1:
-            return (None,"error: '"+spec+"' is not a valid specification for the square lattice: should be 'square[:spacing]'")
-        try:
-            spacing=float(specs[0])
-            return (Square_lattice(spacing=spacing),"")
-        except:
-            return (None,"error: '"+spec+"' is not a valid specification for the square lattice: should be 'square[:spacing]'")
-        

src/painter.py

@@ -1,3 +1,17 @@
+# Copyright 2021-2023 Ian Jauslin
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 import sys
 import math
 from kivy.uix.widget import Widget
@@ -7,7 +21,6 @@ from kivy.graphics import Color,Line
 from point import Point
 from polyomino import Cross
 from polyomino import Square_element
-from lattice import Square_lattice
 
 from tools import remove_fromlist
 
@@ -21,9 +34,6 @@ class Painter(Widget):
         # list of particles
         self.particles=[]
 
-        # underlying lattice
-        self.lattice=None
-
         # particle under mouse
         self.undermouse=None
 
@@ -51,29 +61,12 @@ class Painter(Widget):
         self.keyboard = Window.request_keyboard(None,self,"text")
         self.keyboard.bind(on_key_down=self.on_key_down,on_key_up=self.on_key_up,on_textinput=self.on_textinput)
 
-        # redraw on resize
-        self.bind(size=lambda obj,value: self.draw())
-
     
     def reset(self):
         self.particles=[]
         self.undermouse=None
         self.draw()
 
-    # set lattice
-    def set_lattice(self,lattice):
-        self.lattice=lattice
-
-        # draw
-        self.draw()
-
-        # snap all existing particles to grid
-        for particle in self.particles:
-            delta=self.lattice.nearest_delta(particle.squares[0].pos)
-            if not self.check_interaction_any(particle,delta):
-                particle.move(delta)
-
-
     # convert logical coordinates (normalized and centered) to the ones that are plotted
     def pos_tocoord_x(self,x):
         return self.width/2+x*Square_element.size
@@ -95,10 +88,6 @@ class Painter(Widget):
             for particle in self.particles:
                 particle.draw(self)
 
-            # draw lattice
-            if self.lattice!=None:
-                self.lattice.draw(self)
-
             # draw grids
             for particle in self.particles:
                 if particle.grid>0:
@@ -112,30 +101,17 @@ class Painter(Widget):
         # height offset due to status bar and command prompt
         height_offset=self.app.status_bar.height+self.app.command_prompt.height
         # vertical lines
-        # lines right of pos
+        # offest wrt 0
-        xx=pos.x+mesh/2
+        offset=(pos.x-0.5)%mesh
-        while self.pos_tocoord_x(xx)<self.width:
+        for i in range(math.floor((self.width/Square_element.size-offset)/mesh)+1):
             Color(1,1,1)
-            Line(points=(self.pos_tocoord_x(xx),height_offset,self.pos_tocoord_x(xx),self.height+height_offset))
+            Line(points=((i*mesh+offset)*Square_element.size,height_offset,(i*mesh+offset)*Square_element.size,self.height+height_offset))
-            xx+=mesh
+        # horizontal lines
-        # lines left of pos
+        # offset wrt 0
-        xx=pos.x-mesh/2
+        offset=(pos.y-0.5)%1-height_offset/Square_element.size
-        while self.pos_tocoord_x(xx)>0:
+        for i in range(math.floor((self.height/Square_element.size-offset)/mesh)+1):
             Color(1,1,1)
-            Line(points=(self.pos_tocoord_x(xx),height_offset,self.pos_tocoord_x(xx),self.height+height_offset))
+            Line(points=(0,(i*mesh+offset)*Square_element.size+height_offset,self.width,(i*mesh+offset)*Square_element.size+height_offset))
-            xx-=mesh
-        # lines above pos
-        yy=pos.y+mesh/2
-        while self.pos_tocoord_y(yy)<self.height:
-            Color(1,1,1)
-            Line(points=(0,self.pos_tocoord_y(yy),self.width,self.pos_tocoord_y(yy)))
-            yy+=mesh
-        # lines below pos
-        yy=pos.y-mesh/2
-        while self.pos_tocoord_y(yy)>0:
-            Color(1,1,1)
-            Line(points=(0,self.pos_tocoord_y(yy),self.width,self.pos_tocoord_y(yy)))
-            yy-=mesh
 
 
     # respond to keyboard
@@ -213,10 +189,6 @@ class Painter(Widget):
             # create new cross
             if touch.button=="right":
                 new=Cross(touchx,touchy)
-                # snap to lattice
-                if self.lattice!=None:
-                    new.move(self.lattice.nearest_delta(new.squares[0].pos))
-
                 if not self.check_interaction_any(new,Point(0,0)):
                     # add to list
                     self.particles.append(new)
@@ -279,30 +251,18 @@ class Painter(Widget):
 
     # respond to drag
     def on_touch_move(self,touch):
+        # convert to logical
+        touchx=self.coord_topos_x(touch.x)
+        touchy=self.coord_topos_y(touch.y)
 
         # 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)
-
             # 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.squares[0].pos),0)
-
+                for particle in self.selected:
-                # snap to lattice
+                    particle.move(delta)
-                if self.lattice!=None:
-                    delta=self.lattice.nearest(delta)
-                    # check that the move is possible (which is not guaranteed after snapping to lattice)
-                    if not self.check_interaction_unselected_list(self.selected,delta):
-                        for particle in self.selected:
-                            particle.move(delta)
-
-                # no lattice, move is guaranteed to be acceptable
-                else:
-                    for particle in self.selected:
-                        particle.move(delta)
 
                 # redraw
                 self.draw()

src/point.py

@@ -1,3 +1,17 @@
+# Copyright 2021-2023 Ian Jauslin
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 import math
 
 # point in two dimensions

src/polyomino.py

@@ -1,3 +1,17 @@
+# Copyright 2021-2023 Ian Jauslin
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 import math
 import sys
 from kivy.graphics import Color,Line,Rectangle
@@ -8,7 +22,7 @@ from tools import isint_nonzero,sgn,in_interval
 # parent class of all polyominos
 class Polyomino():
     def __init__(self,**kwargs):
-        # square elements that make up the polyomino 
+        # square elements that maje up the polyomino 
         self.squares=kwargs.get("squares",[])
 
         self.color=kwargs.get("color",(0,0,1))