tetraflexagon_diagram: add a function to calculate the tile offset in a square

[flexagon-toolkit.git] / src / flexagon / tetraflexagon_diagram.py

diff --git a/src/flexagon/tetraflexagon_diagram.py b/src/flexagon/tetraflexagon_diagram.py
index d64ce32..ab3da17 100755 (executable)
--- a/src/flexagon/tetraflexagon_diagram.py
+++ b/src/flexagon/tetraflexagon_diagram.py
@@ -54,9 +54,8 @@ class TetraflexagonDiagram(object):
 
             for tile in square.tiles:
                 # offset by 1 or -1 times the tile radius
-                tile_cx = cx + self.tile_radius * ((tile.index % 2) * 2 - 1)
-                tile_cy = cy + self.tile_radius * ((tile.index > 1) * 2 - 1)
-                self.tiles_centers[square.index][tile.index] = (tile_cx, tile_cy)
+                tile_xoffset, tile_yoffset = tile.calc_offset_in_square(self.tile_side)
+                self.tiles_centers[square.index][tile.index] = (cx + tile_xoffset, cy + tile_yoffset)
 
     def get_square_center(self, square):
         return self.squares_centers[square.index]
@@ -94,7 +93,9 @@ class TetraflexagonDiagram(object):
         side = self.tile_side
         color = self.squares_color_map[tile.square.index]
 
-        self.backend.draw_rect_from_center(cx, cy, side, side, theta, color)
+        self.backend.draw_rect_from_center(cx, cy, side, side, theta,
+                                           stroke_color=color,
+                                           fill_color=None)
 
         corners_labels = "ABC"
         corner_text = corners_labels[tile.square.index] + str(tile.index + 1)