axlsx 1.1.0 → 1.2.0

data/lib/axlsx/drawing/drawing.rb

@@ -1,5 +1,6 @@
 # encoding: UTF-8
 module Axlsx
+  require 'axlsx/drawing/d_lbls.rb'
   require 'axlsx/drawing/title.rb'
   require 'axlsx/drawing/series_title.rb'
   require 'axlsx/drawing/series.rb'
@@ -10,14 +11,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'
@@ -35,12 +40,16 @@ module Axlsx
   require 'axlsx/drawing/pic.rb'
   require 'axlsx/drawing/hyperlink.rb'
 
-  # A Drawing is a canvas for charts. Each worksheet has a single drawing that manages anchors.
-  # The anchors reference the charts via graphical frames. This is not a trivial relationship so please do follow the advice in the note.
-  # @note The recommended way to manage drawings is to use the Worksheet.add_chart method.
+  require 'axlsx/drawing/vml_drawing.rb'
+  require 'axlsx/drawing/vml_shape.rb'
+
+  # A Drawing is a canvas for charts and images. Each worksheet has a single drawing that manages anchors.
+  # The anchors reference the charts or images via graphical frames. This is not a trivial relationship so please do follow the advice in the note.
+  # @note The recommended way to manage drawings is to use the Worksheet.add_chart and Worksheet.add_image methods.
   # @see Worksheet#add_chart
+  # @see Worksheet#add_image
   # @see Chart
-  # see README for an example of how to create a chart.
+  # see examples/example.rb for an example of how to create a chart.
   class Drawing
 
     # The worksheet that owns the drawing
@@ -61,11 +70,17 @@ module Axlsx
       @anchors = SimpleTypedList.new [TwoCellAnchor, OneCellAnchor]
     end
 
-    # Adds an image to the chart
+
+    # Adds an image to the chart If th end_at option is specified we create a two cell anchor. By default we use a one cell anchor.
     # @note The recommended way to manage images is to use Worksheet.add_image. Please refer to that method for documentation.
     # @see Worksheet#add_image
+    # @return [Pic]
     def add_image(options={})
-      OneCellAnchor.new(self, options)
+      if options[:end_at]
+        TwoCellAnchor.new(self, options).add_pic(options)
+      else
+        OneCellAnchor.new(self, options)
+      end 
       @anchors.last.object
     end
 
@@ -142,8 +157,9 @@ module Axlsx
     # @param [String] str
     # @return [String]
     def to_xml_string(str = '')
-      str << '<?xml version="1.0" encoding="UTF-8"?>'
-      str << '<xdr:wsDr xmlns:xdr="' << XML_NS_XDR << '" xmlns:a="' << XML_NS_A << '" xmlns:c="' << XML_NS_C << '">'
+      str << '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'
+      str << '<xdr:wsDr xmlns:xdr="' << XML_NS_XDR << '" xmlns:a="' << XML_NS_A << '">'
+
       anchors.each { |anchor| anchor.to_xml_string(str) }
       str << '</xdr:wsDr>'
     end

data/lib/axlsx/drawing/graphic_frame.rb

@@ -32,9 +32,10 @@ module Axlsx
     # @param [String] str
     # @return [String]
     def to_xml_string(str = '')
+      # macro attribute should be optional!
       str << '<xdr:graphicFrame>'
       str << '<xdr:nvGraphicFramePr>'
-      str << '<xdr:cNvPr id="2" name="' << chart.title.text << '"/>'
+      str << '<xdr:cNvPr id="' << @anchor.drawing.index.to_s << '" name="' << 'item_' << @anchor.drawing.index.to_s << '"/>'
       str << '<xdr:cNvGraphicFramePr/>'
       str << '</xdr:nvGraphicFramePr>'
       str << '<xdr:xfrm>'

data/lib/axlsx/drawing/line_3D_chart.rb

@@ -70,7 +70,8 @@ module Axlsx
       @serAxis = SerAxis.new(@serAxId, @valAxId)
       super(frame, options)
       @series_type = LineSeries
-      @view3D = View3D.new({:perspective=>30}.merge(options))
+      @view_3D = View3D.new({:perspective=>30}.merge(options))
+      @d_lbls = nil
     end
 
     # @see grouping
@@ -94,14 +95,7 @@ module Axlsx
         str_inner << '<c:grouping val="' << grouping.to_s << '"/>'
         str_inner << '<c:varyColors val="1"/>'
         @series.each { |ser| ser.to_xml_string(str_inner) }
-        str_inner << '<c:dLbls>'
-        str_inner << '<c:showLegendKey val="0"/>'
-        str_inner << '<c:showVal val="0"/>'
-        str_inner << '<c:showCatName val="0"/>'
-        str_inner << '<c:showSerName val="0"/>'
-        str_inner << '<c:showPercent val="0"/>'
-        str_inner << '<c:showBubbleSize val="0"/>'
-        str_inner << '</c:dLbls>'
+        @d_lbls.to_xml_string(str) if @d_lbls
         str_inner << '<c:gapDepth val="' << @gapDepth.to_s << '"/>' unless @gapDepth.nil?
         str_inner << '<c:axId val="' << @catAxId.to_s << '"/>'
         str_inner << '<c:axId val="' << @valAxId.to_s << '"/>'
