assad2008
diff --git a/‎bashplotlib/hist.pyc‎
-4.26 KB b/‎bashplotlib/hist.pyc‎
-4.26 KB
diff --git a/‎bashplotlib/histogram.py‎
Lines changed: 37 additions & 4 deletions b/‎bashplotlib/histogram.py‎
Lines changed: 37 additions & 4 deletions
diff --git a/‎bashplotlib/scatter.pyc‎
-2.95 KB b/‎bashplotlib/scatter.pyc‎
-2.95 KB
diff --git a/‎bashplotlib/scatterplot.py‎
Lines changed: 4 additions & 3 deletions b/‎bashplotlib/scatterplot.py‎
Lines changed: 4 additions & 3 deletions
diff --git a/‎bashplotlib/utils/__init__.pyc‎
36 Bytes b/‎bashplotlib/utils/__init__.pyc‎
36 Bytes
diff --git a/‎bashplotlib/utils/commandhelp.pyc‎
36 Bytes b/‎bashplotlib/utils/commandhelp.pyc‎
36 Bytes
diff --git a/‎bashplotlib/utils/helpers.py‎
Lines changed: 4 additions & 5 deletions b/‎bashplotlib/utils/helpers.py‎
Lines changed: 4 additions & 5 deletions
diff --git a/‎bashplotlib/utils/helpers.pyc‎
527 Bytes b/‎bashplotlib/utils/helpers.pyc‎
527 Bytes
@@ -14,16 +14,44 @@ def calc_bins(n, min_val, max_val, h=None):
         yield b
 
 def read_numbers(numbers):
+    "read the input data in the most optimal way"
     if isinstance(numbers, list):
         for n in numbers:
+            n = str(n)
             yield float(n.strip())
     else:
         for n in open(numbers):
             yield float(n.strip())
 
+def run_demo():
+    "demo the product"
+    #plotting a histogram
+    print "plotting a basic histogram"
+    print "plot_hist('./data/exp.txt')"
+    print "hist -f ./data/exp.txt"
+    print "cat ./data/exp.txt | hist"
+    plot_hist('./data/exp.txt')
+    print "*"*80
+    #with colors
+    print "histogram with colors"
+    print "plot_hist('./data/exp.txt', colour='blue')"
+    print "hist -f ./data/exp.txt -c blue"
+    plot_hist('./data/exp.txt', colour='blue')
+    print "*"*80
+    #changing the shape of the point
+    print "changing the shape of the bars"
+    print "plot_hist('./data/exp.txt', pch='.')"
+    print "hist -f ./data/exp.txt -p ."
+    plot_hist('./data/exp.txt', pch='.')
+    print "*"*80
+    #chagning the size of the plot
+    print "chagning the size of the plot"
+    print "plot_hist('./data/exp.txt', height=35.0, bincount=40)"
+    print "hist -f ./data/exp.txt -s 35.0 -b 40"
+    plot_hist('./data/exp.txt', height=35.0, bincount=40)
+
 def plot_hist(f, height=20.0, bincount=None, pch="o", colour="white", title="", xlab=None):
     "plot a histogram given a file of numbers"
-    #first apss
     if pch is None:
         pch = "o"
 
@@ -55,7 +83,9 @@ def plot_hist(f, height=20.0, bincount=None, pch="o", colour="white", title="",
     ys.reverse()
 
     nlen = max(len(str(min_y)), len(str(max_y))) + 1
-    print title.center(len(hist) + nlen + 1)
+    
+    if title:
+        print box_text(title, len(hist)*2, nlen)
     print
     used_labs = set()
     for y in ys:
@@ -119,16 +149,19 @@ def plot_hist(f, height=20.0, bincount=None, pch="o", colour="white", title="",
     parser.add_option('-x', '--xlab', help='label bins on x-axis', default=None, action="store_true", dest='x')
     parser.add_option('-c', '--colour', help='colour of the plot (%s)' % ", ".join([c for c in bcolours.keys() if c != 'ENDC']),
                       default='white', dest='colour')
+    parser.add_option('-d', '--demo', help='run demos', action='store_true', dest='demo')
 
     (opts, args) = parser.parse_args()
 
     if opts.f is None:
         if len(args) > 0:
             opts.f = args[0]
-        else:
+        elif opts.demo is False:
             opts.f = sys.stdin.readlines()
 
-    if opts.f:
+    if opts.demo:
+        run_demo()
+    elif opts.f:
         plot_hist(opts.f, opts.h, opts.b, opts.p, opts.colour, opts.t, opts.x)
     else:
         print "nothing to plot!"
 
@@ -28,14 +28,15 @@ def plot_scatter(f, xs, ys, size, pch, colour, title):
         xs = [i[0] for i in data]
         ys = [i[1] for i in data]
     else:
-        xs = [float(row.strip()) for row in open(xs)]
-        ys = [float(row.strip()) for row in open(ys)]
+        xs = [float(str(row).strip()) for row in open(xs)]
+        ys = [float(str(row).strip()) for row in open(ys)]
 
     colour = get_colour(colour)
 
     plotted = set()
 
-    print title.center(2*len(get_scale(xs, False, size))+2)
+    if title:
+        print box_text(title, 2*len(get_scale(xs, False, size))+1)
 
     print "-"*(2*len(get_scale(xs, False, size))+2)
     for y in get_scale(ys, True, size):
 
@@ -36,11 +36,10 @@ def drange(start, stop, step=1.0):
         yield r
         r += step
 
-def box_text(text, width):
-    box = "="*(width+4) + "\n"
-    box += "||" + text.center(width) + "||" + "\n"
-    box += "="*(width+4)
+def box_text(text, width, offset=0):
+    box = " "*offset + "-"*(width+2) + "\n"
+    box += " "*offset + "|"+ text.center(width) + "|" + "\n"
+    box += " "*offset + "-"*(width+2)
     return box
 
 
-print box_text("HELLO", 20)