Fixed colour printing to work on white backgrounds

Author: iiSeymour

bashplotlib/histogram.py

@@ -1,15 +1,23 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
 
+"""
+Plotting terminal based histograms
+"""
+
+importos
+importsys
 importmath
 importoptparse
-importos
 fromos.pathimportdirname
-importsys
-fromutils.helpersimport*
-fromutils.commandhelpimporthist
+from .utils.helpersimport*
+from.utils.commandhelpimporthist
+
 
 defcalc_bins(n, min_val, max_val, h=None, binwidth=None):
-"calculate number of bins for the histogram"
+"""
+ Calculate number of bins for the histogram
+ """
 ifnoth:
 h=max(10, math.log(n+1, 2))
 ifbinwidth==0:
@@ -22,15 +30,17 @@ def calc_bins(n, min_val, max_val, h=None, binwidth=None):
 else:
 yieldb
 
+
 defread_numbers(numbers):
-"read the input data in the most optimal way"
+"""
+ Read the input data in the most optimal way
+ """
 ifisinstance(numbers, list):
-forninnumbers:
-n=str(n)
-yieldfloat(n.strip())
+fornumberinnumbers:
+yieldfloat(str(number).strip())
 else:
-forninopen(numbers):
-yieldfloat(n.strip())
+fornumberinopen(numbers):
+yieldfloat(number.strip())
 
 
 defrun_demo():
@@ -53,8 +63,8 @@ def run_demo():
 plot_hist(demo_file)
 print"*"*80
 
-#with colors
-print"histogram with colors"
+#with colours
+print"histogram with colours"
 print"plot_hist('%s', colour='blue')"%demo_file
 print"hist -f %s -c blue"%demo_file
 plot_hist(demo_file, colour='blue')
@@ -74,10 +84,11 @@ def run_demo():
 plot_hist(demo_file, height=35.0, bincount=40)
 
 
-defplot_hist(f, height=20.0, bincount=None, binwidth=None, pch="o", colour="white", title="", xlab=None, showSummary=False, regular=False):
-"""make a histogram
+defplot_hist(f, height=20.0, bincount=None, binwidth=None, pch="o", colour="default", title="", xlab=None, showSummary=False, regular=False):
+"""
+ Make a histogram
 
- Keyword arguments:
+Arguments:
  height -- the height of the histogram in # of lines
  bincount -- number of bins in the histogram
  binwidth -- width of bins in the histogram
