summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRandy Morgan <[email protected]>2012-07-08 10:46:44 +0900
committerRandy Morgan <[email protected]>2012-07-08 10:46:51 +0900
commit88fd4fc68c0052df556c4c51bf75ed0a0e3ba7f9 (patch)
treeaa51d7c84eaf044f2f6e2187690dab5f416236f3
parentc5981835dbcae425dd0e468a90d88cd49bea42d3 (diff)
downloadcaxlsx-88fd4fc68c0052df556c4c51bf75ed0a0e3ba7f9.tar.gz
caxlsx-88fd4fc68c0052df556c4c51bf75ed0a0e3ba7f9.zip
adding in some excel bar chart defaults for LO interop testing
-rw-r--r--lib/axlsx/drawing/bar_3D_chart.rb4
-rw-r--r--lib/axlsx/drawing/bar_series.rb3
-rw-r--r--test/drawing/tc_bar_series.rb1
3 files changed, 5 insertions, 3 deletions
diff --git a/lib/axlsx/drawing/bar_3D_chart.rb b/lib/axlsx/drawing/bar_3D_chart.rb
index 7f9165da..5db7c1e4 100644
--- a/lib/axlsx/drawing/bar_3D_chart.rb
+++ b/lib/axlsx/drawing/bar_3D_chart.rb
@@ -67,11 +67,13 @@ module Axlsx
def initialize(frame, options={})
@bar_dir = :bar
@grouping = :clustered
+ @shape = :box
+ @gap_width = 150
@gap_width, @gap_depth, @shape = nil, nil, nil
@cat_ax_id = rand(8 ** 8)
@val_ax_id = rand(8 ** 8)
@cat_axis = CatAxis.new(@cat_ax_id, @val_ax_id)
- @val_axis = ValAxis.new(@val_ax_id, @cat_ax_id, :tick_lbl_pos => :low)
+ @val_axis = ValAxis.new(@val_ax_id, @cat_ax_id, :tick_lbl_pos => :low, :ax_pos => :l)
super(frame, options)
@series_type = BarSeries
@view_3D = View3D.new({:r_ang_ax=>1}.merge(options))
diff --git a/lib/axlsx/drawing/bar_series.rb b/lib/axlsx/drawing/bar_series.rb
index 182f94c5..9a528dda 100644
--- a/lib/axlsx/drawing/bar_series.rb
+++ b/lib/axlsx/drawing/bar_series.rb
@@ -64,7 +64,8 @@ module Axlsx
@labels.to_xml_string(str_inner) unless @labels.nil?
@data.to_xml_string(str_inner) unless @data.nil?
- str_inner << '<c:shape val="' << shape.to_s << '"></c:shape>'
+ # looking at the output from excel - this may not be needed
+ # str_inner << '<c:shape val="' << shape.to_s << '"></c:shape>'
end
end
diff --git a/test/drawing/tc_bar_series.rb b/test/drawing/tc_bar_series.rb
index 93ebbbbb..6b173155 100644
--- a/test/drawing/tc_bar_series.rb
+++ b/test/drawing/tc_bar_series.rb
@@ -33,6 +33,5 @@ class TestBarSeries < Test::Unit::TestCase
assert_equal(doc.xpath("//c:dPt/c:idx[@val='#{index}']").size,1)
assert_equal(doc.xpath("//c:dPt/c:spPr/a:solidFill/a:srgbClr[@val='#{@series.colors[index]}']").size,1)
end
- assert_equal(doc.xpath("//c:shape[@val='#{@series.shape.to_s}']").size, 1)
end
end