write_xlsx 0.0.4 → 0.51.0

data/lib/write_xlsx/chart/area.rb

@@ -20,30 +20,64 @@ class Chart
     class Area < self
       include Writexlsx::Utility
 
-      def initialize
-        super(self.class)
+      def initialize(subtype)
+        super(subtype)
+        @subtype = subtype || 'standard'
         @cross_between = 'midCat'
+        @show_crosses  = false
       end
 
       #
       # Override the virtual superclass method with a chart specific method.
       #
-      def write_chart_type
+      def write_chart_type(params)
         # Write the c:areaChart element.
-        write_area_chart
+        write_area_chart(params)
       end
 
       #
       # Write the <c:areaChart> element.
       #
-      def write_area_chart
+      def write_area_chart(params)
+        series = axes_series(params)
+        return if series.empty?
+
+        if @subtype == 'percent_stacked'
+          subtype = 'percentStacked'
+        else
+          subtype = @subtype
+        end
         @writer.tag_elements('c:areaChart') do
           # Write the c:grouping element.
-          write_grouping('standard')
+          write_grouping(subtype)
           # Write the series elements.
-          write_series
+          series.each {|s| write_series(s)}
+
+          # Write the c:marker element.
+          write_marker_value
+
+          # Write the c:axId elements
+          write_axis_ids(params)
         end
       end
+
+      #
+      # Over-ridden to add % format. TODO. This will be refactored back up to the
+      # SUPER class later.
+      #
+      # Write the <C:numFmt> element.
+      #
+      def write_number_format(format_code = nil)
+        source_linked = 1
+        format_code = 'General' if !format_code || format_code.empty?
+        format_code = '0%' if @subtype == 'percent_stacked'
+
+        attributes = [
+                      'formatCode',   format_code,
+                      'sourceLinked', source_linked
+                     ]
+        @writer.empty_tag('c:numFmt', attributes)
+      end
     end
   end
 end

data/lib/write_xlsx/chart/bar.rb

@@ -19,24 +19,33 @@ class Chart
     class Bar < self
       include Writexlsx::Utility
 
-      def initialize
-        super(self.class)
-        @subtype = 'clustered'
+      def initialize(subtype)
+        super(subtype)
+        @subtype = subtype || 'clustered'
         @cat_axis_position = 'l'
         @val_axis_position = 'b'
         @horiz_val_axis    = 0
         @horiz_cat_axis    = 1
+        @show_crosses      = false
       end
 
       #
       # Override the virtual superclass method with a chart specific method.
       #
-      def write_chart_type
-        # Reverse X and Y axes for Bar charts.
-        @x_axis, @y_axis = @y_axis, @x_axis
+      def write_chart_type(params)
+        if params[:primary_axes] != 0
+          ## Reverse X and Y axes for Bar charts.
+          @y_axis, @x_axis = @x_axis, @y_axis
+          if !@y_axis[:_major_gridlines]
+            @y_axis[:_major_gridlines] = {:show => 1}
+          end
+          if @y2_axis[:_position] == 'r'
+            @y2_axis[:_position] = 't'
+          end
+        end
 
         # Write the c:barChart element.
-        write_bar_chart
+        write_bar_chart(params)
       end
 
       #
@@ -50,16 +59,6 @@ def write_bar_dir
         @writer.empty_tag('c:barDir', attributes)
       end
 
-      #
-      # Over-ridden to add c:overlap.
-      #
-      # Write the series elements.
-      #
-      def write_series
-        write_series_base {write_overlap if @subtype =~ /stacked/}
-      end
-
-
       #
       # Over-ridden to add % format. TODO. This will be refactored back up to the
       # SUPER class later.

data/lib/write_xlsx/chart/column.rb

@@ -28,18 +28,18 @@ class Chart
     class Column < self
       include Writexlsx::Utility
 
-      def initialize
-        super(self.class)
-        @subtype = 'clustered'
+      def initialize(subtype)
+        super(subtype)
+        @subtype = subtype || 'clustered'
         @horiz_val_axis = 0
       end
 
       #
       # Override the virtual superclass method with a chart specific method.
       #
-      def write_chart_type
+      def write_chart_type(params)
         # Write the c:barChart element.
-        write_bar_chart
+        write_bar_chart(params)
       end
 
       #
@@ -53,16 +53,6 @@ def write_bar_dir
         @writer.empty_tag('c:barDir', attributes)
       end
 
-
-      #
-      # Over-ridden to add c:overlap.
-      #
-      # Write the series elements.
-      #
-      def write_series
-        write_series_base {write_overlap if @subtype =~ /stacked/}
-      end
-
       #
       # Over-ridden to add % format. TODO. This will be refactored back up to the
       # SUPER class later.

data/lib/write_xlsx/chart/line.rb

@@ -19,28 +19,37 @@ class Chart
     class Line < self
       include Writexlsx::Utility
 
-      def initialize
-        super(self.class)
+      def initialize(subtype)
+        super(subtype)
         @default_marker = {:type => 'none'}
       end
 
       #
       # Override the virtual superclass method with a chart specific method.
       #