@@ -88,28 +99,25 @@ def plot_hist(f, height=20.0, bincount=None, binwidth=None, pch="o", colour="whi
  showSummary -- boolean value for whether or not to display a summary
  regular -- boolean value for whether or not to start y-labels at 0
  """
-
 ifpchisNone:
 pch="o"
 
-colour=get_colour(colour)
-
 min_val, max_val=None, None
-n, mean=0., 0.
+n, mean=0.0, 0.0
+
 fornumberinread_numbers(f):
 n+=1
-
-if (min_valisNone) or (number<min_val):
+ifmin_valisNoneornumber<min_val:
 min_val=number
-if(max_valisNone)or(number>max_val):
+ifmax_valisNoneornumber>max_val:
 max_val=number
 mean+=number
+
 mean/=n
 
 bins=list(calc_bins(n, min_val, max_val, bincount, binwidth))
-hist={}
-foriinrange(len(bins)):
-hist[i] =0
+hist={i: 0foriinrange(len(bins))}
+
 fornumberinread_numbers(f):
 fori, binenumerate(bins):
 ifnumber<=b:
@@ -122,6 +130,7 @@ def plot_hist(f, height=20.0, bincount=None, binwidth=None, pch="o", colour="whi
 
 start=max(min_y, 1)
 stop=max_y+1
+
 ifregular:
 start=1
 
@@ -138,6 +147,7 @@ def plot_hist(f, height=20.0, bincount=None, binwidth=None, pch="o", colour="whi
 iftitle:
 printbox_text(title, max(len(hist)*2, len(title)), nlen)
 print
+
 used_labs=set()
 foryinys:
 ylab=str(int(y))
@@ -151,67 +161,63 @@ def plot_hist(f, height=20.0, bincount=None, binwidth=None, pch="o", colour="whi
 
 foriinrange(len(hist)):
 ifint(y) <=hist[i]:
-printcolor(pch, True, colour)
+printcolour(pch, True, colour)
 else:
-printcolor(" ", True, colour)
+printcolour(" ", True, colour)
 print
 xs=hist.keys() *2
 
-print" "*(nlen+1) +"-"*len(xs)
-
+print" "* (nlen+1) +"-"*len(xs)
 
 ifxlab:
 xlen=len(str(float((max_y)/height) +max_y))
 foriinrange(0, xlen):
-printcolor(" "*(nlen+1), True, colour)
+printcolour(" "*(nlen+1), True, colour)
 forxinrange(0, len(hist)):
 num=str(bins[x])
-ifx%2==0:
+ifx%2==0:
 print" ",
 elifi<len(num):
 printnum[i],
 else:
 print" ",
 print
+
 center=max(map(len, map(str, [n, min_val, mean, max_val])))
 center+=15
 
 ifshowSummary:
 print
-print"-"*(2+center)
+print"-"*(2+center)
 print"|"+"Summary".center(center) +"|"
-print"-"*(2+center)
+print"-"*(2+center)
 summary="|"+ ("observations: %d"%n).center(center) +"|\n"
 summary+="|"+ ("min value: %f"%min_val).center(center) +"|\n"
 summary+="|"+ ("mean : %f"%mean).center(center) +"|\n"
 summary+="|"+ ("max value: %f"%max_val).center(center) +"|\n"
-summary+="-"*(2+center)
+summary+="-"*(2+center)
 printsummary
 
 
 defmain():
 
 parser=optparse.OptionParser(usage=hist['usage'])
 
-parser.add_option('-f', '--file', help='a file containing a column of numbers',
-default=None, dest='f')
-parser.add_option('-t', '--title', help='title for the chart',
-default="", dest='t')
-parser.add_option('-b', '--bins', help='number of bins in the histogram',
-type='int', default=None, dest='b')
-parser.add_option('-w', '--binwidth', help='width of bins in the histogram',
-type='float', default=None, dest='binwidth')
-parser.add_option('-s', '--height', help='height of the histogram (in lines)',
-type='int', default=None, dest='h')
+parser.add_option('-f', '--file', help='a file containing a column of numbers', default=None, dest='f')
+parser.add_option('-t', '--title', help='title for the chart', default="", dest='t')
+parser.add_option('-b', '--bins', help='number of bins in the histogram', type='int', default=None, dest='b')
+parser.add_option('-w', '--binwidth', help='width of bins in the histogram', type='float', default=None, dest='binwidth')
+parser.add_option('-s', '--height', help='height of the histogram (in lines)', type='int', default=None, dest='h')
 parser.add_option('-p', '--pch', help='shape of each bar', default='o', dest='p')
 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([cforcinbcolours.keys() ifc!='ENDC']),
-default='white', dest='colour')
+parser.add_option('-c', '--colour', help='colour of the plot (%s)'%colour_help, default='default', dest='colour')
 parser.add_option('-d', '--demo', help='run demos', action='store_true', dest='demo')
 parser.add_option('-n', '--nosummary', help='hide summary', action='store_false', dest='showSummary', default=True)
-parser.add_option('-r', '--regular', help='use regular y-scale (0 - maximum y value), instead of truncated y-scale (minimum y-value - maximum y-value)', default=False, action="store_true", dest='regular')
+parser.add_option('-r', '--regular',
+help='use regular y-scale (0 - maximum y value), instead of truncated y-scale (minimum y-value - maximum y-value)',
+default=False, action="store_true", dest='regular')
 
-(opts, args)=parser.parse_args()
+opts, args=parser.parse_args()
 
 ifopts.fisNone:
 iflen(args) >0:
@@ -227,5 +233,5 @@ def main():
 print"nothing to plot!"
 
 
-if__name__=="__main__":
+if__name__=="__main__":
 main()

bashplotlib/scatterplot.py

@@ -1,10 +1,15 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+"""
+Plotting terminal based scatterplots
+"""
 
 importcsv
-importoptparse
 importsys
-fromutils.helpersimport*
-fromutils.commandhelpimportscatter
+importoptparse
+from .utils.helpersimport*
+from .utils.commandhelpimportscatter
 
 
 defget_scale(series, is_y=False, steps=20):
@@ -20,10 +25,12 @@ def get_scale(series, is_y=False, steps=20):
 scaled_series.reverse()
 returnscaled_series
 
+
 defplot_scatter(f, xs, ys, size, pch, colour, title):
-"""Form a complex number.
+"""
+ Form a complex number.
 
-Arguments:
+ Arguments:
  f -- comma delimited file w/ x,y coordinates
  xs -- if f not specified this is a file w/ x coordinates
  ys -- if f not specified this is a filew / y coordinates
@@ -44,14 +51,12 @@ def plot_scatter(f, xs, ys, size, pch, colour, title):
 xs= [float(str(row).strip()) forrowinopen(xs)]
 ys= [float(str(row).strip()) forrowinopen(ys)]
 
-colour=get_colour(colour)
-
 plotted=set()
 
 iftitle:
 printbox_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)
 foryinget_scale(ys, True, size):
 print"|",
 forxinget_scale(xs, False, size):
@@ -67,30 +72,24 @@ def plot_scatter(f, xs, ys, size, pch, colour, title):
 point="|"
 elify==0:
 point="-"
-printcolor(point, True, colour)
+printcolour(point, True, colour)
 print"|"
 print"-"*(2*len(get_scale(xs, False, size))+2)
 
 
 defmain():
 
 parser=optparse.OptionParser(usage=scatter['usage'])
-parser.add_option('-f', '--file', help='a csv w/ x and y coordinates',
-default=None, dest='f')
-parser.add_option('-t', '--title', help='title for the chart',
-default="", dest='t')
-parser.add_option('-x', help='x coordinates',
-default=None, dest='x')
-parser.add_option('-y', help='y coordinates',
-default=None, dest='y')
-parser.add_option('-s', '--size',help='y coordinates',
-default=20, dest='size', type='int')
-parser.add_option('-p', '--pch',help='shape of point',
-default="x", dest='pch') 
-parser.add_option('-c', '--colour', help='colour of the plot (%s)'%", ".join(bcolours.keys()),
-default='white', dest='colour')
-
- (opts, args) =parser.parse_args()
+
+parser.add_option('-f', '--file', help='a csv w/ x and y coordinates', default=None, dest='f')
+parser.add_option('-t', '--title', help='title for the chart', default="", dest='t')
+parser.add_option('-x', help='x coordinates', default=None, dest='x')
+parser.add_option('-y', help='y coordinates', default=None, dest='y')
+parser.add_option('-s', '--size',help='y coordinates', default=20, dest='size', type='int')
+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')
+
+opts, args=parser.parse_args()
 
 ifopts.fisNoneand (opts.xisNoneoropts.yisNone):
 opts.f=sys.stdin.readlines()

bashplotlib/utils/helpers.py

@@ -8,18 +8,21 @@
 importsys
 
 bcolours={
-"white": '\033[97m',
-"aqua": '\033[96m',
-"pink": '\033[95m',
-"blue": '\033[94m',
-"yellow": '\033[93m',
-"green": '\033[92m',
-"red": '\033[91m',
-"grey": '\033[90m',
-"black": '\033[30m',
-"ENDC": '\033[39m',
+"white": '\033[97m',
+"aqua": '\033[96m',
+"pink": '\033[95m',
+"blue": '\033[94m',
+"yellow": '\033[93m',
+"green": '\033[92m',
+"red": '\033[91m',
+"grey": '\033[90m',
+"black": '\033[30m',
+"default": '\033[39m',
+"ENDC": '\033[39m',
 }
 
+colour_help=', '.join([colourforcolourinbcoloursifcolour!="ENDC"])
+
 
 defget_colour(colour):
 """