Merge pull request #162 from rohanthewiz/master

Add stacked bar chart
7 years ago · 2dc385431d
parent 3d231cb549 cc1d3fefc2
commit 2dc385431d
3 changed files with 91 additions and 71 deletions
--- a/chart.go
+++ b/chart.go
@ -9,57 +9,62 @@ import (

 // This section defines the currently supported chart types.
 const (
-	Bar      = "bar"
-	Bar3D    = "bar3D"
-	Doughnut = "doughnut"
-	Line     = "line"
-	Pie      = "pie"
-	Pie3D    = "pie3D"
-	Radar    = "radar"
-	Scatter  = "scatter"
+	Bar        = "bar"
+	BarStacked = "barStacked"
+	Bar3D      = "bar3D"
+	Doughnut   = "doughnut"
+	Line       = "line"
+	Pie        = "pie"
+	Pie3D      = "pie3D"
+	Radar      = "radar"
+	Scatter    = "scatter"
 )

 // This section defines the default value of chart properties.
 var (
 	chartView3DRotX = map[string]int{
-		Bar:      0,
-		Bar3D:    15,
-		Doughnut: 0,
-		Line:     0,
-		Pie:      0,
-		Pie3D:    30,
-		Radar:    0,
-		Scatter:  0,
+		Bar:        0,
+		BarStacked: 0,
+		Bar3D:      15,
+		Doughnut:   0,
+		Line:       0,
+		Pie:        0,
+		Pie3D:      30,
+		Radar:      0,
+		Scatter:    0,
 	}
 	chartView3DRotY = map[string]int{
-		Bar:      0,
-		Bar3D:    20,
-		Doughnut: 0,
-		Line:     0,
-		Pie:      0,
-		Pie3D:    0,
-		Radar:    0,
-		Scatter:  0,
+		Bar:        0,
+		BarStacked: 0,
+		Bar3D:      20,
+		Doughnut:   0,
+		Line:       0,
+		Pie:        0,
+		Pie3D:      0,
+		Radar:      0,
+		Scatter:    0,
 	}
 	chartView3DDepthPercent = map[string]int{
-		Bar:      100,
-		Bar3D:    100,
-		Doughnut: 100,
-		Line:     100,
-		Pie:      100,
-		Pie3D:    100,
-		Radar:    100,
-		Scatter:  100,
+		Bar:        100,
+		BarStacked: 100,
+		Bar3D:      100,
+		Doughnut:   100,
+		Line:       100,
+		Pie:        100,
+		Pie3D:      100,
+		Radar:      100,
+		Scatter:    100,
 	}
 	chartView3DRAngAx = map[string]int{
-		Bar:      0,
-		Bar3D:    1,
-		Doughnut: 0,
-		Line:     0,
-		Pie:      0,
-		Pie3D:    0,
-		Radar:    0,
-		Scatter:  0}
+		Bar:        0,
+		BarStacked: 0,
+		Bar3D:      1,
+		Doughnut:   0,
+		Line:       0,
+		Pie:        0,
+		Pie3D:      0,
+		Radar:      0,
+		Scatter:    0}
 	chartLegendPosition = map[string]string{
 		"bottom":    "b",
 		"left":      "l",
@ -128,16 +133,17 @@ func parseFormatChartSet(formatSet string) *formatChart {
 //
 // The following shows the type of chart supported by excelize:
 //
-//     Type     | Chart
-//    ----------+----------------
-//     bar      | bar chart
-//     bar3D    | 3D bar chart
-//     doughnut | doughnut chart
-//     line     | line chart
-//     pie      | pie chart
-//     pie3D    | 3D pie chart
-//     radar    | radar chart
-//     scatter  | scatter chart
+//     Type       | Chart
+//    ------------+----------------
+//     bar        | bar chart
+//     barStacked | stacked bar chart
+//     bar3D      | 3D bar chart
+//     doughnut   | doughnut chart
+//     line       | line chart
+//     pie        | pie chart
+//     pie3D      | 3D pie chart
+//     radar      | radar chart
+//     scatter    | scatter chart
 //
 // In Excel a chart series is a collection of information that defines which data is plotted such as values, axis labels and formatting.
 //
@ -383,14 +389,15 @@ func (f *File) addChart(formatSet *formatChart) {
 		},
 	}
 	plotAreaFunc := map[string]func(*formatChart) *cPlotArea{
-		Bar:      f.drawBarChart,
-		Bar3D:    f.drawBarChart,
-		Doughnut: f.drawDoughnutChart,
-		Line:     f.drawLineChart,
-		Pie3D:    f.drawPie3DChart,
-		Pie:      f.drawPieChart,
-		Radar:    f.drawRadarChart,
-		Scatter:  f.drawScatterChart,
+		Bar:        f.drawBarChart,
+		BarStacked: f.drawBarChart,
+		Bar3D:      f.drawBarChart,
+		Doughnut:   f.drawDoughnutChart,
+		Line:       f.drawLineChart,
+		Pie3D:      f.drawPie3DChart,
+		Pie:        f.drawPieChart,
+		Radar:      f.drawRadarChart,
+		Scatter:    f.drawScatterChart,
 	}
 	xlsxChartSpace.Chart.PlotArea = plotAreaFunc[formatSet.Type](formatSet)

@ -399,7 +406,7 @@ func (f *File) addChart(formatSet *formatChart) {
 	f.saveFileList(media, string(chart))
 }

-// drawBarChart provides function to draw the c:plotArea element for bar and
+// drawBarChart provides function to draw the c:plotArea element for bar, barStacked and
 // bar3D chart by given format sets.
 func (f *File) drawBarChart(formatSet *formatChart) *cPlotArea {
 	c := cCharts{
@ -419,16 +426,27 @@ func (f *File) drawBarChart(formatSet *formatChart) *cPlotArea {
 			{Val: 753999904},
 		},
 	}
+	if formatSet.Type == "barStacked" {
+		c.Grouping.Val = "stacked"
+		c.Overlap = &attrValInt{Val: 100}
+	}
+	catAx := f.drawPlotAreaCatAx()
+	valAx := f.drawPlotAreaValAx()
 	charts := map[string]*cPlotArea{
 		"bar": {
 			BarChart: &c,
-			CatAx:    f.drawPlotAreaCatAx(),
-			ValAx:    f.drawPlotAreaValAx(),
+			CatAx:    catAx,
+			ValAx:    valAx,
+		},
+		"barStacked": {
+			BarChart: &c,
+			CatAx:    catAx,
+			ValAx:    valAx,
 		},
 		"bar3D": {
 			Bar3DChart: &c,
-			CatAx:      f.drawPlotAreaCatAx(),
-			ValAx:      f.drawPlotAreaValAx(),
+			CatAx:      catAx,
+			ValAx:      valAx,
 		},
 	}
 	return charts[formatSet.Type]
@ -590,7 +608,7 @@ func (f *File) drawChartSeriesSpPr(i int, formatSet *formatChart) *cSpPr {
 			},
 		},
 	}
-	chartSeriesSpPr := map[string]*cSpPr{Bar: nil, Bar3D: nil, Doughnut: nil, Line: spPrLine, Pie: nil, Pie3D: nil, Radar: nil, Scatter: spPrScatter}
+	chartSeriesSpPr := map[string]*cSpPr{Bar: nil, BarStacked: nil, Bar3D: nil, Doughnut: nil, Line: spPrLine, Pie: nil, Pie3D: nil, Radar: nil, Scatter: spPrScatter}
 	return chartSeriesSpPr[formatSet.Type]
 }

