write_xlsx 1.00.0 → 1.01.0

data/examples/sparklines1.rb

@@ -10,7 +10,7 @@
 # of more complex sparkline formatting.
 #
 # reverse ('(c)'), November 2011, John McNamara, jmcnamara@cpan.org
-# convert to ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
+# convert to ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
 #
 
 require 'write_xlsx'

data/examples/sparklines2.rb

@@ -10,7 +10,7 @@
 # options that can be applied to sparklines.
 #
 # reverse ('(c)'), November 2011, John McNamara, jmcnamara@cpan.org
-# convert to ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
+# convert to ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
 #
 
 require 'write_xlsx'

data/examples/stats.rb

@@ -6,7 +6,7 @@
 # A Simple example of how to use functions with the WriteXLSX gem.
 #
 # reverse(c), March 2001, John McNamara, jmcnamara@cpan.org
-# convert to ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
+# convert to ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
 #
 
 require 'write_xlsx'

data/examples/stats_ext.rb

@@ -9,7 +9,7 @@
 # other worksheets within the same workbook.
 #
 # reverse(c), March 2001, John McNamara, jmcnamara@cpan.org
-# convert to ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
+# convert to ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
 #
 
 require 'write_xlsx'

data/examples/stocks.rb

@@ -9,7 +9,7 @@
 # with colours to indicate if a share price has gone up or down.
 #
 # reverse(c), March 2001, John McNamara, jmcnamara@cpan.org
-# convert to ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
+# convert to ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
 #
 
 require 'write_xlsx'

data/examples/tab_colors.rb

@@ -5,7 +5,7 @@
 # Example of how to set Excel worksheet tab colours.
 #
 # reverse(c), May 2006, John McNamara, jmcnamara@cpan.org
-# convert to ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
+# convert to ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
 #
 
 require 'write_xlsx'

data/examples/tables.rb

@@ -9,7 +9,7 @@
 # structure that can be references in a formula or formatted collectively.
 #
 # reverse(c), March 2001, John McNamara, jmcnamara@cpan.org
-# convert to ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
+# convert to ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
 #
 
 require 'write_xlsx'

data/lib/write_xlsx/chart.rb

@@ -1178,8 +1178,8 @@ def write_cat_axis(params) # :nodoc:
       return unless axis_ids
       return if axis_ids.empty?
 
-      position = @cat_axis_position
-      horiz    = @horiz_cat_axis
+      position  = @cat_axis_position
+      is_y_axis = @horiz_cat_axis
 
       # Overwrite the default axis position with a user supplied value.
       position = x_axis.position || position
@@ -1202,9 +1202,9 @@ def write_cat_axis(params) # :nodoc:
 
         # Write the axis title elements.
         if x_axis.formula
-          write_title_formula(x_axis, horiz, @x_axis, x_axis.layout)
+          write_title_formula(x_axis, is_y_axis, @x_axis, x_axis.layout)
         elsif x_axis.name
-          write_title_rich(x_axis, horiz, x_axis.layout)
+          write_title_rich(x_axis, is_y_axis, x_axis.layout)
         end
 
         # Write the c:numFmt element.
@@ -1808,10 +1808,10 @@ def write_auto_title_deleted
     #
     # Write the <c:title> element for a rich string.
     #
-    def write_title_rich(title, horiz = nil, layout = nil, overlay = nil) # :nodoc:
+    def write_title_rich(title, is_y_axis = nil, layout = nil, overlay = nil) # :nodoc:
       @writer.tag_elements('c:title') do
         # Write the c:tx element.
-        write_tx_rich(title, horiz)
+        write_tx_rich(title, is_y_axis)
         # Write the c:layout element.
         write_layout(layout, 'text')
         # Write the c:overlay element.
@@ -1822,7 +1822,7 @@ def write_title_rich(title, horiz = nil, layout = nil, overlay = nil) # :nodoc:
     #
     # Write the <c:title> element for a rich string.
     #