@@ -112,6 +106,5 @@ module Axlsx
         @serAxis.to_xml_string str_inner
       end
     end
-
   end
 end

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|
+        value = value.is_formula? ? 0 : value.value if value.is_a?(Cell)
+        @pt << NumVal.new(:v => value)
+      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_source.rb

@@ -0,0 +1,61 @@
+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] v 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
+
+    # serialize the object
+    # @param [String] str
+    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_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/pic.rb

@@ -90,8 +90,7 @@ module Axlsx
     # @return [String]
     def extname
       File.extname(image_src).delete('.') unless image_src.nil?
-    end
-
+    end 
     # The index of this image in the workbooks images collections
     # @return [Index]
     def index
@@ -113,27 +112,32 @@ module Axlsx
     # @param [Integer] v
     # @see OneCellAnchor.width
     def width
+      return unless @anchor.is_a?(OneCellAnchor)
       @anchor.width
     end
 
     # @see width
     def width=(v)
+      use_one_cell_anchor unless @anchor.is_a?(OneCellAnchor)
       @anchor.width = v
     end
 
     # providing access to update the anchor's height attribute
     # @param [Integer] v
     # @see OneCellAnchor.width
+    # @note this is a noop if you are using a TwoCellAnchor
     def height
       @anchor.height
     end
 
     # @see height
+    # @note This is a noop if you are using a TwoCellAnchor
     def height=(v)
+      use_one_cell_anchor unless @anchor.is_a?(OneCellAnchor)
       @anchor.height = v
     end
-
-    # This is a short cut method to set the start anchor position
+    
+       # This is a short cut method to set the start anchor position
     # If you need finer granularity in positioning use
     # graphic_frame.anchor.from.colOff / rowOff
     # @param [Integer] x The column
@@ -142,6 +146,18 @@ module Axlsx
     def start_at(x, y)
       @anchor.from.col = x
       @anchor.from.row = y
+      @anchor.from
+    end
+    
+    # noop if not using a two cell anchor
+    # @param [Integer] x The column
+    # @param [Integer] y The row
+    # @return [Marker]
+    def end_at(x, y)
+      use_two_cell_anchor unless @anchor.is_a?(TwoCellAnchor)
+      @anchor.to.col = x
+      @anchor.to.row = y
+      @anchor.to
     end
 
     # Serializes the object
@@ -162,6 +178,30 @@ module Axlsx
       str << '<a:prstGeom prst="rect"><a:avLst/></a:prstGeom></xdr:spPr></xdr:pic>'
 
     end
+     
+    private
+
+    # Changes the anchor to a one cell anchor.
+    def use_one_cell_anchor
+      return if @anchor.is_a?(OneCellAnchor)
+      swap_anchor(OneCellAnchor.new(@anchor.drawing, :from => @anchor.from))
+    end
+    
+    #changes the anchor type to a two cell anchor
+    def use_two_cell_anchor
+      return if @anchor.is_a?(TwoCellAnchor)
+      swap_anchor(TwoCellAnchor.new(@anchor.drawing)).tap do |new_anchor|
+        new_anchor.from.col = @anchor.from.col
+        new_anchor.from.row = @anchor.from.row
+      end
+    end
+
+    # refactoring of swapping code, law of demeter be damned!
+    def swap_anchor(new_anchor)
+      new_anchor.drawing.anchors.delete(new_anchor)
+      @anchor.drawing.anchors[@anchor.drawing.anchors.index(@anchor)] = new_anchor
+      @anchor = new_anchor
+    end
 
   end
 end

data/lib/axlsx/drawing/pie_3D_chart.rb

@@ -13,19 +13,20 @@ module Axlsx
     # @option options [Cell, String] title
     # @option options [Boolean] show_legend
     # @option options [Symbol] grouping
-    # @option options [String] gapDepth
-    # @option options [Integer] rotX
-    # @option options [String] hPercent
-    # @option options [Integer] rotY
-    # @option options [String] depthPercent
-    # @option options [Boolean] rAngAx
+    # @option options [String] gap_depth
+    # @option options [Integer] rot_x
+    # @option options [String] h_percent
+    # @option options [Integer] rot_y
+    # @option options [String] depth_percent
+    # @option options [Boolean] r_ang_ax
     # @option options [Integer] perspective
     # @see Chart
     # @see View3D
     def initialize(frame, options={})
       super(frame, options)
       @series_type = PieSeries
-      @view3D = View3D.new({:rotX=>30, :perspective=>30}.merge(options))
+      @view_3D = View3D.new({:rot_x =>30, :perspective=>30}.merge(options))
+      @d_lbls = nil
     end
 
     # Serializes the object
@@ -33,9 +34,11 @@ module Axlsx
     # @return [String]
     def to_xml_string(str = '')
       super(str) do |str_inner|
+
         str_inner << '<c:pie3DChart>'
         str_inner << '<c:varyColors val="1"/>'
         @series.each { |ser| ser.to_xml_string(str_inner) }
