1 files changed, 21 insertions, 7 deletions

diff --git a/plot_pm2.py b/plot_pm2.py
index c2fcbf3..914c4f4 100755
--- a/plot_pm2.py
+++ b/plot_pm2.py
@@ -13,7 +13,7 @@ import stats
 import defapp
 
 from plot     import decode
-from gnuplot  import gnuplot, FileGraph, FORMATS
+from gnuplot  import gnuplot, FileGraph, FORMATS, gnuplot_cmd
 
 
 
@@ -410,8 +410,8 @@ class CyclePlotter(defapp.App):
 
                 fname = "%s_full_%s" % (name, kind)
 
-                gnuplot(graphs, xlabel=xlabel, ylabel=ylabel, title=title, fname=fname,
-                        yrange=yrange, logscale=axis, format=self.options.format)
+                #gnuplot(graphs, xlabel=xlabel, ylabel=ylabel, title=title, fname=fname,
+                #        yrange=yrange, logscale=axis, format=self.options.format)
 
         # per-sample delta measures
         for offset, kind, long in [(0, 'avg', 'average'), (2, 'wc', 'maximum')]:
@@ -429,8 +429,22 @@ class CyclePlotter(defapp.App):
             yrange = None
 
             fname = "%s_delta_%s" % (name, kind)
-            gnuplot(graphs, xlabel=xlabel, ylabel=ylabel, title=title, fname=fname,
-                    yrange=yrange, logscale=axis, format=self.options.format)
+            figname = "fig_" + fname
+            cmd = gnuplot_cmd(graphs,
+                    xlabel=xlabel,
+                    ylabel=ylabel,
+                    yrange=yrange,
+                    logscale=axis,
+                    title=title,
+                    format=self.options.format,
+                    fname=figname)
+            f = open("%s.plot" % figname, "w")
+            f.write(str(cmd))
+            f.close()
+            del f
+
+            #gnuplot(graphs, xlabel=xlabel, ylabel=ylabel, title=title, fname=fname,
+            #        yrange=yrange, logscale=axis, format=self.options.format)
 
             graphs = []
             for (x, y, yminus, tag, idx) in columns:
@@ -446,8 +460,8 @@ class CyclePlotter(defapp.App):
             yrange = None
 
             fname = "%s_delta-h_%s" % (name, kind)
-            gnuplot(graphs, xlabel=xlabel, ylabel=ylabel, title=title, fname=fname,
-                    yrange=yrange, logscale=axis, format=self.options.format)
+            #gnuplot(graphs, xlabel=xlabel, ylabel=ylabel, title=title, fname=fname,
+            #        yrange=yrange, logscale=axis, format=self.options.format)
 
 #        del tmp