write_xlsx 0.85.9 → 1.09.2

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 @@ module Writexlsx
         }
       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,33 @@ module Writexlsx
       # 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
       end
 
@@ -105,15 +120,15 @@ module Writexlsx
       # Write the <c:legend> element.
       #
       def write_legend
-        position = @legend_position
+        position = @legend.position
         allowed  = %w(right left top bottom)
-        delete_series = @legend_delete_series || []
+        delete_series = @legend.delete_series || []
 
-        if @legend_position =~ /^overlay_/
-          position = @legend_position.sub(/^overlay_/, '')
+        if @legend.position =~ /^overlay_/
+          position = @legend.position.sub(/^overlay_/, '')
           overlay = true
         else
-          position = @legend_position
+          position = @legend.position
           overlay = false
         end
 
@@ -127,11 +142,13 @@ module Writexlsx
           # Write the c:legendEntry element.
           delete_series.each { |index| write_legend_entry(index) }
           # Write the c:layout element.
-          write_layout(@legend_layout, 'legend')
+          write_layout(@legend.layout, 'legend')
           # Write the c:overlay element.
           write_overlay if overlay
+          # Write the c:spPr element.
+          write_sp_pr(@legend)
           # Write the c:txPr element. Over-ridden.
-          write_tx_pr_legend(0, @legend_font)
+          write_tx_pr_legend(0, @legend.font)
         end
       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'
@@ -17,21 +17,6 @@ require 'write_xlsx/utility'
 
 module Writexlsx
   class Chart
-    # The Scatter chart module also supports the following sub-types:
-    #
-    #     markers_only (the default)
-    #     straight_with_markers
-    #     straight
-    #     smooth_with_markers
-    #     smooth
-    # These can be specified at creation time via the add_chart() Worksheet
-    # method:
-    #
-    #     chart = workbook.add_chart(
-    #         :type    => 'scatter',
-    #         :subtype => 'straight_with_markers'
-    #     )
-    #
     class Scatter < self
       include Writexlsx::Utility
       include Writexlsx::WriteDPtPoint

data/lib/write_xlsx/chart/series.rb

@@ -8,22 +8,30 @@ module Writexlsx
       include Writexlsx::Utility
       include Writexlsx::Gradient
 
-      attr_reader :line, :fill, :type
+      attr_reader :line, :fill, :type, :gradient, :pattern
 
       def initialize(params)
         @line      = params[:line]
         @fill      = params[:fill]
+        @pattern   = params[:pattern]
+        @gradient  = params[:gradient]
         # Set the line properties for the marker..
         @line = line_properties(@line)
         # Allow 'border' as a synonym for 'line'.
         @line = line_properties(params[:border]) if params[:border]
-
-        # Set the gradient fill properties for the series.
-        @gradient = gradient_properties(params[:gradient])
-
         # Set the fill properties for the marker.
         @fill = fill_properties(@fill)
+        # Set the pattern properties for the series.
+        @pattern = pattern_properties(@pattern)
+        # Set the gradient fill properties for the series.
+        @gradient = gradient_properties(@gradient)
+        # Pattern fill overrides solid fill.
         @fill = nil if ptrue?(@gradient)
+        # Gradient fill overrides solid and pattern fills.
+        if ptrue?(@gradient)
+          @pattern = nil
+          @fill    = nil
+        end
       end
 
       def line_defined?
@@ -49,16 +57,20 @@ module Writexlsx
 
     class Trendline < Chartline
       attr_reader :name, :forward, :backward, :order, :period
+      attr_reader :intercept, :display_equation, :display_r_squared
 
       def initialize(params)
         super(params)
 
-        @name     = params[:name]
-        @forward  = params[:forward]
-        @backward = params[:backward]
-        @order    = params[:order]
-        @period   = params[:period]
-        @type     = value_or_raise(types, params[:type], 'trendline type')
+        @name              = params[:name]
+        @forward           = params[:forward]
+        @backward          = params[:backward]
+        @order             = params[:order]
+        @period            = params[:period]
+        @intercept         = params[:intercept]
+        @display_equation  = params[:display_equation]
+        @display_r_squared = params[:display_r_squared]
+        @type              = value_or_raise(types, params[:type], 'trendline type')
       end
 
       private
@@ -170,7 +182,7 @@ module Writexlsx
       include Writexlsx::Gradient
 
       attr_reader :values, :categories, :name, :name_formula, :name_id
