1 files changed, 42 insertions, 5 deletions

diff --git a/gnuplot.py b/gnuplot.py
index ca1e2ff..36ab73c 100755
--- a/gnuplot.py
+++ b/gnuplot.py
@@ -25,14 +25,17 @@ class CommandBuffer(object):
 
 
 class Label(object):
-    def __init__(self, x, y, txt):
+    def __init__(self, x, y, txt, coord=['', ''], align='center'):
         self.x   = x
         self.y   = y
         self.txt = txt
-        # support more label stuff optionally...
+        self.coord = coord
+        self.align = align
+       # support more label stuff optionally...
 
     def gnuplot_cmd(self):
-        return '"%s" at %f,%f center' % (self.txt, self.x, self.y)
+        return '"%s" at %s %f, %s %f %s' % \
+            (self.txt, self.coord[0], self.x, self.coord[1], self.y, self.align)
 
     def __str__(self):
         return 'set label %s' % self.gnuplot_cmd()
@@ -83,14 +86,32 @@ class LiteralGraph(object):
             (self.expr, title_txt, style_txt)
 
 
+class HistogramGraph(object):
+    def __init__(self, fname, col=1, labels_col=None):
+        self.fname      = fname
+        self.data_col   = col
+        self.labels_col = labels_col
+
+    def __str__(self):
+        return self.gnuplot_cmd()
+
+    def gnuplot_cmd(self, default_style=None):
+        if self.labels_col != None:
+            lstr = ":xticlabels(%s)" % self.labels_col
+        else:
+            lstr = ""
+        return "'%s' using %s%s" % (self.fname, self.data_col, lstr)
+
+
 label = Label
 
-def curve(fname=None, literal=None, **kargs):
+def curve(fname=None, literal=None, histogram=None, **kargs):
     if fname:
         return FileGraph(fname, **kargs)
     elif literal:
         return LiteralGraph(literal, **kargs)
-
+    elif histogram:
+        return HistogramGraph(histogram, **kargs)
 
 class Plot(object):
     def __init__(self):
@@ -116,15 +137,25 @@ class Plot(object):
         self.ylog   = None
         self.ylabel = None
 
+        self.boxwidth = None
+
         self.key    = None
         self.title  = None
 
         self.labels = []
         self.curves = []
+        self.style  = {}
 
         self.default_style = None # for plotted curves
         self.line_styles = []
 
+    def setup_histogram(self, gap=None, boxwidth=0.9):
+        self.style['data'] = 'histogram'
+        if gap != None:
+            self.style['histogram'] = 'cluster gap %s' % gap
+        self.style['fill'] = 'solid 1.0 border -1'
+        self.boxwidth = '%.2f relative' % boxwidth
+
     def gnuplot_commands(self, cmd_buf=None):
         if cmd_buf:
             g = cmd_buf
@@ -196,6 +227,12 @@ class Plot(object):
         if logscale:
             g("set logscale %s" % logscale)
 
+        if self.boxwidth:
+            g('set boxwidth %s' % self.boxwidth)
+
+        for s in self.style:
+            g("set style %s %s" % (s, self.style[s]))
+
         for ls in self.line_styles:
             g("set style line %d %s" % (ls[0], ls[1]))