-    def write_title_formula(title, horiz = nil, axis = nil, layout = nil, overlay = nil) # :nodoc:
+    def write_title_formula(title, is_y_axis = nil, axis = nil, layout = nil, overlay = nil) # :nodoc:
       @writer.tag_elements('c:title') do
         # Write the c:tx element.
         write_tx_formula(title.formula, axis ? axis.data_id : title.data_id)
@@ -1831,15 +1831,15 @@ def write_title_formula(title, horiz = nil, axis = nil, layout = nil, overlay =
         # Write the c:overlay element.
         write_overlay if overlay
         # Write the c:txPr element.
-        write_tx_pr(horiz, axis ? axis.name_font : title.name_font)
+        write_tx_pr(is_y_axis, axis ? axis.name_font : title.name_font)
       end
     end
 
     #
     # Write the <c:tx> element.
     #
-    def write_tx_rich(title, horiz) # :nodoc:
-      @writer.tag_elements('c:tx') { write_rich(title, horiz) }
+    def write_tx_rich(title, is_y_axis) # :nodoc:
+      @writer.tag_elements('c:tx') { write_rich(title, is_y_axis) }
     end
 
     #
@@ -1861,14 +1861,14 @@ def write_tx_formula(title, data_id) # :nodoc:
     #
     # Write the <c:rich> element.
     #
-    def write_rich(title, horiz) # :nodoc:
+    def write_rich(title, is_y_axis) # :nodoc:
       rotation = nil
       if title.name_font && title.name_font[:_rotation]
         rotation = title.name_font[:_rotation]
       end
       @writer.tag_elements('c:rich') do
         # Write the a:bodyPr element.
-        write_a_body_pr(rotation, horiz)
+        write_a_body_pr(rotation, is_y_axis)
         # Write the a:lstStyle element.
         write_a_lst_style
         # Write the a:p element.
@@ -2241,7 +2241,12 @@ def write_num_base(tag, data)
         write_format_code('General')
 
         # Write the c:ptCount element.
-        write_pt_count(data.size)
+        if data
+          count = data.size
+        else
+          count = 0
+        end
+        write_pt_count(count)
 
         data.each_with_index do |token, i|
           # Write non-numeric data as 0.

data/lib/write_xlsx/chart/area.rb

@@ -8,7 +8,7 @@
 # See formatting note in Chart.
 #
 # Copyright 2000-2011, John McNamara, jmcnamara@cpan.org
-# Convert to ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
+# Convert to ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
 #
 
 require 'write_xlsx/package/xml_writer_simple'

data/lib/write_xlsx/chart/bar.rb

@@ -8,7 +8,7 @@
 # See formatting note in Chart.
 #
 # Copyright 2000-2011, John McNamara, jmcnamara@cpan.org
-# Convert to ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
+# Convert to ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
 #
 
 require 'write_xlsx/package/xml_writer_simple'

data/lib/write_xlsx/chart/column.rb

@@ -8,7 +8,7 @@
 # See formatting note in Chart.
 #
 # Copyright 2000-2011, John McNamara, jmcnamara@cpan.org
-# Convert to ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
+# Convert to ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
 #
 
 require 'write_xlsx/package/xml_writer_simple'

data/lib/write_xlsx/chart/doughnut.rb

@@ -8,7 +8,7 @@
 # See formatting note in Excel::Writer::XLSX::Chart.
 #
 # Copyright 2000-2014, John McNamara, jmcnamara@cpan.org
-# Convert to ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
+# Convert to ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
 #
 
 require 'write_xlsx/package/xml_writer_simple'

data/lib/write_xlsx/chart/line.rb

@@ -8,7 +8,7 @@
 # See formatting note in Chart.
 #
 # Copyright 2000-2011, John McNamara, jmcnamara@cpan.org
-# Convert to ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
+# Convert to ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
 #
 
 require 'write_xlsx/package/xml_writer_simple'

data/lib/write_xlsx/chart/pie.rb

@@ -8,7 +8,7 @@
 # See formatting note in Chart.
 #
 # Copyright 2000-2011, John McNamara, jmcnamara@cpan.org
-# Convert to ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
+# Convert to ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
 #
 
 require 'write_xlsx/package/xml_writer_simple'
@@ -42,13 +42,6 @@ def initialize(subtype)
         }
       end
 
