Skip to content

Fix --nosummary flag #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 26, 2014
+7 −7
Merged

Fix --nosummary flag #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions bashplotlib/histogram.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def run_demo():
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, nosummary=True):
def plot_hist(f, height=20.0, bincount=None, pch="o", colour="white", title="", xlab=None, showSummary=False):
"""make a histogram

Keyword arguments:
Expand All @@ -60,7 +60,7 @@ def plot_hist(f, height=20.0, bincount=None, pch="o", colour="white", title="",
colour -- colour of the bars in the terminal
title -- title at the top of the plot
xlab -- boolen value for whether or not to display x-axis labels
nosummary -- boolean value for whether or not to display a summary
showSummary -- boolean value for whether or not to display a summary
"""

if pch is None:
Expand Down Expand Up @@ -135,7 +135,7 @@ def plot_hist(f, height=20.0, bincount=None, pch="o", colour="white", title="",
center = max(map(len, map(str, [n, min_val, mean, max_val])))
center += 15

if nosummary is not True:
if showSummary:
print
print "-"*(2 + center)
print "|" + "Summary".center(center) + "|"
Expand Down Expand Up @@ -165,7 +165,7 @@ def plot_hist(f, height=20.0, bincount=None, pch="o", colour="white", title="",
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')
parser.add_option('-n', '--nosummary', help='run demos', action='store_true', dest='nosummary')
parser.add_option('-n', '--nosummary', help='hide summary', action='store_false', dest='showSummary', default=True)

(opts, args) = parser.parse_args()

Expand All @@ -178,7 +178,7 @@ def plot_hist(f, height=20.0, bincount=None, pch="o", colour="white", title="",
if opts.demo:
run_demo()
elif opts.f:
plot_hist(opts.f, opts.h, opts.b, opts.p, opts.colour, opts.t, opts.x, opts.nosummary)
plot_hist(opts.f, opts.h, opts.b, opts.p, opts.colour, opts.t, opts.x, opts.showSummary)
else:
print "nothing to plot!"

4 changes: 2 additions & 2 deletions bin/hist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ if __name__=="__main__":
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('-n', '--nosummary', help='hide summary', action='store_false', dest='nosummary')
parser.add_option('-n', '--nosummary', help='hide summary', action='store_false', dest='showSummary', default=True)

(opts, args) = parser.parse_args()

Expand All @@ -33,7 +33,7 @@ if __name__=="__main__":
opts.f = sys.stdin.readlines()

if opts.f:
plot_hist(opts.f, opts.h, opts.b, opts.p, opts.colour, opts.t, opts.x, opts.nosummary)
plot_hist(opts.f, opts.h, opts.b, opts.p, opts.colour, opts.t, opts.x, opts.showSummary)
else:
print "nothing to plot!"