commit 4b16dad0e1c93230946c95472b34989affd51c60
parent f916df6641aaf6b8629daf6c0116331a21882169
Author: bkopf <vetlehaf@stud.ntnu.no>
Date: Sun, 18 Nov 2018 00:40:10 +0100
Improve scaling on x-axis
Because ASCII characters have a larger height than width, there
needs to be a scaling constant to compensate. This commit makes
sure that all elements are horizontally scaled according to the
same constant. x_scaling = 0.5 seems to be a good choice.
Diffstat:
| M | a2svg.py | | | 13 | +++++++------ |
| M | ascii.txt | | | 4 | ++-- |
| M | showcase.svg | | | 94 | ++++++++++++++++++++++++++++++++++++++++---------------------------------------- |
3 files changed, 56 insertions(+), 55 deletions(-)
diff --git a/a2svg.py b/a2svg.py
@@ -1,6 +1,7 @@
#!/bin/python
font_size = 12
+x_scaling = 0.5
class Figure:
@@ -309,18 +310,18 @@ class Rectangle:
def draw(self):
svg_text = "\t<rect x=\"{}\" y=\"{}\" ".format(
- self._x_start * font_size,
+ x_scaling * self._x_start * font_size,
self._y_start * font_size)
rect_width = (self._x_stop - self._x_start) * font_size
rect_height = (self._y_stop - self._y_start) * font_size
svg_text += "width=\"{}\" height=\"{}\" ".format(
- rect_width/2,
+ x_scaling * rect_width,
rect_height)
svg_text += "fill=\"white\" stroke=\"black\"></rect>\n"
for ln, line in enumerate(self._text_lines):
svg_text += "\t<text x=\"{}\" y=\"{}\" font-family=\"Arial\" font-size=\"{}\" fill=\"black\">{}</text>\n".format(
- self._x_start*font_size+15,
+ x_scaling * self._x_start*font_size+15,
(self._y_start+ln)*font_size+15,
font_size,
line
@@ -369,9 +370,9 @@ class Line:
def draw(self):
svg_text = "\t<line x1=\"{}\" y1=\"{}\" x2=\"{}\" y2=\"{}\" ".format(
- self._x_start * font_size,
+ x_scaling * self._x_start * font_size,
self._y_start * font_size,
- self._x_stop * font_size,
+ x_scaling * self._x_stop * font_size,
self._y_stop * font_size)
svg_text += "style=\"stroke:rgb(0,0,0);stroke-width:1\" />"
return svg_text
@@ -400,7 +401,7 @@ drawing.process_all()
for el in drawing.get_elements():
print(el)
-svg_text = "<svg xmlns=\"http://www.w3.org/2000/svg\">\n"
+svg_text = "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox = \"0 0 500 500\">\n"
svg_text += drawing.get_svg()
svg_text += "</svg>"
diff --git a/ascii.txt b/ascii.txt
@@ -7,8 +7,8 @@
+----------------+ |
|
|
- +-----------+---------+
- +----->| unexpected |<-+
+ +---------------------+
+ +----->| A BLOCK |<-+
| +---------------------+ |
| v
+-------+--------+ +----------------------+
diff --git a/showcase.svg b/showcase.svg
@@ -1,48 +1,48 @@
-<svg xmlns="http://www.w3.org/2000/svg">
- <rect x="48" y="36" width="102.0" height="36" fill="white" stroke="black"></rect>
- <text x="63" y="51" font-family="Arial" font-size="12" fill="black"> </text>
- <text x="63" y="63" font-family="Arial" font-size="12" fill="black"> </text>
-
- <rect x="180" y="108" width="132.0" height="24" fill="white" stroke="black"></rect>
- <text x="195" y="123" font-family="Arial" font-size="12" fill="black"> unexpected </text>
-
- <rect x="0" y="156" width="102.0" height="24" fill="white" stroke="black"></rect>
- <text x="15" y="171" font-family="Arial" font-size="12" fill="black"> Block 1 </text>
-
- <rect x="228" y="156" width="138.0" height="24" fill="white" stroke="black"></rect>
- <text x="243" y="171" font-family="Arial" font-size="12" fill="black"> Additional block </text>
-
- <rect x="228" y="204" width="138.0" height="24" fill="white" stroke="black"></rect>
- <text x="243" y="219" font-family="Arial" font-size="12" fill="black"> Second block </text>
-
- <rect x="228" y="228" width="138.0" height="120" fill="white" stroke="black"></rect>
- <text x="243" y="243" font-family="Arial" font-size="12" fill="black"> </text>
- <text x="243" y="255" font-family="Arial" font-size="12" fill="black"> - List of stuff here </text>
- <text x="243" y="267" font-family="Arial" font-size="12" fill="black"> - Good stuff too, </text>
- <text x="243" y="279" font-family="Arial" font-size="12" fill="black"> I'd say </text>
- <text x="243" y="291" font-family="Arial" font-size="12" fill="black"> </text>
- <text x="243" y="303" font-family="Arial" font-size="12" fill="black"> </text>
- <text x="243" y="315" font-family="Arial" font-size="12" fill="black"> </text>
- <text x="243" y="327" font-family="Arial" font-size="12" fill="black"> </text>
- <text x="243" y="339" font-family="Arial" font-size="12" fill="black"> </text>
-
- <rect x="0" y="396" width="144.0" height="24" fill="white" stroke="black"></rect>
- <text x="15" y="411" font-family="Arial" font-size="12" fill="black"> SEC 1 </text>
-
- <rect x="0" y="420" width="144.0" height="24" fill="white" stroke="black"></rect>
- <text x="15" y="435" font-family="Arial" font-size="12" fill="black"> SEC 2 </text>
-
- <rect x="0" y="444" width="144.0" height="24" fill="white" stroke="black"></rect>
- <text x="15" y="459" font-family="Arial" font-size="12" fill="black"> SEC 3 </text>
-
- <line x1="276" y1="48" x2="324" y2="48" style="stroke:rgb(0,0,0);stroke-width:1" />
- <line x1="324" y1="48" x2="324" y2="108" style="stroke:rgb(0,0,0);stroke-width:1" />
- <line x1="96" y1="120" x2="96" y2="156" style="stroke:rgb(0,0,0);stroke-width:1" />
- <line x1="96" y1="120" x2="168" y2="120" style="stroke:rgb(0,0,0);stroke-width:1" />
- <line x1="468" y1="120" x2="480" y2="120" style="stroke:rgb(0,0,0);stroke-width:1" />
- <line x1="480" y1="120" x2="480" y2="144" style="stroke:rgb(0,0,0);stroke-width:1" />
- <line x1="504" y1="120" x2="480" y2="120" style="stroke:rgb(0,0,0);stroke-width:1" />
- <line x1="96" y1="192" x2="96" y2="216" style="stroke:rgb(0,0,0);stroke-width:1" />
- <line x1="96" y1="216" x2="96" y2="384" style="stroke:rgb(0,0,0);stroke-width:1" />
- <line x1="96" y1="216" x2="216" y2="216" style="stroke:rgb(0,0,0);stroke-width:1" />
+<svg xmlns="http://www.w3.org/2000/svg" viewBox = "0 0 500 500">
+ <rect x="24.0" y="36" width="102.0" height="36" fill="white" stroke="black"></rect>
+ <text x="39.0" y="51" font-family="Arial" font-size="12" fill="black"> </text>
+ <text x="39.0" y="63" font-family="Arial" font-size="12" fill="black"> </text>
+
+ <rect x="90.0" y="108" width="132.0" height="24" fill="white" stroke="black"></rect>
+ <text x="105.0" y="123" font-family="Arial" font-size="12" fill="black"> A BLOCK </text>
+
+ <rect x="0.0" y="156" width="102.0" height="24" fill="white" stroke="black"></rect>
+ <text x="15.0" y="171" font-family="Arial" font-size="12" fill="black"> Block 1 </text>
+
+ <rect x="114.0" y="156" width="138.0" height="24" fill="white" stroke="black"></rect>
+ <text x="129.0" y="171" font-family="Arial" font-size="12" fill="black"> Additional block </text>
+
+ <rect x="114.0" y="204" width="138.0" height="24" fill="white" stroke="black"></rect>
+ <text x="129.0" y="219" font-family="Arial" font-size="12" fill="black"> Second block </text>
+
+ <rect x="114.0" y="228" width="138.0" height="120" fill="white" stroke="black"></rect>
+ <text x="129.0" y="243" font-family="Arial" font-size="12" fill="black"> </text>
+ <text x="129.0" y="255" font-family="Arial" font-size="12" fill="black"> - List of stuff here </text>
+ <text x="129.0" y="267" font-family="Arial" font-size="12" fill="black"> - Good stuff too, </text>
+ <text x="129.0" y="279" font-family="Arial" font-size="12" fill="black"> I'd say </text>
+ <text x="129.0" y="291" font-family="Arial" font-size="12" fill="black"> </text>
+ <text x="129.0" y="303" font-family="Arial" font-size="12" fill="black"> </text>
+ <text x="129.0" y="315" font-family="Arial" font-size="12" fill="black"> </text>
+ <text x="129.0" y="327" font-family="Arial" font-size="12" fill="black"> </text>
+ <text x="129.0" y="339" font-family="Arial" font-size="12" fill="black"> </text>
+
+ <rect x="0.0" y="396" width="144.0" height="24" fill="white" stroke="black"></rect>
+ <text x="15.0" y="411" font-family="Arial" font-size="12" fill="black"> SEC 1 </text>
+
+ <rect x="0.0" y="420" width="144.0" height="24" fill="white" stroke="black"></rect>
+ <text x="15.0" y="435" font-family="Arial" font-size="12" fill="black"> SEC 2 </text>
+
+ <rect x="0.0" y="444" width="144.0" height="24" fill="white" stroke="black"></rect>
+ <text x="15.0" y="459" font-family="Arial" font-size="12" fill="black"> SEC 3 </text>
+
+ <line x1="138.0" y1="48" x2="162.0" y2="48" style="stroke:rgb(0,0,0);stroke-width:1" />
+ <line x1="162.0" y1="48" x2="162.0" y2="96" style="stroke:rgb(0,0,0);stroke-width:1" />
+ <line x1="48.0" y1="120" x2="48.0" y2="156" style="stroke:rgb(0,0,0);stroke-width:1" />
+ <line x1="48.0" y1="120" x2="84.0" y2="120" style="stroke:rgb(0,0,0);stroke-width:1" />
+ <line x1="234.0" y1="120" x2="240.0" y2="120" style="stroke:rgb(0,0,0);stroke-width:1" />
+ <line x1="240.0" y1="120" x2="240.0" y2="144" style="stroke:rgb(0,0,0);stroke-width:1" />
+ <line x1="252.0" y1="120" x2="240.0" y2="120" style="stroke:rgb(0,0,0);stroke-width:1" />
+ <line x1="48.0" y1="192" x2="48.0" y2="216" style="stroke:rgb(0,0,0);stroke-width:1" />
+ <line x1="48.0" y1="216" x2="48.0" y2="384" style="stroke:rgb(0,0,0);stroke-width:1" />
+ <line x1="48.0" y1="216" x2="108.0" y2="216" style="stroke:rgb(0,0,0);stroke-width:1" />
</svg>
\ No newline at end of file