-      #
-      # Override parent method to add a warning.
-      #
-      def combine(chart)
-        raise "Combined chart not currently supported for Pie charts"
-      end
-
       #
       # Set the Pie/Doughnut chart rotation: the angle of the first slice.
       #
@@ -91,11 +84,31 @@ def write_pie_chart
       # Write the <c:plotArea> element.
       #
       def write_plot_area
+        second_chart = @combined
+
         @writer.tag_elements('c:plotArea') do
           # Write the c:layout element.
           write_layout(@plotarea.layout, 'plot')
           # Write the subclass chart type element.
           write_chart_type
+          # Configure a combined chart if present.
+          if second_chart
+            # Secondary axis has unique id otherwise use same as primary.
+            if second_chart.is_secondary?
+              second_chart.id = 1000 + @id
+            else
+              second_chart.id = @id
+            end
+
+            # Share the same filehandle for writing
+            second_chart.writer = @writer
+
+            # Share series index with primary chart.
+            second_chart.series_index = @series_index
+
+            # Write the subclass chart type elements for combined chart.
+            second_chart.write_chart_type
+          end
           # Write the c:spPr eleent for the plotarea formatting.
           write_sp_pr(@plotarea)
         end

data/lib/write_xlsx/chart/radar.rb

@@ -8,7 +8,7 @@
 # See formatting note in Chart.
 #
 # Copyright 2000-2012, John McNamara, jmcnamara@cpan.org
-# Convert to ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
+# Convert to ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
 #
 
 require 'write_xlsx/package/xml_writer_simple'

data/lib/write_xlsx/chart/scatter.rb

@@ -8,7 +8,7 @@
 # See formatting note in Chart.
 #
 # Copyright 2000-2011, John McNamara, jmcnamara@cpan.org
-# Convert to ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
+# Convert to ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
 #
 
 require 'write_xlsx/package/xml_writer_simple'

data/lib/write_xlsx/chart/stock.rb

@@ -8,7 +8,7 @@
 # See formatting note in Chart.
 #
 # Copyright 2000-2011, John McNamara, jmcnamara@cpan.org
-# Convert to ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
+# Convert to ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
 #
 
 require 'write_xlsx/package/xml_writer_simple'

data/lib/write_xlsx/chartsheet.rb

@@ -6,7 +6,7 @@
 # Used in conjunction with WriteXLSX
 #
 # Copyright 2000-2011, John McNamara, jmcnamara@cpan.org
-# Convert to ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
+# Convert to ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
 #
 
 require 'write_xlsx/worksheet'
@@ -19,7 +19,7 @@ class Chartsheet < Worksheet
 
     def initialize(workbook, index, name)
       super
-      @drawing           = Drawing.new
+      @drawings          = Drawings.new
       @is_chartsheet     = true
       @chart             = nil
       @charts            = [1]
@@ -176,9 +176,9 @@ def set_high_low_lines(*args)
     def prepare_chart(index, chart_id, drawing_id) # :nodoc:
       @chart.id = chart_id - 1
 
-      drawing = Drawing.new
-      @drawing = drawing
-      @drawing.orientation = @page_setup.orientation
+      drawings  = Drawings.new
+      @drawings = drawings
+      @drawings.orientation = @page_setup.orientation
 
       @external_drawing_links << [ '/drawing', "../drawings/drawing#{drawing_id}.xml" ]
 

data/lib/write_xlsx/drawing.rb

@@ -4,6 +4,15 @@
 
 module Writexlsx
   class Drawing
+    attr_accessor :type, :dimensions, :width, :height, :name, :shape, :anchor
+
+    def initialize(type, dimensions, width, height, name, shape, anchor)
+      @type, @dimensions, @width, @height, @name, @shape, @anchor =
+        type, dimensions, width, height, name, shape, anchor
+    end
+  end
+
+  class Drawings
     include Writexlsx::Utility
 
     attr_writer :embedded, :orientation
@@ -32,10 +41,10 @@ def assemble_xml_file
         write_drawing_workspace do
           if @embedded
             index = 0