@ -619,7 +637,7 @@ func (f *File) drawChartSeriesDPt(i int, formatSet *formatChart) []*cDPt {
 			},
 		},
 	}}
-	chartSeriesDPt := map[string][]*cDPt{Bar: nil, Bar3D: nil, Doughnut: nil, Line: nil, Pie: dpt, Pie3D: dpt, Radar: nil, Scatter: nil}
+	chartSeriesDPt := map[string][]*cDPt{Bar: nil, BarStacked: nil, Bar3D: nil, Doughnut: nil, Line: nil, Pie: dpt, Pie3D: dpt, Radar: nil, Scatter: nil}
 	return chartSeriesDPt[formatSet.Type]
 }

@ -631,7 +649,7 @@ func (f *File) drawChartSeriesCat(v formatChartSeries, formatSet *formatChart) *
 			F: v.Categories,
 		},
 	}
-	chartSeriesCat := map[string]*cCat{Bar: cat, Bar3D: cat, Doughnut: cat, Line: cat, Pie: cat, Pie3D: cat, Radar: cat, Scatter: nil}
+	chartSeriesCat := map[string]*cCat{Bar: cat, BarStacked: cat, Bar3D: cat, Doughnut: cat, Line: cat, Pie: cat, Pie3D: cat, Radar: cat, Scatter: nil}
 	return chartSeriesCat[formatSet.Type]
 }

