commit 83d903c23bd3ecccf3ec836b5fae05169342dfce
parent bf9c292fe56a683516e53a7fa77d7d42e9bda5a6
Author: bkopf <vetlehaf@stud.ntnu.no>
Date: Tue, 20 Nov 2018 22:23:11 +0100
Fix some copy-paste errors in polyline()
Diffstat:
| M | a2svg.py | | | 25 | ++----------------------- |
| M | ascii.txt | | | 30 | +++++++++++++++--------------- |
2 files changed, 17 insertions(+), 38 deletions(-)
diff --git a/a2svg.py b/a2svg.py
@@ -66,11 +66,6 @@ class Figure:
# If not a rectangle, it must be a line joint
else:
new_elements = self.polyline(y, x, "FIND")
- # Finding lines without joints nor arrows should not be possible
- #elif symbol == '-':
- # new_elements = self.polyline(y, x, "RIGHT")
- #elif symbol == '|':
- # new_elements = self.polyline(y, x, "DOWN")
elif symbol == '^':
new_elements = self.polyline(y, x, "DOWN")
#new_elements += [Arrow()]
@@ -145,9 +140,9 @@ class Figure:
x_test -= 1
if self.__arrow_in(y, x_test):
line_list.append(Line((y, x_test - 1), (y, x)))
- self._processed[y][x_test - 1]
+ self._processed[y][x_test]
elif self.__joint_in(y, x_test):
- line_list.append(Line((y, x), (y, x_test)))
+ line_list.append(Line((y, x_test), (y, x)))
self._processed[y][x_test]
else:
line_list.append(Line((y, x_test + 1), (y, x)))
@@ -170,22 +165,6 @@ class Figure:
line_list.append(Line((y, x), (y, x_test - 1)))
x = x_test
- # Up should actually never be called, as we always find line tops. TODO:
- # Remove?
- elif direction == "UP":
- print("UUUUUUP")
- y_test = y + 1
- while self.__has_char(y_test, x, '|'):
- self._processed[y_test][x] = True
- y_test -= 1
- if self.__arrow_in(y_test, x):
- line_list.append(Line((y_test-1, x), (y, x)))
- elif self.__joint_in(y_test, x):
- line_list.append(Line((y_test, x), (y, x)))
- else:
- line_list.append(Line((y_test+1, x), (y, x)))
- y = y_test
-
# WORKING MESS
elif direction == "DOWN":
y_test = y
diff --git a/ascii.txt b/ascii.txt
@@ -16,25 +16,25 @@
+-------+--------+ +----------+-----------+ | | |
| | +-------->| BIG BOX BOYY |
| +----------+-----------+ | | |
- +--------->| Second block |<---+ +--------------------+
- | +----------------------+
- | | |
- | | - List of stuff here |
- | | - Good stuff too, |
- | | I'd say |
- +--------->| |
+ +--+ +--------->| Second block +----+ +----+---------------+
+ | +-->| +----------------------+ |
+ | |<--+ | | |
+ | |<--+ | - List of stuff here | |
+ | |<--+ | - Good stuff too, |<------------------+
+ | | | | I'd say |
+ +--+ +--------->| |
| | |
| | |
| | |
| | |
| +----------------------+
|
- |
- |
-+-------+---------------+
-| SEC 1 |
-+-----------------------+
-| SEC 2 |
-+-----------------------+
-| SEC 3 |
+ | +---------------+
+ | | vert_test |
++-------+---------------+ +----++---------+
+| SEC 1 | ^||^
++-----------------------+ |v||
+| SEC 2 | +---+-++--------+
++-----------------------+ | |
+| SEC 3 | +---------------+
+-----------------------+