-      attr_reader :cat_data_id, :val_data_id, :fill, :gradient
+      attr_reader :cat_data_id, :val_data_id, :fill, :pattern, :gradient
       attr_reader :trendline, :smooth, :labels, :invert_if_negative
       attr_reader :x2_axis, :y2_axis, :error_bars, :points
       attr_accessor :line, :marker
@@ -180,17 +192,25 @@ module Writexlsx
         @values     = aref_to_formula(params[:values])
         @categories = aref_to_formula(params[:categories])
         @name, @name_formula =
-          chart.process_names(params[:name], params[:name_formula])
+               chart.process_names(params[:name], params[:name_formula])
 
         set_data_ids(params)
 
-        @line = line_properties(params[:border] || params[:line])
-        @fill = fill_properties(params[:fill])
-
+        @line       = line_properties(params[:border] || params[:line])
+        @fill       = fill_properties(params[:fill])
+        @pattern    = pattern_properties(params[:pattern])
         @gradient   = gradient_properties(params[:gradient])
-        @fill       = nil if ptrue?(@gradient)
+        # Pattern fill overrides solid fill.
+        @fill       = nil if ptrue?(@pattern)
+        # Gradient fill overrides solid and patter fills.
+        if ptrue?(@gradient)
+          @pattern = nil
+          @fill    = nil
+        end
 
+        # Set the marker properties for the series.
         @marker     = Marker.new(params[:marker]) if params[:marker]
+        # Set the trendline properties for the series.
         @trendline  = Trendline.new(params[:trendline]) if params[:trendline]
         @error_bars = errorbars(params[:x_error_bars], params[:y_error_bars])
         @points     = params[:points].collect { |p| p ? Point.new(p) : p } if params[:points]
@@ -276,8 +296,108 @@ module Writexlsx
           labels[:separator] = separators[separator]
         end
 
+
+        # Set the line properties for the data labels.
+        line = line_properties( labels[:line] )
+
+        # Allow 'border' as a synonym for 'line'.
+        if labels[:border]
+          line = line_properties(labels[:border])
+        end
+
+        # Set the fill properties for the labels.
+        fill = fill_properties(labels[:fill])
+
+        # Set the pattern properties for the labels.
+        pattern = pattern_properties(labels[:pattern])
+
+        # Set the gradient fill properties for the labels.
+        gradient = gradient_properties(labels[:gradient])
+
+        # Pattern fill overrides solid fill.
+        if pattern
+          fill = nil
+        end
+
+        # Gradient fill overrides solid and pattern fills.
+        if gradient
+          pattern = nil
+          fill    = nil
+        end
+
+        labels[:line]     = line
+        labels[:fill]     = fill
+        labels[:pattern]  = pattern
+        labels[:gradient] = gradient
+
         if labels[:font]
-          labels[:font] = @chart.convert_font_args(labels[:font])
+          labels[:font] = convert_font_args(labels[:font])
+        end
+
+        if labels[:custom]
+          # Duplicate, and modify, the custom label properties.
+          custom = []
+
+          labels[:custom].each do |label|
+            if !label
+              custom << nil
+              next
+            end
+
+            property = label.dup
+
+            # Convert formula.
+            if property[:value] && property[:value] =~ /^=[^!]+!\$/
+              property[:formula] = property[:value]
+            end
+
+            if property[:formula]
+              property[:formula] = property[:formula].sub(/^=/, '')
+
+              data_id = @chart.data_id(property[:formula], property[:data])
+              property[:data_id] = data_id
+            end
+
+            if property[:font]
+              property[:font] = convert_font_args(property[:font])
+            end
+
+            # Allow 'border' as a synonym for 'line'.
+            if property[:border]
+              line = line_properties(property[:border])
+            else
+              # Set the line properties for the data labels.
+              line = line_properties(property[:line])
+            end
+
+            # Set the fill properties for the labels.
+            fill = fill_properties(property[:fill])
+
+            # Set the pattern properties for the labels.
+            pattern = pattern_properties(property[:pattern])
+
+            # Set the gradient fill properties for the labels.
+            gradient = gradient_properties(property[:gradient])
+
+            # Pattern fill overrides solid fill.
+            if pattern
+              fill = nil
+            end
+
+            # Gradient fill overrides solid and pattern fills.
+            if gradient
+              pattern = nil
+              fill    = nil
+            end
+
+            property[:line]     = line
+            property[:fill]     = fill
+            property[:pattern]  = pattern
+            property[:gradient] = gradient
+
+            custom << property
+          end
+          labels[:custom] = custom
         end
 
         labels

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'