-      def write_chart_type
+      def write_chart_type(params)
         # Write the c:barChart element.
-        write_line_chart
+        write_line_chart(params)
       end
 
       #
       # Write the <c:lineChart> element.
       #
-      def write_line_chart
+      def write_line_chart(params)
+        series = axes_series(params)
+        return if series.empty?
+
         @writer.tag_elements('c:lineChart') do
           # Write the c:grouping element.
           write_grouping('standard')
           # Write the series elements.
-          write_series
+          series.each {|s| write_series(s)}
+
+          # Write the c:marker element.
+          write_marker_value
+
+          # Write the c:axId elements
+          write_axis_ids(params)
         end
       end
     end

data/lib/write_xlsx/chart/pie.rb

@@ -26,28 +26,29 @@ class Chart
     class Pie < self
       include Writexlsx::Utility
 
-      def initialize
-        super(self.class)
+      def initialize(subtype)
+        super(subtype)
         @vary_data_color = 1
       end
 
       #
       # Override the virtual superclass method with a chart specific method.
       #
-      def write_chart_type
+      def write_chart_type(params = {})
         # Write the c:areaChart element.
         write_pie_chart
       end
 
       #
-      # Write the <c:pieChart> element.
+      # Write the <c:pieChart> element. Over-ridden method to remove axis_id code
+      # since pie charts don't require val and vat axes.
       #
       def write_pie_chart
         @writer.tag_elements('c:pieChart') do
           # Write the c:varyColors element.
           write_vary_colors
           # Write the series elements.
-          write_series
+          @series.each {|s| write_series(s)}
           # Write the c:firstSliceAng element.
           write_first_slice_ang
         end
@@ -68,21 +69,6 @@ def write_plot_area
         end
       end
 
-      #
-      # Over-ridden method to remove axis_id code since Pie charts  don't require
-      # val and cat axes.
-      #
-      # Write the series elements.
-      #
-      def write_series
-        # Write each series with subelements.
-        index = 0
-        @series.each do |series|
-          write_ser(index, series)
-          index += 1
-        end
-      end
-
       #
       # Over-ridden method to add <c:txPr> to legend.
       #
@@ -90,7 +76,7 @@ def write_series
       #
       def write_legend
         position = @legend_position
-        overlay = 0
+        overlay  = 0
 
         if position =~ /^overlay_/
           positon.sub!(/^overlay_/, '')

data/lib/write_xlsx/chart/scatter.rb

@@ -35,25 +35,33 @@ class Chart
     class Scatter < self
       include Writexlsx::Utility
 
-      def initialize
-        super(self.class)
-        @subtype        = 'marker_only'
-        @cross_between  = 'midCat'
-        @horiz_val_axis = 0
+      def initialize(subtype)
+        super(subtype)
+        @subtype           = subtype || 'marker_only'
+        @cross_between     = 'midCat'
+        @horiz_val_axis    = 0
+        @val_axis_position = 'b'
       end
 
       #
       # Override the virtual superclass method with a chart specific method.
       #
-      def write_chart_type
+      def write_chart_type(params)
         # Write the c:areaChart element.
-        write_scatter_chart
+        write_scatter_chart(params)
       end
 
       #
-      # Write the <c:pieChart> element.
+      # Write the <c:scatterChart> element.
       #
-      def write_scatter_chart
+      def write_scatter_chart(params)
+        if params[:primary_axes] == 1
+          series = get_primary_axes_series
+        else
+          series = get_secondary_axes_series
+        end
+        return if series.empty?
+
         style   = 'lineMarker'
         subtype = @subtype
 
@@ -72,7 +80,13 @@ def write_scatter_chart
           # Write the c:scatterStyle element.
           write_scatter_style(style)
           # Write the series elements.
-          write_series
+          series.each {|s| write_series(s)}
+
+          # Write the c:marker element.
+          write_marker_value
+
+          # Write the c:axId elements
+          write_axis_ids(params)
         end
       end
 
@@ -81,7 +95,10 @@ def write_scatter_chart
       #
       # Write the <c:ser> element.
       #
-      def write_ser(index, series)
+      def write_ser(series)
+        index = @series_index
+        @series_index += 1
+
         @writer.tag_elements('c:ser') do
           # Write the c:idx element.
           write_idx(index)
@@ -116,14 +133,42 @@ def write_plot_area
         @writer.tag_elements('c:plotArea') do
           # Write the c:layout element.
           write_layout
-          # Write the subclass chart type element.
-          write_chart_type
-          # Write the c:catAx element.
-          write_cat_val_axis('b', 1)
-          # Write the c:catAx element.
+
+          # Write the subclass chart type elements for primary and secondary axes
+          write_chart_type(:primary_axes => 1)
+          write_chart_type(:primary_axes => 0)
+
+          # Write c:catAx and c:valAx elements for series using primary axes
+          write_cat_val_axis(
+                             :x_axis   => @x_axis,
+                             :y_axis   => @y_axis,
+                             :axis_ids => @axis_ids,
+                             :position => 'b'
+                             )
+          tmp = @horiz_val_axis
           @horiz_val_axis = 1
