Merge branch 'master' into wip-bbb

Conflicts:
	gnuplot.py

1 files changed, 4 insertions, 0 deletions

diff --git a/gnuplot.py b/gnuplot.py
index a304809..36ab73c 100755
--- a/gnuplot.py
+++ b/gnuplot.py
@@ -147,6 +147,7 @@ class Plot(object):
         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'
@@ -232,6 +233,9 @@ class Plot(object):
         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]))
+
         plots = [c.gnuplot_cmd(self.default_style) for c in self.curves]
         if plots:
             g("plot " + ", ".join(plots))