-            @drawings.each do |dimensions|
+            @drawings.each do |drawing|
               # Write the xdr:twoCellAnchor element.
               index += 1
-              write_two_cell_anchor(index, *(dimensions.flatten))
+              write_two_cell_anchor(index, drawing)
             end
           else
             # Write the xdr:absoluteAnchor element.
@@ -48,8 +57,8 @@ def assemble_xml_file
     #
     # Add a chart, image or shape sub object to the drawing.
     #
-    def add_drawing_object(*args)
-      @drawings << args.flatten
+    def add_drawing_object(drawing)
+      @drawings << drawing
     end
 
     private
@@ -71,14 +80,25 @@ def write_drawing_workspace
     # Write the <xdr:twoCellAnchor> element.
     #
     def write_two_cell_anchor(*args)
-      index, type, col_from, row_from, col_from_offset, row_from_offset,
-      col_to, row_to, col_to_offset, row_to_offset, col_absolute, row_absolute,
-      width, height, description, shape = args
+      index, drawing = args
+
+      type = drawing.type
+      width = drawing.width
+      height = drawing.height
+      description = drawing.name
+      shape = drawing.shape
+      anchor = drawing.anchor
+      col_from, row_from, col_from_offset, row_from_offset,
+      col_to, row_to, col_to_offset, row_to_offset, col_absolute, row_absolute = drawing.dimensions
 
       attributes      = []
 
       # Add attribute for images.
-      attributes << [:editAs, 'oneCell'] if type == 2
+      if anchor == 2
+        attributes << [:editAs, 'oneCell']
+      elsif anchor == 3
+        attributes << [:editAs, 'absolute']
+      end
 
       # Add attribute for shapes.
       attributes << [:editAs, shape.edit_as] if shape && shape.edit_as

data/lib/write_xlsx/package/comments.rb

@@ -257,13 +257,9 @@ def [](row)
         @comments[row]
       end
 
-      def add(comment)
-        if @comments[comment.row]
-          @comments[comment.row][comment.col] = comment
-        else
-          @comments[comment.row] = {}
-          @comments[comment.row][comment.col] = comment
-        end
+      def add(workbook, worksheet, row, col, string, options)
+        @comments[row] ||= {}
+        @comments[row][col] = [workbook, worksheet, row, col, string, options]
       end
 
       def empty?
@@ -293,6 +289,10 @@ def sorted_comments
           # We sort the comments by row and column but that isn't strictly required.
           @comments.keys.sort.each do |row|
             @comments[row].keys.sort.each do |col|
+              user_options = @comments[row][col]
+              comment = Comment.new(*user_options)
+              @comments[row][col] = comment
+
               # Set comment visibility if required and not already user defined.
               @comments[row][col].visible ||= 1 if comments_visible?
 

data/lib/write_xlsx/shape.rb

@@ -8,14 +8,14 @@ module Writexlsx
   # Used in conjunction with WriteXLSX.
   #
   # Copyright 2000-2012, John McNamara, jmcnamara@cpan.org
-  # Converted to ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
+  # Converted to ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
   #
   class Shape
     include Writexlsx::Utility
 
     attr_reader :edit_as, :type, :drawing
     attr_reader :tx_box, :fill, :line, :format
-    attr_reader :align, :valign
+    attr_reader :align, :valign, :anchor
     attr_accessor :name, :connect, :type, :id, :start, :end, :rotation
     attr_accessor :flip_h, :flip_v, :adjustments, :palette, :text, :stencil
     attr_accessor :row_start, :row_end, :column_start, :column_end
@@ -183,11 +183,12 @@ def calc_position_emus(worksheet)
       @y_abs = (y_abslt * 9_525).to_i
     end
 
-    def set_position(row_start, column_start, x_offset, y_offset, x_scale, y_scale)
+    def set_position(row_start, column_start, x_offset, y_offset, x_scale, y_scale, anchor)
       @row_start    = row_start
       @column_start = column_start
       @x_offset     = x_offset || 0
       @y_offset     = y_offset || 0
+      @anchor       = anchor   || 1
 
       # Override shape scale if supplied as an argument. Otherwise, use the
       # existing shape scale factors.