+        d_lbls.to_xml_string(str) if @d_lbls
         str_inner << '</c:pie3DChart>'
       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/scatter_chart.rb

@@ -29,6 +29,7 @@ module Axlsx
       @yValAxis = ValAxis.new(@yValAxId, @xValAxId)
       super(frame, options)
       @series_type = ScatterSeries
+      @d_lbls = nil
       options.each do |o|
         self.send("#{o[0]}=", o[1]) if self.respond_to? "#{o[0]}="
       end
@@ -44,24 +45,17 @@ module Axlsx
     # @param [String] str
     # @return [String]
     def to_xml_string(str = '')
-      super do |str|
-        str << '<c:scatterChart>'
-        str << '<c:scatterStyle val="' << scatterStyle.to_s << '"/>'
-        str << '<c:varyColors val="1"/>'
-        @series.each { |ser| ser.to_xml_string(str) }
-        str << '<c:dLbls>'
-        str << '<c:showLegendKey val="0"/>'
-        str << '<c:showVal val="0"/>'
-        str << '<c:showCatName val="0"/>'
-        str << '<c:showSerName val="0"/>'
-        str << '<c:showPercent val="0"/>'
-        str << '<c:showBubbleSize val="0"/>'
-        str << '</c:dLbls>'
-        str << '<c:axId val="' << @xValAxId.to_s << '"/>'
-        str << '<c:axId val="' << @yValAxId.to_s << '"/>'
-        str << '</c:scatterChart>'
-        @xValAxis.to_xml_string str
-        @yValAxis.to_xml_string str
+      super(str) do |str_inner|
+        str_inner << '<c:scatterChart>'
+        str_inner << '<c:scatterStyle val="' << scatterStyle.to_s << '"/>'
+        str_inner << '<c:varyColors val="1"/>'
+        @series.each { |ser| ser.to_xml_string(str_inner) }
+        d_lbls.to_xml_string(str) if @d_lbls
+        str_inner << '<c:axId val="' << @xValAxId.to_s << '"/>'
+        str_inner << '<c:axId val="' << @yValAxId.to_s << '"/>'
+        str_inner << '</c:scatterChart>'
+        @xValAxis.to_xml_string str_inner
+        @yValAxis.to_xml_string str_inner
       end
       str
     end

data/lib/axlsx/drawing/scatter_series.rb

@@ -16,13 +16,22 @@ module Axlsx
     # @return [NamedAxisData]
     attr_reader :yData
 
+    # 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 ScatterSeries
     def initialize(chart, options={})
       @xData, @yData = nil
       super(chart, options)
+      @xData = AxDataSource.new(:tag_name => :xVal, :data => options[:xData]) unless options[:xData].nil?
+      @yData = NumDataSource.new({:tag_name => :yVal, :data => options[:yData]}) unless options[:yData].nil?
+    end
 
-      @xData = NamedAxisData.new("xVal", options[:xData]) unless options[:xData].nil?
-      @yData = NamedAxisData.new("yVal", options[:yData]) unless options[:yData].nil?
+    # @see color
+    def color=(v)
+      @color = v
     end
 
     # Serializes the object
@@ -30,6 +39,23 @@ module Axlsx
     # @return [String]
     def to_xml_string(str = '')
       super(str) do |inner_str|
+        # needs to override the super color here to push in ln/and something else!
+        if color
+          str << '<c:spPr><a:solidFill>'
+          str << '<a:srgbClr val="' << color << '"/>'
+          str << '</a:solidFill>'
+          str << '<a:ln><a:solidFill>'
+          str << '<a:srgbClr val="' << color << '"/></a:solidFill></a:ln>'
+          str << '</c:spPr>'
+          str << '<c:marker>'
+          str << '<c:spPr><a:solidFill>'
+          str << '<a:srgbClr val="' << color << '"/>'
+          str << '</a:solidFill>'
+          str << '<a:ln><a:solidFill>'
+          str << '<a:srgbClr val="' << color << '"/></a:solidFill></a:ln>'
+          str << '</c:spPr>'
+          str << '</c:marker>'
+        end
         @xData.to_xml_string(inner_str) unless @xData.nil?
         @yData.to_xml_string(inner_str) unless @yData.nil?
       end

data/lib/axlsx/drawing/ser_axis.rb

@@ -20,7 +20,7 @@ module Axlsx
     # @option options [Integer] tickLblSkip
     # @option options [Integer] tickMarkSkip
     def initialize(axId, crossAx, options={})
-      @tickLblSkip, @tickMarkSkip = nil, nil
+      @tickLblSkip, @tickMarkSkip = 1, 1
       super(axId, crossAx, options)
     end
 

data/lib/axlsx/drawing/series.rb

@@ -27,6 +27,7 @@ module Axlsx
       end
     end
 
+
     # The index of this series in the chart's series.
     # @return [Integer]
     def index
@@ -66,7 +67,6 @@ module Axlsx
       yield str if block_given?
       str << '</c:ser>'
     end
-
   end
 
 end