commit 67ce825fc1562ffda30c6796f81dda62aa9b57a8
parent 0897e6b49e94a89f4e4c30b08b1929133a7409b6
Author: vh <vetle.haflan@gmail.com>
Date: Thu, 22 Nov 2018 01:31:30 +0100
Start implementing arrows
Diffstat:
| M | a2svg.py | | | 75 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- |
1 file changed, 73 insertions(+), 2 deletions(-)
diff --git a/a2svg.py b/a2svg.py
@@ -68,9 +68,10 @@ class Figure:
new_elements = self.polyline(y, x, "FIND")
elif symbol == '^':
new_elements = self.polyline(y, x, "DOWN")
- #new_elements += [Arrow()]
+ new_elements.append(Arrow('^', (y, x)))
elif symbol == '<':
new_elements = self.polyline(y, x, "RIGHT")
+ new_elements.append(Arrow('<', (y, x)))
if new_elements:
self._elements += new_elements
@@ -140,6 +141,7 @@ class Figure:
x_test -= 1
if self.__arrow_in(y, x_test):
line_list.append(Line((y, x_test - 1), (y, x)))
+ line_list.append(Arrow('<', (y, x_test)))
self._processed[y][x_test]
elif self.__joint_in(y, x_test):
line_list.append(Line((y, x_test), (y, x)))
@@ -159,6 +161,7 @@ class Figure:
x_test += 1
if self.__arrow_in(y, x_test):
line_list.append(Line((y, x), (y, x_test + 1)))
+ line_list.append(Arrow('>', (y, x_test)))
elif self.__joint_in(y, x_test):
line_list.append(Line((y, x), (y, x_test)))
else:
@@ -178,6 +181,7 @@ class Figure:
y_test += 1
if self.__arrow_in(y_test, x):
line_list.append(Line((y, x), (y_test+1, x)))
+ line_list.append(Arrow('v', (y_test, x)))
elif self.__joint_in(y_test, x):
line_list.append(Line((y, x), (y_test, x)))
else:
@@ -383,10 +387,77 @@ class Line:
return text
+# TODO : Replace all of the string representations and comparison with 'enums'
class Arrow():
- pass
+ def __init__(self, symbol, position):
+ self._y, self._x = position
+ self._direction = symbol
+ self._dir_func_map = {
+ 'v': self.__gen_coords_down,
+ '^': self.__gen_coords_up,
+ '<': self.__gen_coords_left,
+ '>': self.__gen_coords_right,
+ }
+
+ # TODO : These *can* be replaced by class methods that take x and y as
+ # arguments instead? Not sure if one is better than the other...
+ # More important TODO : Use some brain power to make this prettier (by
+ # rotating arrows and setting an offset or something, instead of copy-pasting
+ # functions and changing 'manually')
+ def __gen_coords_down(self):
+ return [
+ x_scaling * self._x * font_size,
+ (self._y+1) * font_size - 1,
+ x_scaling * (self._x-1) * font_size,
+ self._y * font_size,
+ x_scaling * (self._x+1) * font_size,
+ self._y * font_size ]
+
+ def __gen_coords_up(self):
+ return [
+ x_scaling * self._x * font_size,
+ (self._y+1) * font_size - 1,
+ x_scaling * (self._x-1) * font_size,
+ self._y * font_size,
+ x_scaling * (self._x+1) * font_size,
+ self._y * font_size ]
+
+ def __gen_coords_left(self):
+ return [
+ x_scaling * self._x * font_size,
+ (self._y+1) * font_size - 1,
+ x_scaling * (self._x-1) * font_size,
+ self._y * font_size,
+ x_scaling * (self._x+1) * font_size,
+ self._y * font_size ]
+
+ def __gen_coords_right(self):
+ return [
+ x_scaling * self._x * font_size,
+ (self._y+1) * font_size - 1,
+ x_scaling * (self._x-1) * font_size,
+ self._y * font_size,
+ x_scaling * (self._x+1) * font_size,
+ self._y * font_size ]
+ def draw(self):
+ try:
+ svg_text = "\t<polygon points=\"{},{} {},{} {},{}\" ".format(
+ *self._dir_func_map[self._direction]())
+ svg_text += "style=\"stroke:rgb(0,0,0);stroke-width:1\" />"
+ return svg_text
+ except Exception as e:
+ print("Invalid arrow detected")
+ print(e)
+ return ""
+ def __str__(self):
+ text = "Arrow, {}, ({}, {})\n".format(
+ self._direction,
+ self._x,
+ self._y,
+ )
+ return text
### TESTING ###
