data labels for bar and line charts

1 files changed, 10 insertions, 8 deletions

diff --git a/lib/axlsx/drawing/bar_3D_chart.rb b/lib/axlsx/drawing/bar_3D_chart.rb
index 5db7c1e4..f3eb77e3 100644
--- a/lib/axlsx/drawing/bar_3D_chart.rb
+++ b/lib/axlsx/drawing/bar_3D_chart.rb
@@ -77,6 +77,7 @@ module Axlsx
       super(frame, options)
       @series_type = BarSeries
       @view_3D = View3D.new({:r_ang_ax=>1}.merge(options))
+      @d_lbls = nil
     end
 
     # The direction of the bars in the chart
@@ -119,20 +120,14 @@ module Axlsx
     # @param [String] str
     # @return [String]
     def to_xml_string(str = '')
+      remove_invalid_d_lbls_attributes
       super(str) do |str_inner|
         str_inner << '<c:bar3DChart>'
         str_inner << '<c:barDir val="' << bar_dir.to_s << '"/>'
         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:gapWidth val="' << @gap_width.to_s << '"/>' unless @gap_width.nil?
         str_inner << '<c:gapDepth val="' << @gap_depth.to_s << '"/>' unless @gap_depth.nil?
         str_inner << '<c:shape val="' << @shape.to_s << '"/>' unless @shape.nil?
@@ -144,5 +139,12 @@ module Axlsx
         @val_axis.to_xml_string str_inner
       end
     end
+
+    def remove_invalid_d_lbls_attributes
+      return unless @d_lbls
+      @d_lbls.instance_eval{ @d_lbl_pos = nil
+                             @show_leader_lines = nil
+      }
+    end
   end
 end