Merge branch 'master' of cvs.cs.unc.edu:/cvs/proj/litmus/repo/simple-gnuplot-wrapper

Conflicts:
	gnuplot.py

- Merge to add my "non clean" (ehm.. crappy) support to errorbars in plot_pm.py

1 files changed, 44 insertions, 4 deletions

diff --git a/gnuplot.py b/gnuplot.py
index 4a34d1f..2604cb0 100755
--- a/gnuplot.py
+++ b/gnuplot.py
@@ -16,12 +16,39 @@ class CommandBuffer(object):
     def __str__(self):
         return '\n'.join([str(x) for x in self.cmds])
 
+class FileGraph(object):
+    def __init__(self, fname, xcol=1, ycol=2, error=None,
+                 title=None,
+                 style=None):
+        self.fname = fname
+        self.xcol  = xcol
+        self.ycol  = ycol
+        self.error = error
+        self.title = title
+        self.style = style
+
+    def __str__(self):
+        return self.get_command()
+
+    def get_command(self, default_style=None):
+        if self.error:
+            using_txt = "%s:%s:%s" % (self.xcol, self.ycol, self.error)
+            style     = self.style if self.style else "errorbars"
+        else:
+            using_txt = "%s:%s" % (self.xcol, self.ycol)
+            style     = self.style if self.style else default_style
+        style_txt = " with %s" % style if style else ""
+        title_txt = " title '%s'" % self.title if self.title else ""
+        return "'%s' using %s%s%s" % \
+            (self.fname, using_txt, title_txt, style_txt)
+
 def gnuplot_cmd(graphs, title=None, ylabel=None, xlabel=None,
                 format='show', term_opts=None,
                 style='linespoints', xrange=None,
                 yrange=None,
                 xticks=None, yticks=None,
                 key='below',
+                logscale=None,
                 fname=None):
     g = CommandBuffer()
     if format == 'png':
@@ -57,18 +84,31 @@ def gnuplot_cmd(graphs, title=None, ylabel=None, xlabel=None,
         g("set xtics %s, %s" % xticks)
     if yticks:
         g("set ytics %s, %s" % yticks)
+    if logscale:
+        if type(logscale) == tuple:
+            for x in logscale:
+                g("set logscale %s" % x)
+        else:
+            g("set logscale %s" % logscale)
     g('set key %s' % key)
     plot = []
     for gr in graphs:
-        if len(gr) == 4:
+        if type(gr) == str:
+            # literal plot command
+            plot.append(str(gr))
+        elif type(gr) == FileGraph:
+            # formatter object
+            plot.append(gr.get_command(style))
+        elif len(gr) == 4:
             par = (gr[0], gr[1], gr[2], gr[3], style)
             plot += ["'%s' using %s:%s title '%s' with %s" % par]
         elif len(gr) == 6:
             par = (gr[0], gr[1], gr[2], gr[3], gr[4], style, gr[5])
             plot += ["'%s' using %s:%s:%s:%s with %s title '%s'" % par]
-        else:
-            par = gr
-            plot += ["'%s' using %s:%s title '%s' with %s" % par]
+        elif len(gr) == 5:
+            plot += ["'%s' using %s:%s title '%s' with %s" % gr]
+        elif len(gr) == 3:
+            plot += ["%s title '%s' with %s" % gr]
     if plot:
         g('plot ' + ', '.join(plot))
     if format != 'show' and fname: