commit 5787963ed65a3d0a47b119f82ff26fbeb44f5bfc
parent 36f296babe054920b174b5db07ecb10531122d20
Author: bkopf <vetlehaf@stud.ntnu.no>
Date: Sat, 17 Nov 2018 18:48:30 +0100
(Temporarily?) make rectangles be detected before lines
This fixes the problem with parts of rectangles being detected as
lines. Ideally, the 'processed' array of Figure should make sure this
doesn't happen. In other words, some work is required here.
Diffstat:
| M | a2svg.py | | | 34 | +++++++++++++++++++++++++--------- |
1 file changed, 25 insertions(+), 9 deletions(-)
diff --git a/a2svg.py b/a2svg.py
@@ -2,6 +2,7 @@
font_size = 12
+
class Figure:
def __init__(self, ascii_text):
self._elements = []
@@ -31,6 +32,15 @@ class Figure:
self._figarray[y][x] = cell
def process_all(self):
+ # Process rectangles first
+ for y in range(self._height):
+ for x in range(self._width):
+ if not self._processed[y][x]:
+ rects = self.rectangle(y, x)
+ if rects:
+ self._elements += rects
+
+ # then process line. (VERY TEMPORARY SOLUTION)
for y in range(self._height):
for x in range(self._width):
if not self._processed[y][x]:
@@ -104,21 +114,22 @@ class Figure:
crossing lines well, I think. (So TODO : refactor name)
"""
def polyline(self, y, x, direction):
+ # TODO : Deal with arrows. Only one arrow is allowed for each direction, so this shouldn't be too hard
# Find lines
line_list = []
if direction == "FIND":
if self.__has_char(y+1, x, '|'):
- line_list += self.polyline(y+1, x, "DOWN")
+ line_list += self.polyline(y, x, "DOWN")
if self.__has_char(y-1, x, '|'):
- line_list += self.polyline(y+1, x, "UP")
+ line_list += self.polyline(y, x, "UP")
if self.__has_char(y, x-1, '-'):
- line_list += self.polyline(y, x-1, "LEFT")
+ line_list += self.polyline(y, x, "LEFT")
if self.__has_char(y, x+1, '-'):
- line_list += self.polyline(y, x+1, "RIGHT")
+ line_list += self.polyline(y, x, "RIGHT")
return line_list
elif direction == "LEFT":
- x_test = x
+ x_test = x + 1
while self.__has_char(y, x_test, '-'):
self._processed[y][x_test] = True
x_test -= 1
@@ -128,7 +139,7 @@ class Figure:
line_list.append(Line((y, x_test+1), (y, x)))
x = x_test
elif direction == "RIGHT":
- x_test = x
+ x_test = x + 1
while self.__has_char(y, x_test, '-'):
self._processed[y][x_test] = True
x_test += 1
@@ -138,7 +149,7 @@ class Figure:
line_list.append(Line((y, x), (y, x_test + 1)))
x = x_test
elif direction == "UP":
- y_test = y
+ y_test = y + 1
while self.__has_char(y_test, x, '|'):
self._processed[y_test][x] = True
y_test -= 1
@@ -148,7 +159,7 @@ class Figure:
line_list.append(Line((y_test+1, x), (y, x)))
y = y_test
elif direction == "DOWN":
- y_test = y
+ y_test = y + 1
while self.__has_char(y_test, x, '|'):
self._processed[y_test][x] = True
y_test += 1
@@ -270,6 +281,7 @@ class Figure:
svg_text += el.draw() + "\n"
return svg_text
+
class Rectangle:
def __init__(self, pos_start, pos_stop):
(self._x_start, self._y_start) = pos_start
@@ -316,9 +328,11 @@ class Rectangle:
return svg_text
+
class Text:
pass
+
# Not sure if Joint is useful in this code
class Joint:
def __init__(self, position):
@@ -342,7 +356,8 @@ class Joint:
def get_connected(self):
return self._connected
-# The best alternative here is to use a *polyline*
+
+# ~~The best alternative here is to use a *polyline*~~ nah
# https://www.w3schools.com/graphics/svg_polyline.asp
class Line:
def __init__(self, pos_start, pos_stop):
@@ -370,6 +385,7 @@ class Line:
)
return text
+
class Arrow():
pass