@ -643,7 +661,7 @@ func (f *File) drawChartSeriesVal(v formatChartSeries, formatSet *formatChart) *
 			F: v.Values,
 		},
 	}
-	chartSeriesVal := map[string]*cVal{Bar: val, Bar3D: val, Doughnut: val, Line: val, Pie: val, Pie3D: val, Radar: val, Scatter: nil}
+	chartSeriesVal := map[string]*cVal{Bar: val, BarStacked: val, Bar3D: val, Doughnut: val, Line: val, Pie: val, Pie3D: val, Radar: val, Scatter: nil}
 	return chartSeriesVal[formatSet.Type]
 }

@ -669,7 +687,7 @@ func (f *File) drawChartSeriesMarker(i int, formatSet *formatChart) *cMarker {
 			},
 		},
 	}
-	chartSeriesMarker := map[string]*cMarker{Bar: nil, Bar3D: nil, Doughnut: nil, Line: nil, Pie: nil, Pie3D: nil, Radar: nil, Scatter: marker}
+	chartSeriesMarker := map[string]*cMarker{Bar: nil, BarStacked: nil, Bar3D: nil, Doughnut: nil, Line: nil, Pie: nil, Pie3D: nil, Radar: nil, Scatter: marker}
 	return chartSeriesMarker[formatSet.Type]
 }

@ -681,7 +699,7 @@ func (f *File) drawChartSeriesXVal(v formatChartSeries, formatSet *formatChart)
 			F: v.Categories,
 		},
 	}
-	chartSeriesXVal := map[string]*cCat{Bar: nil, Bar3D: nil, Doughnut: nil, Line: nil, Pie: nil, Pie3D: nil, Radar: nil, Scatter: cat}
+	chartSeriesXVal := map[string]*cCat{Bar: nil, BarStacked: nil, Bar3D: nil, Doughnut: nil, Line: nil, Pie: nil, Pie3D: nil, Radar: nil, Scatter: cat}
 	return chartSeriesXVal[formatSet.Type]
 }

@ -693,7 +711,7 @@ func (f *File) drawChartSeriesYVal(v formatChartSeries, formatSet *formatChart)
 			F: v.Values,
 		},
 	}
-	chartSeriesYVal := map[string]*cVal{Bar: nil, Bar3D: nil, Doughnut: nil, Line: nil, Pie: nil, Pie3D: nil, Radar: nil, Scatter: val}
+	chartSeriesYVal := map[string]*cVal{Bar: nil, BarStacked: nil, Bar3D: nil, Doughnut: nil, Line: nil, Pie: nil, Pie3D: nil, Radar: nil, Scatter: val}
 	return chartSeriesYVal[formatSet.Type]
 }

