Skip to content

Commit

Permalink
Merge pull request #7 from jdranczewski/dev - v1.03.1
Browse files Browse the repository at this point in the history
v1.03.1
  • Loading branch information
jdranczewski authored Sep 20, 2018
2 parents 0e9238c + 11e84ac commit 649b665
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 4 additions & 0 deletions magic2/triangulate.py
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,10 @@ def add_point(self, triangle, neighbour, op1, op2):
n2.vertices[
sp.argwhere(n2.vertices == tv[(op1+2) % 3])
] = new_index
triangle.vert_coordinates = self.points[triangle.vertices]
neighbour.vert_coordinates = self.points[neighbour.vertices]
t2.vert_coordinates = self.points[t2.vertices]
n2.vert_coordinates = self.points[n2.vertices]
# Finally mark the triangle as sloped
triangle.flat = False

Expand Down
2 changes: 1 addition & 1 deletion magic2gui/callbacks.py
Original file line number Diff line number Diff line change
Expand Up @@ -943,7 +943,7 @@ def body(self, master):
logo = Tk.Label(master, image=photo)
logo.photo = photo
logo.pack()
label = Tk.Label(master, text="This software was created by Jakub Dranczewski during a UROP in 2018.\nIt is based on concepts from Magic, which was created by George Swadling.\n\nYou can contact me on [email protected] or (as I inevitably loose either the whole email or the 17) [email protected]\n\nv1.03")
label = Tk.Label(master, text="This software was created by Jakub Dranczewski during a UROP in 2018.\nIt is based on concepts from Magic, which was created by George Swadling.\n\nYou can contact me on [email protected] or (as I inevitably loose either the whole email or the 17) [email protected]\n\nv1.03.1")
label.pack()

def buttonbox(self):
Expand Down

0 comments on commit 649b665

Please sign in to comment.