+          write_val_axis(
+                         :x_axis   => @x_axis,
+                         :y_axis   => @y_axis,
+                         :axis_ids => @axis_ids,
+                         :position => 'l'
+                         )
+          @horiz_val_axis = tmp
 
-          write_val_axis('l')
+          # Write c:valAx and c:catAx elements for series using secondary axes
+          write_cat_val_axis(
+                             :x_axis   => @x2_axis,
+                             :y_axis   => @y2_axis,
+                             :axis_ids => @axis2_ids,
+                             :position => 'b'
+                             )
+          @horiz_val_axis = 1
+          write_val_axis(
+                         :x_axis   => @x2_axis,
+                         :y_axis   => @y2_axis,
+                         :axis_ids => @axis2_ids,
+                         :position => 'l'
+                         )
         end
       end
 
@@ -131,14 +176,39 @@ def write_plot_area
       # Write the <c:xVal> element.
       #
       def write_x_val(series)
-        write_val_base(series[:_categories], series[:_cat_data_id], 'c:xVal')
+        formula = series[:_categories]
+        data_id = series[:_cat_data_id]
+        data    = @formula_data[data_id]
+
+        @writer.tag_elements('c:xVal') do
+          # Check the type of cached data.
+          type = get_data_type(data)
+
+          # TODO. Can a scatter plot have non-numeric data.
+
+          if type == 'str'
+            # Write the c:numRef element.
+            write_str_ref(formula, data, type)
+          else
+            write_num_ref(formula, data, type)
+          end
+        end
       end
 
       #
       # Write the <c:yVal> element.
       #
       def write_y_val(series)
-        write_val_base(series[:_values], series[:_val_data_id], 'c:yVal')
+        formula = series[:_values]
+        data_id = series[:_val_data_id]
+        data    = @formula_data[data_id]
+
+        @writer.tag_elements('c:yVal') do
+          # Unlike Cat axes data should only be numeric
+
+          # Write the c:numRef element.
+          write_num_ref(formula, data, 'num')
+        end
       end
 
       #
@@ -187,7 +257,7 @@ def modify_series_formatting
           # Go through each series and define default values.
           @series.each do |series|
             # Set a marker type unless there is already a user defined type.
-            if series[:_marker][:_defined] == 0
+            if !series[:_marker] || series[:_marker][:_defined] == 0
               series[:_marker] = { :type => 'none', :_defined => 1 }
             end
           end

data/lib/write_xlsx/chart/stock.rb

@@ -24,73 +24,54 @@ class Chart
     class Stock < self
       include Writexlsx::Utility
 
-      def initialize
-        super(self.class)
+      def initialize(subtype)
+        super(subtype)
+        @show_crosses = false
       end
 
       #
       # Override the virtual superclass method with a chart specific method.
       #
-      def write_chart_type
+      def write_chart_type(params)
         # Write the c:areaChart element.
-        write_stock_chart
+        write_stock_chart(params)
       end
 
       #
       # Write the <c:stockChart> element.
+      # Overridden to add hi_low_lines(). TODO. Refactor up into the SUPER class
       #
-      def write_stock_chart
+      def write_stock_chart(params)
+        if params[:primary_axes] == 1
+          series = get_primary_axes_series
+        else
+          series = get_secondary_axes_series
+        end
+        return if series.empty?
+
         # Add default formatting to the series data.
         modify_series_formatting
 
         @writer.tag_elements('c:stockChart') do
           # Write the series elements.
-          write_series
-        end
-      end
+          series.each {|s| write_series(s)}
 
-      #
-      # Over-ridden to add hi_low_lines(). TODO. Refactor up into the SUPER class.
-      #
-      # Write the series elements.
-      #
-      def write_series
-        # Write each series with subelements.
-        index = 0
-        @series.each do |series|
-          write_ser(index, series)
-          index += 1
-        end
-
-        # Write the c:hiLowLines element.
-        write_hi_low_lines
+          # Write the c:hiLowLines element.
+          write_hi_low_lines if params[:primary_axes] == 1
 
-        # Write the c:marker element.
-        write_marker_value
+          # Write the c:marker element.
+          write_marker_value
 
-        # Generate the axis ids.
-        add_axis_id
-        add_axis_id
-
-        # Write the c:axId element.
-        write_axis_id(@axis_ids[0])
-        write_axis_id(@axis_ids[1])
+          # Write the c:axId elements
+          write_axis_ids(params)
+        end
       end
 
       #
-      # Write the <c:plotArea> element.
+      # Overridden to use write_date_axis() instead of write_cat_axis().
       #
       def write_plot_area
-        @writer.tag_elements('c:plotArea') do 
-          # Write the c:layout element.
-          write_layout
-          # Write the subclass chart type element.
-          write_chart_type
-          # Write the c:dateAx element.
-          write_date_axis
-          # Write the c:catAx element.
-          write_val_axis
-        end
+        write_plot_area_base(:stock)
       end
 
       #