@ -715,7 +733,7 @@ func (f *File) drawChartDLbls(formatSet *formatChart) *cDLbls {
 // format sets.
 func (f *File) drawChartSeriesDLbls(formatSet *formatChart) *cDLbls {
 	dLbls := f.drawChartDLbls(formatSet)
-	chartSeriesDLbls := map[string]*cDLbls{Bar: dLbls, Bar3D: dLbls, Doughnut: dLbls, Line: dLbls, Pie: dLbls, Pie3D: dLbls, Radar: dLbls, Scatter: nil}
+	chartSeriesDLbls := map[string]*cDLbls{Bar: dLbls, BarStacked: dLbls, Bar3D: dLbls, Doughnut: dLbls, Line: dLbls, Pie: dLbls, Pie3D: dLbls, Radar: dLbls, Scatter: nil}
 	return chartSeriesDLbls[formatSet.Type]
 }

--- a/excelize_test.go
+++ b/excelize_test.go
@ -817,6 +817,7 @@ func TestAddChart(t *testing.T) {
 	xlsx.AddChart("Sheet1", "X30", `{"type":"pie","series":[{"name":"=Sheet1!$A$30","categories":"=Sheet1!$B$29:$D$29","values":"=Sheet1!$B$30:$D$30"}],"format":{"x_scale":1.0,"y_scale":1.0,"x_offset":15,"y_offset":10,"print_obj":true,"lock_aspect_ratio":false,"locked":false},"legend":{"position":"bottom","show_legend_key":false},"title":{"name":"Fruit Pie Chart"},"plotarea":{"show_bubble_size":true,"show_cat_name":false,"show_leader_lines":false,"show_percent":true,"show_series_name":false,"show_val":false},"show_blanks_as":"gap"}`)
 	xlsx.AddChart("Sheet2", "P1", `{"type":"radar","series":[{"name":"=Sheet1!$A$30","categories":"=Sheet1!$B$29:$D$29","values":"=Sheet1!$B$30:$D$30"},{"name":"=Sheet1!$A$31","categories":"=Sheet1!$B$29:$D$29","values":"=Sheet1!$B$31:$D$31"},{"name":"=Sheet1!$A$32","categories":"=Sheet1!$B$29:$D$29","values":"=Sheet1!$B$32:$D$32"}],"format":{"x_scale":1.0,"y_scale":1.0,"x_offset":15,"y_offset":10,"print_obj":true,"lock_aspect_ratio":false,"locked":false},"legend":{"position":"top_right","show_legend_key":false},"title":{"name":"Fruit Radar Chart"},"plotarea":{"show_bubble_size":true,"show_cat_name":false,"show_leader_lines":false,"show_percent":true,"show_series_name":true,"show_val":true},"show_blanks_as":"span"}`)
 	xlsx.AddChart("Sheet2", "X1", `{"type":"scatter","series":[{"name":"=Sheet1!$A$30","categories":"=Sheet1!$B$29:$D$29","values":"=Sheet1!$B$30:$D$30"},{"name":"=Sheet1!$A$31","categories":"=Sheet1!$B$29:$D$29","values":"=Sheet1!$B$31:$D$31"},{"name":"=Sheet1!$A$32","categories":"=Sheet1!$B$29:$D$29","values":"=Sheet1!$B$32:$D$32"}],"format":{"x_scale":1.0,"y_scale":1.0,"x_offset":15,"y_offset":10,"print_obj":true,"lock_aspect_ratio":false,"locked":false},"legend":{"position":"bottom","show_legend_key":false},"title":{"name":"Fruit Scatter Chart"},"plotarea":{"show_bubble_size":true,"show_cat_name":false,"show_leader_lines":false,"show_percent":true,"show_series_name":true,"show_val":true},"show_blanks_as":"zero"}`)
+	xlsx.AddChart("Sheet2", "P16", `{"type":"barStacked","series":[{"name":"=Sheet1!$A$30","categories":"=Sheet1!$B$29:$D$29","values":"=Sheet1!$B$30:$D$30"},{"name":"=Sheet1!$A$31","categories":"=Sheet1!$B$29:$D$29","values":"=Sheet1!$B$31:$D$31"},{"name":"=Sheet1!$A$32","categories":"=Sheet1!$B$29:$D$29","values":"=Sheet1!$B$32:$D$32"}],"format":{"x_scale":1.0,"y_scale":1.0,"x_offset":15,"y_offset":10,"print_obj":true,"lock_aspect_ratio":false,"locked":false},"legend":{"position":"left","show_legend_key":false},"title":{"name":"Fruit Bar Chart"},"plotarea":{"show_bubble_size":true,"show_cat_name":false,"show_leader_lines":false,"show_percent":true,"show_series_name":true,"show_val":true},"show_blanks_as":"zero"}`)
 	// Save xlsx file by the given path.
 	err = xlsx.SaveAs("./test/Workbook_addchart.xlsx")
 	if err != nil {
--- a/xmlChart.go
+++ b/xmlChart.go
@ -316,6 +316,7 @@ type cCharts struct {
 	DLbls        *cDLbls        `xml:"c:dLbls"`
 	HoleSize     *attrValInt    `xml:"c:holeSize"`
 	Smooth       *attrValBool   `xml:"c:smooth"`
+	Overlap      *attrValInt    `xml:"c:overlap"`
 	AxID         []*attrValInt  `xml:"c:axId"`
 }