added axis titles, made graphs prettier

cadyxia · cadyxia · commit 6418e7f18626 · 2025-09-11T17:19:11.000-07:00
diff --git a/bashplotlib/scatterplot.py b/bashplotlib/scatterplot.py
@@ -28,15 +28,19 @@ def get_scale(series, is_y=False, steps=20):
     return scaled_series
 
 
-def _plot_scatter(xs, ys, size, pch, colour, title, cs):
+def _plot_scatter(xs, ys, size, pch, colour, title, cs, x_title, y_title):
     plotted = set()
 
     if title:
         print(box_text(title, 2 * (len(get_scale(xs, False, size)) + 1)))
 
-    print("-" * (2 * (len(get_scale(xs, False, size)) + 2)))
+    print("  +" + "-" * (2 * (len(get_scale(xs, False, size)) + 2) - 2) + "+")
     for y in get_scale(ys, True, size):
-        print("|", end=' ')
+        if y_title == "":
+            print("  |", end=' ')
+        else:
+            print(y_title[:1], "|", end=' ')
+            y_title = y_title[1:]
         for x in get_scale(xs, False, size):
             point = " "
             for (i, (xp, yp)) in enumerate(zip(xs, ys)):
@@ -47,9 +51,10 @@ def _plot_scatter(xs, ys, size, pch, colour, title, cs):
                         colour = cs[i]
             printcolour(point + " ", True, colour)
         print(" |")
-    print("-" * (2 * (len(get_scale(xs, False, size)) + 2)))
+    print("  +" + "-" * (2 * (len(get_scale(xs, False, size)) + 2) - 2) + "+")
+    print("  ", x_title)
 
-def plot_scatter(f, xs, ys, size, pch, colour, title):
+def plot_scatter(f, xs, ys, size, pch, colour, title, x_title, y_title):
     """
     Form a complex number.
 
@@ -81,7 +86,7 @@ def plot_scatter(f, xs, ys, size, pch, colour, title):
         with open(ys) as fh:
             ys = [float(str(row).strip()) for row in fh]
 
-    _plot_scatter(xs, ys, size, pch, colour, title, cs)
+    _plot_scatter(xs, ys, size, pch, colour, title, cs, x_title, y_title)
     
 
 
@@ -97,14 +102,16 @@ def main():
     parser.add_option('-p', '--pch', help='shape of point', default="x", dest='pch')
     parser.add_option('-c', '--colour', help='colour of the plot (%s)' %
                       colour_help, default='default', dest='colour')
+    parser.add_option('-xt', '--xtitle', help='title for the x-axis', default="y axis", dest="x_title")
+    parser.add_option('-yt', '--ytitle', help='title for the y-axis', default="x axis", dest="y_title")
 
     opts, args = parser.parse_args()
 
     if opts.f is None and (opts.x is None or opts.y is None):
         opts.f = sys.stdin.readlines()
 
     if opts.f or (opts.x and opts.y):
-        plot_scatter(opts.f, opts.x, opts.y, opts.size, opts.pch, opts.colour, opts.t)
+        plot_scatter(opts.f, opts.x, opts.y, opts.size, opts.pch, opts.colour, opts.t, opts.x_title, opts.y_title)
     else:
         print("nothing to plot!")
 
diff --git a/bashplotlib/utils/helpers.py b/bashplotlib/utils/helpers.py
@@ -80,7 +80,7 @@ def box_text(text, width, offset=0):
     """
     Return text inside an ascii textbox
     """
-    box = " " * offset + "+" + "-" * (width) + "+\n"
-    box += " " * offset + "|" + text.center(width) + "|" + "\n"
-    box += " " * offset + "+" + "-" * (width) + "+"
+    box = " " * offset + "  +" + "-" * (width) + "+\n"
+    box += " " * offset + "  |" + text.center(width) + "|" + "\n"
+    box += " " * offset + "  +" + "-" * (width) + "+"
     return box
diff --git a/scratch.py b/scratch.py
@@ -7,6 +7,8 @@
 char = 'x'
 color = 'default'
 title = 'My Test Graph'
+x_title = 'My X Axis'
+y_title = 'My Y Axis'
 
 plot_scatter(
     None,
@@ -15,4 +17,6 @@
     width,
     char,
     color,
-    title)
+    title,
+    x_title,
+    y_title)
