Merge pull request #1 from naturalneuralnet/dev-branch

adding + signs to the title corners

Author: naturalneuralnet

.gitignore

@@ -1,3 +1,4 @@
+.history
 *.pyc
 env
 *.txt

bashplotlib/scatterplot.py

@@ -28,11 +28,11 @@ 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, title_align):
  plotted = set()
 
  if title:
- print(box_text(title, 2 * (len(get_scale(xs, False, size)) + 1)))
+ print(box_text(title, 2 * (len(get_scale(xs, False, size)) + 1), title_align))
 
  print("-" * (2 * (len(get_scale(xs, False, size)) + 2)))
  for y in get_scale(ys, True, size):
@@ -49,7 +49,7 @@ def _plot_scatter(xs, ys, size, pch, colour, title, cs):
  print(" |")
  print("-" * (2 * (len(get_scale(xs, False, size)) + 2)))
 
-def plot_scatter(f, xs, ys, size, pch, colour, title):
+def plot_scatter(f, xs, ys, size, pch, colour, title, title_align):
  """
  Form a complex number.
 
@@ -81,7 +81,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, title_align)
 
 
 

bashplotlib/utils/helpers.py

@@ -76,11 +76,21 @@ def abbreviate(labels, rfill=' '):
  return abbrev
 
 
-def box_text(text, width, offset=0):
+def box_text(text, width, title_align, offset=0 ):
  """
  Return text inside an ascii textbox
  """
- box = " " * offset + "-" * (width+2) + "\n"
- box += " " * offset + "|" + text.center(width) + "|" + "\n"
- box += " " * offset + "-" * (width+2)
+ 
+ aligned_text = text.center(width)
+ if title_align == "center":
+ aligned_text = text.center(width)
+ elif title_align == "left":
+ aligned_text = text.ljust(width)
+ elif title_align == "right":
+ aligned_text = text.rjust(width)
+ 
+ 
+ box = " " * offset + "+" + "-" * (width) + "+" + "\n"
+ box += " " * offset + "|" + aligned_text + "|" + "\n"
+ box += " " * offset + "+" + "-" * (width) + "+" 
  return box