grada 2.0.0 → 2.0.1

data/lib/grada/gnuplot.rb

@@ -49,7 +49,7 @@ class Gnuplot
 end
 
 class Plot
-  attr_accessor :cmd, :data, :settings, :arbitrary_lines
+  attr_accessor :cmd, :data, :settings, :styles, :arbitrary_lines
 
   QUOTED_METHODS = [ "title", "output", "xlabel", "x2label", "ylabel", "y2label", "clabel", "cblabel", "zlabel" ]
 
@@ -96,49 +96,52 @@ class Plot
     
     io
   end
+end
 
-  def style(&blk)
-    @styles << Style.new(&blk)
-  end
-
-  class Style
-    attr_accessor :linestyle, :linetype, :linewidth, :linecolor, :pointtype, :pointsize, :fill, :index
-
-    alias :ls :linestyle
-    alias :lt :linetype
-    alias :lw :linewidth
-    alias :lc :linecolor
-    alias :pt :pointtype
-    alias :ps :pointsize
-    alias :fs :fill
+class Style
+  attr_accessor :linestyle, :linetype, :linewidth, :linecolor, :pointtype, :pointsize, :fill, :index
+
+  alias :ls :linestyle 
+  alias :lt :linetype
+  alias :lw :linewidth
+  alias :lc :linecolor
+  alias :pt :pointtype
+  alias :ps :pointsize
+  alias :fs :fill
+
+  alias :ls= :linestyle= 
+  alias :lt= :linetype=
+  alias :lw= :linewidth=
+  alias :lc= :linecolor=
+  alias :pt= :pointtype=
+  alias :ps= :pointsize=
+  alias :fs= :fill=
+  
+  STYLES = [:ls, :lt, :lw, :lc, :pt, :ps, :fs]
 
-    STYLES = [:ls, :lt, :lw, :lc, :pt, :ps, :fs]
+ def self.increment_index
+   @index ||= 0
+   @index += 1
+ end
 
-   def self.increment_index
-     @index ||= 0
-     @index += 1
+ def initialize
+   STYLES.each do |style|
+     send("#{style}=", nil)
    end
 
-   def initialize
-     STYLES.each do |style|
-       send("#{style}=", nil)
-     end
+   yield self if block_given?
 
-     yield self if block_given?
+ end
 
-     self.increment_index
-   end
-
-   def to_s
-     str = "set style line #{@index}"
-
-     STYLES.each do |style|
-       str += " #{send(style)} #{style}" if send(style) 
-     end
+ def to_s
+   str = ' '
 
-     str
+   STYLES.each do |style|
+     str += " #{style} #{send(style)}" if send(style) 
    end
-  end
+
+   str == ' ' ? '' : str
+ end
 end
 
 class DataSet
@@ -168,7 +171,7 @@ class DataSet
 
   def plot_args(io = '')
     io += @data.is_a?(String) ? @data : "'-'"
-    io += " index #{@index}" if @index
+    #io += " index #{@index}" if @index
     io += " using #{@using}" if @using
     io += " axes #{@axes}" if @axes
     io += " title #{@title ? "\"#{@title}\"" : notitle}"
@@ -176,7 +179,7 @@ class DataSet
     io += " smooth  #{@smooth}" if @smooth
     io += " with #{@with}" if @with
     io += " linecolor #{@linecolor}" if @linecolor
-    io += " linewidth #{@linewidth}" if @linewidth
+    io += " line #{@index} linewidth #{@linewidth}" if @linewidth
     io += " linestyle #{@linestyle.index}" if @linestyle
     
     io

data/lib/grada.rb

@@ -23,6 +23,8 @@ class Grada
                      y_label: "Y",
                      with: 'lines',
                      graph_type: :default}
+
+  STYLES = [:linestyle, :linetype, :linewidth, :linecolor, :pointtype, :pointsize, :fill]
   
   # Hello GraDA
   #
@@ -174,13 +176,21 @@ class Grada
         plot.ylabel @opts[:y_label]
   
         if multiple_data?(@y)
-          @y.each do |dic|
+          @y.each_with_index do |dic, index|
             dic.each do |k, v|
-              if k.to_sym != :with
+              if ! STYLES.include?(k.to_sym) && k.to_sym != :with
                 raise NoPlotDataError if ! v.nil? && @x.size != v.size
             
+                style = Gnuplot::Style.new do |ds|
+                  ds.index = index
+                  STYLES.each do |style|
+                    ds.send("#{style}=", dic[style]) if dic[style]
+                  end
+                end.to_s
+
                 plot.data << Gnuplot::DataSet.new([@x,v]) do |ds|
                   ds.with = dic[:with] || @opts[:with]
+                  ds.with += style
                   ds.title = "#{k}"
                 end
               end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grada
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
   prerelease: 
 platform: ruby
 authors: