axlsx 1.1.3 → 1.1.4

data/lib/axlsx/drawing/drawing.rb

@@ -10,14 +10,18 @@ module Axlsx
 
   require 'axlsx/drawing/scaling.rb'
   require 'axlsx/drawing/axis.rb'
+
+  require 'axlsx/drawing/str_val.rb'
+  require 'axlsx/drawing/num_val.rb'
+  require 'axlsx/drawing/str_data.rb'
+  require 'axlsx/drawing/num_data.rb'
+  require 'axlsx/drawing/num_data_source.rb'
+  require 'axlsx/drawing/ax_data_source.rb'
+
   require 'axlsx/drawing/ser_axis.rb'
   require 'axlsx/drawing/cat_axis.rb'
   require 'axlsx/drawing/val_axis.rb'
 
-  require 'axlsx/drawing/cat_axis_data.rb'
-  require 'axlsx/drawing/val_axis_data.rb'
-  require 'axlsx/drawing/named_axis_data.rb'
-
   require 'axlsx/drawing/marker.rb'
 
   require 'axlsx/drawing/one_cell_anchor.rb'

data/lib/axlsx/drawing/line_series.rb

@@ -14,6 +14,11 @@ module Axlsx
     # @return [CatAxisData]
     attr_reader :labels
 
+    # The fill color for this series.
+    # Red, green, and blue is expressed as sequence of hex digits, RRGGBB. A perceptual gamma of 2.2 is used.
+    # @return [String]
+    attr_reader :color
+
     # Creates a new series
     # @option options [Array, SimpleTypedList] data
     # @option options [Array, SimpleTypedList] labels
@@ -21,8 +26,13 @@ module Axlsx
     def initialize(chart, options={})
       @labels, @data = nil, nil
       super(chart, options)
-      @labels = CatAxisData.new(options[:labels]) unless options[:labels].nil?
-      @data = ValAxisData.new(options[:data]) unless options[:data].nil?
+      @labels = AxDataSource.new(:data => options[:labels]) unless options[:labels].nil?
+      @data = NumDataSource.new(options) unless options[:data].nil?
+    end
+
+    # @see color
+    def color=(v)
+      @color = v
     end
 
     # Serializes the object
@@ -30,6 +40,12 @@ module Axlsx
     # @return [String]
     def to_xml_string(str = '')
       super(str) do
+        if color
+          str << '<c:spPr><a:solidFill>'
+          str << '<a:srgbClr val="' << color << '"/>'
+          str << '</a:solidFill></c:spPr>'
+        end
+
         @labels.to_xml_string(str) unless @labels.nil?
         @data.to_xml_string(str) unless @data.nil?
       end
@@ -38,10 +54,10 @@ module Axlsx
     private
 
     # assigns the data for this series
-    def data=(v) DataTypeValidator.validate "Series.data", [SimpleTypedList], v; @data = v; end
+    def data=(v) DataTypeValidator.validate "Series.data", [NumDataSource], v; @data = v; end
 
     # assigns the labels for this series
-    def labels=(v) DataTypeValidator.validate "Series.labels", [SimpleTypedList], v; @labels = v; end
+    def labels=(v) DataTypeValidator.validate "Series.labels", [AxDataSource], v; @labels = v; end
 
   end
 end

data/lib/axlsx/drawing/num_data.rb

@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+module Axlsx
+
+  #This class specifies data for a particular data point. It is used for both numCache and numLit object
+  class NumData
+
+    # A string representing the format code to apply. For more information see see the SpreadsheetML numFmt element's (§18.8.30) formatCode attribute.
+    # @return [String]
+    attr_reader :format_code
+
+    # creates a new NumVal object
+    # @option options [String] formatCode
+    # @option options [Array] :data
+    # @see StrData
+    def initialize(options={})
+      @format_code = "General"
+      @pt = SimpleTypedList.new NumVal
+      options.each do |o|
+        self.send("#{o[0]}=", o[1]) if self.respond_to? "#{o[0]}="
+      end
+    end
+
+    # Creates the val objects for this data set. I am not overly confident this is going to play nicely with time and data types.
+    # @param [Array] values An array of cells or values.
+    def data=(values=[])
+      @tag_name = values.first.is_a?(Cell) ? :numCache : :numLit
+      values.each do |value|
+        v = value.is_a?(Cell) ? value.value : value
+        @pt << NumVal.new(:v => v)
+      end
+    end
+
+    # @see format_code
+    def format_code=(v='General')
+      Axlsx::validate_string(v)
+      @format_code = v
+    end
+
+    # serialize the object
+    def to_xml_string(str = "")
+      str << '<c:' << @tag_name.to_s << '>'
+      str << '<c:formatCode>' << format_code.to_s << '</c:formatCode>'
+      str << '<c:ptCount val="' << @pt.size.to_s << '"/>'
+      @pt.each_with_index do |num_val, index|
+        num_val.to_xml_string index, str
+      end
+      str << '</c:' << @tag_name.to_s << '>'
+    end
+
+  end
+
+end

data/lib/axlsx/drawing/num_data.rb~

@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+module Axlsx
+
+  #This class specifies data for a particular data point. It is used for both numCache and numLit object
+  class NumData < StrData
+
+    def self.allowed_tag_names
+      [:numCache, :numLit]
+    end
+
+    # A string representing the format code to apply. For more information see see the SpreadsheetML numFmt element's (§18.8.30) formatCode attribute.
+    # @return [String]
+    attr_reader :format_code
+
+    # creates a new NumVal object
+    # @option options [String] formatCode
+    # @option options [Array] :data
+    # @option options [Array] :data
+    # @option options [String] :tag_name
+    # @see StrData
+    def initialize(options={})
+      @tag_prefix = :num
+      @type = NumVal
+      @format_code = "General"
+      @pt = SimpleTypedList.new @type
+      options.each do |o|
+        self.send("#{o[0]}=", o[1]) if self.respond_to? "#{o[0]}="
+      end
+
+    end
+
+    # @see format_code
+    def format_code=(v='General')
+      Axlsx::validate_string(v)
+      @format_code = v
+    end
+
+    # serialize the object
+    def to_xml_string(idx, str = "")
+      str << '<c:' << tag_name.to_s << '>'
+      str << '<c:formatCode>' << format_code.to_s << '</c:formatCode>'
+      str << '<c:ptCount val="' << @pt.size.to_s << '"/>'
+      pt.each_with_index do |num_val, index|
+        num_val.to_xml_string index, str
+      end
+      str << '</c:' << tag_name.to_s << '>'
+    end
+
+  end
+
+end

data/lib/axlsx/drawing/num_data_source.rb

@@ -0,0 +1,58 @@
+module Axlsx
+  # A numeric data source for use by charts.
+  class NumDataSource
+
+    # The tag name to use when serializing this data source.
+    # Only items defined in allowed_tag_names are allowed
+    # @return [Symbol]
+    attr_reader :tag_name
+
+    attr_reader :data
+
+    # allowed element tag names
+    # @return [Array]
+    def self.allowed_tag_names
+      [:yVal, :val]
+    end
+
+    # creates a new NumDataSource object
+    # @option options [Array] data An array of Cells or Numeric objects
+    # @option options [Symbol] tag_name see tag_name
+    def initialize(options={})
+      # override these three in child classes
+      @data_type ||= NumData
+      @tag_name ||= :val
+      @ref_tag_name ||= :numRef
+
+      @f = nil
+      @data = @data_type.new(options)
+      if options[:data] && options[:data].first.is_a?(Cell)
+        @f = Axlsx::cell_range(options[:data])
+      end
+      options.each do |o|
+        self.send("#{o[0]}=", o[1]) if self.respond_to? "#{o[0]}="
+      end
+    end
+
+    # sets the tag name for this data source
+    # @param [Symbol] One of the allowed_tag_names
+    def tag_name=(v)
+      Axlsx::RestrictionValidator.validate "#{self.class.name}.tag_name", self.class.allowed_tag_names, v
+      @tag_name = v
+    end
+
+    def to_xml_string(str="")
+      str << '<c:' << tag_name.to_s << '>'
+      if @f
+        str << '<c:' << @ref_tag_name.to_s << '>'
+        str << '<c:f>' << @f.to_s << '</c:f>'
+      end
+      @data.to_xml_string str
+      if @f
+        str << '</c:' << @ref_tag_name.to_s << '>'
+      end
+      str << '</c:' << tag_name.to_s << '>'
+    end
+  end
+end
+

data/lib/axlsx/drawing/num_data_source.rb~

@@ -0,0 +1,54 @@
+module Axlsx
+  # A numeric data source for use by charts.
+  class NumDataSource
+
+    # The tag name to use when serializing this data source.
+    # Only items defined in allowed_tag_names are allowed
+    # @return [Symbol]
+    attr_reader :tag_name
+
+    attr_reader :data
+
+    # allowed element tag names
+    # @return [Array]
+    def self.allowed_tag_names
+      [:yVal, :val]
+    end
+
+    # creates a new NumDataSource object
+    # @option options [Array] data An array of Cells or Numeric objects
+    # @option options [Symbol] tag_name see tag_name
+    def initialize(options={})
+      @f = nil
+      @tag_name = :val
+      @data = NumData.new(options)
+      if options[:data] && options[:data].first.is_a?(Cell)
+        @f = Axlsx::cell_range(options[:data])
+      end
+      options.each do |o|
+        self.send("#{o[0]}=", o[1]) if self.respond_to? "#{o[0]}="
+      end
+    end
+
+    # sets the tag name for this data source
+    # @param [Symbol] One of the allowed_tag_names
+    def tag_name=(v)
+      Axlsx::RestrictionValidator.validate "#{self.class.name}.tag_name", self.class.allowed_tag_names, v
+      @tag_name = v
+    end
+
+    def to_xml_string(str="")
+      str << '<c:' << tag_name.to_s << '>'
+      if @f
+        str << '<c:numRef>'
+        str << '<c:f>' << @f.to_s << '</c:f>'
+      end
+      @data.to_xml_string str
+      if @f
+        str << '</c:numRef>'
+      end
+      str << '</c:' << tag_name.to_s << '>'
+    end
+  end
+end
+

data/lib/axlsx/drawing/num_val.rb

@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+module Axlsx
+
+  #This class specifies data for a particular data point.
+  class NumVal < StrVal
+
+    # A string representing the format code to apply.
+    # For more information see see the SpreadsheetML numFmt element's (§18.8.30) formatCode attribute.
+    # @return [String]
+    attr_reader :format_code
+
+    # creates a new NumVal object
+    # @option options [String] formatCode
+    # @option options [Integer] v
+    def initialize(options={})
+      @format_code = "General"
+      super(options)
+    end
+
+    # @see format_code
+    def format_code=(v)
+      Axlsx::validate_string(v)
+      @format_code = v
+    end
+
+    # serialize the object
+    def to_xml_string(idx, str = "")
+      Axlsx::validate_unsigned_int(idx)
+      str << '<c:pt idx="' << idx.to_s << '" formatCode="' << format_code << '"><c:v>' << v.to_s << '</c:v></c:pt>'
+    end
+  end
+end

data/lib/axlsx/drawing/num_val.rb~

@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+module Axlsx
+
+  #This class specifies data for a particular data point.
+  class NumVal < StrVal
+
+    # A string representing the format code to apply. For more information see see the SpreadsheetML numFmt element's (§18.8.30) formatCode attribute.
+    # @return [String]
+    attr_reader :format_code
+
+    # creates a new NumVal object
+    # @option options [String] formatCode
+    # @option options [Integer] v
+    def initialize(options={})
+      @format_code = "General"
+      @v = @idx = 0
+      options.each do |o|
+        self.send("#{o[0]}=", o[1]) if self.respond_to? "#{o[0]}="
+      end
+    end
+
+    # @see format_code
+    def format_code=(v='General')
+      Axlsx::validate_string(v)
+      @format_code = v
+    end
+
+    # @see v
+    def v=(v)
+      Axlsx::validate_int(v)
+      @v = v
+    end
+
+    # serialize the object
+    def to_xml_string(idx, str = "")
+      Axlsx::validate_unsigned_int(idx)
+      str << '<c:pt idx="' << idx.to_s << '" formatCode="' << format_code << '"><c:v>' << v.to_s << '</c:v></c:pt>'
+    end
+  end
+end

data/lib/axlsx/drawing/pie_series.rb

@@ -19,6 +19,9 @@ module Axlsx
     # @return [Integert]
     attr_reader :explosion
 
+    # An array of rgb colors to apply to your bar chart.
+    attr_reader :colors
+
     # Creates a new series
     # @option options [Array, SimpleTypedList] data
     # @option options [Array, SimpleTypedList] labels
@@ -27,11 +30,15 @@ module Axlsx
     # @param [Chart] chart
     def initialize(chart, options={})
       @explosion = nil
+      @colors = []
       super(chart, options)
-      self.labels = CatAxisData.new(options[:labels]) unless options[:labels].nil?
-      self.data = ValAxisData.new(options[:data]) unless options[:data].nil?
+      self.labels = AxDataSource.new(:data => options[:labels]) unless options[:labels].nil?
+      self.data = NumDataSource.new(options) unless options[:data].nil?
     end
 
+    # @see colors
+    def colors=(v) DataTypeValidator.validate "BarSeries.colors", [Array], v; @colors = v end
+
     # @see explosion
     def explosion=(v) Axlsx::validate_unsigned_int(v); @explosion = v; end
 
@@ -41,6 +48,13 @@ module Axlsx
     def to_xml_string(str = '')
       super(str) do |str_inner|
         str_inner << '<c:explosion val="' << @explosion << '"/>' unless @explosion.nil?
+        colors.each_with_index do |c, index|
+          str << '<c:dPt>'
+          str << '<c:idx val="' << index.to_s << '"/>'
+          str << '<c:spPr><a:solidFill>'
+          str << '<a:srgbClr val="' << c << '"/>'
+          str << '</a:solidFill></c:spPr></c:dPt>'
+        end
         @labels.to_xml_string str_inner unless @labels.nil?
         @data.to_xml_string str_inner unless @data.nil?
       end
@@ -50,10 +64,10 @@ module Axlsx
     private
 
     # assigns the data for this series
-    def data=(v) DataTypeValidator.validate "Series.data", [SimpleTypedList], v; @data = v; end
+    def data=(v) DataTypeValidator.validate "Series.data", [NumDataSource], v; @data = v; end
 
     # assigns the labels for this series
-    def labels=(v) DataTypeValidator.validate "Series.labels", [SimpleTypedList], v; @labels = v; end
+    def labels=(v) DataTypeValidator.validate "Series.labels", [AxDataSource], v; @labels = v; end
 
   end
 

data/lib/axlsx/drawing/ref.rb~

@@ -0,0 +1,41 @@
+module Axlsx
+
+  # Base class for xVal, yVal and val data sources
+  class DataSource
+
+    def self.allowed_tag_names
+      [:yVal, :xVal, :val]
+    end
+
+    def self.allowed_types
+      [NumData, StrData]
+    end
+
+    attr_reader :tag_name
+
+    attr_reader :data
+
+    def initialize(type, data=[])
+      Axlsx::RestrictionValidator.validate "#{self.class.name}", self.class.allowed_types, type
+      @data = type.new
+    end
+
+    def f
+
+    end
+
+    def is_literal?
+
+    end
+
+    def is_reference?
+
+    end
+
+    def to_xml_string(str = '')
+
+    end
+
+  end
+
+end