Merge pull request #62 from mys007/loggerex

New features in Logger

1 files changed, 13 insertions, 6 deletions

diff --git a/Logger.lua b/Logger.lua
index 814a632..91b93e5 100644
--- a/Logger.lua
+++ b/Logger.lua
@@ -53,6 +53,9 @@ function Logger:__init(filename, timestamp)
    self.names = {}
    self.idx = {}
    self.figure = nil
+   self.showPlot = true
+   self.plotRawCmd = nil
+   self.defaultStyle = '+'
 end
 
 function Logger:setNames(names)
@@ -62,7 +65,7 @@ function Logger:setNames(names)
    for k,key in pairs(names) do
       self.file:write(key .. '\t')
       self.symbols[k] = {}
-      self.styles[k] = {'+'}
+      self.styles[k] = {self.defaultStyle}
       self.idx[key] = k
    end
    self.file:write('\n')
@@ -77,7 +80,7 @@ function Logger:add(symbols)
       for k,val in pairs(symbols) do
          self.file:write(k .. '\t')
          self.symbols[k] = {}
-         self.styles[k] = {'+'}
+         self.styles[k] = {self.defaultStyle}
          self.names[k] = k
       end
       self.idx = self.names
@@ -148,14 +151,18 @@ function Logger:plot(...)
       end
    end
    if plotit then
-      self.figure = gnuplot.figure(self.figure)
-      gnuplot.plot(plots)
-      gnuplot.grid('on')
-      gnuplot.title('<Logger::' .. self.name .. '>')
+      if self.showPlot then
+         self.figure = gnuplot.figure(self.figure)
+         gnuplot.plot(plots)
+         if self.plotRawCmd then gnuplot.raw(self.plotRawCmd) end
+         gnuplot.grid('on')
+         gnuplot.title('<Logger::' .. self.name .. '>')
+      end
       if self.epsfile then
          os.execute('rm -f "' .. self.epsfile .. '"')
          local epsfig = gnuplot.epsfigure(self.epsfile)
          gnuplot.plot(plots)
+         if self.plotRawCmd then gnuplot.raw(self.plotRawCmd) end
          gnuplot.grid('on')
          gnuplot.title('<Logger::' .. self.name .. '>')
          gnuplot.plotflush()