Skip to content

Commit fa7078f

Browse files
xurixuri
committed
Specified combo chart as variadic parameters
1 parent 9ddb52e commit fa7078f

File tree

3 files changed

+33
-22
lines changed

3 files changed

+33
-22
lines changed

‎chart.go

+25-15
Original file line numberDiff line numberDiff line change
@@ -696,7 +696,7 @@ func parseFormatChartSet(formatSet string) (*formatChart, error) {
696696
//
697697
// Set chart size by dimension property. The dimension property is optional. The default width is 480, and height is 290.
698698
//
699-
// combo: Specifies tha create a chart that combines two art types in a single
699+
// combo: Specifies the create a chart that combines two art types in a single
700700
// chart. For example, create a clustered column - line chart with data
701701
// Sheet1!$E$1:$L$15:
702702
//
@@ -714,7 +714,7 @@ func parseFormatChartSet(formatSet string) (*formatChart, error) {
714714
// for k, v := range values {
715715
// f.SetCellValue("Sheet1", k, v)
716716
// }
717-
// if err := f.AddChart("Sheet1", "E1", `{"type":"col","series":[{"name":"Sheet1!$A$2","categories":"","values":"Sheet1!$B$2:$D$2"},{"name":"Sheet1!$A$3","categories":"Sheet1!$B$1:$D$1","values":"Sheet1!$B$3:$D$3"}],"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":"Clustered Column - Line Chart"},"plotarea":{"show_bubble_size":true,"show_cat_name":false,"show_leader_lines":false,"show_percent":true,"show_series_name":true,"show_val":true},"combo":{"type":"line","series":[{"name":"Sheet1!$A$4","categories":"Sheet1!$B$1:$D$1","values":"Sheet1!$B$4:$D$4"}],"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},"plotarea":{"show_bubble_size":true,"show_cat_name":false,"show_leader_lines":false,"show_percent":true,"show_series_name":true,"show_val":true}}}`); err != nil {
717+
// if err := f.AddChart("Sheet1", "E1", `{"type":"col","series":[{"name":"Sheet1!$A$2","categories":"","values":"Sheet1!$B$2:$D$2"},{"name":"Sheet1!$A$3","categories":"Sheet1!$B$1:$D$1","values":"Sheet1!$B$3:$D$3"}],"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":"Clustered Column - Line Chart"},"plotarea":{"show_bubble_size":true,"show_cat_name":false,"show_leader_lines":false,"show_percent":true,"show_series_name":true,"show_val":true}}`, `{"type":"line","series":[{"name":"Sheet1!$A$4","categories":"Sheet1!$B$1:$D$1","values":"Sheet1!$B$4:$D$4"}],"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},"plotarea":{"show_bubble_size":true,"show_cat_name":false,"show_leader_lines":false,"show_percent":true,"show_series_name":true,"show_val":true}}`); err != nil {
718718
// println(err.Error())
719719
// return
720720
// }
@@ -724,11 +724,22 @@ func parseFormatChartSet(formatSet string) (*formatChart, error) {
724724
// }
725725
// }
726726
//
727-
func (f *File) AddChart(sheet, cell, format string) error {
727+
func (f *File) AddChart(sheet, cell, format string, combo ...string) error {
728728
formatSet, err := parseFormatChartSet(format)
729729
if err != nil {
730730
return err
731731
}
732+
comboCharts := []*formatChart{}
733+
for _, comboFormat := range combo {
734+
comboChart, err := parseFormatChartSet(comboFormat)
735+
if err != nil {
736+
return err
737+
}
738+
if _, ok := chartValAxNumFmtFormatCode[comboChart.Type]; !ok {
739+
return errors.New("unsupported chart type " + comboChart.Type)
740+
}
741+
comboCharts = append(comboCharts, comboChart)
742+
}
732743
// Read sheet data.
733744
xlsx, err := f.workSheetReader(sheet)
734745
if err != nil {
@@ -748,7 +759,7 @@ func (f *File) AddChart(sheet, cell, format string) error {
748759
if err != nil {
749760
return err
750761
}
751-
f.addChart(formatSet)
762+
f.addChart(formatSet, comboCharts)
752763
f.addContentTypePart(chartID, "chart")
753764
f.addContentTypePart(drawingID, "drawings")
754765
return err
@@ -786,7 +797,7 @@ func (f *File) prepareDrawing(xlsx *xlsxWorksheet, drawingID int, sheet, drawing
786797

787798
// addChart provides a function to create chart as xl/charts/chart%d.xml by
788799
// given format sets.
789-
func (f *File) addChart(formatSet *formatChart) {
800+
func (f *File) addChart(formatSet *formatChart, comboCharts []*formatChart) {
790801
count := f.countCharts()
791802
xlsxChartSpace := xlsxChartSpace{
792803
XMLNSc: NameSpaceDrawingMLChart,
@@ -980,8 +991,11 @@ func (f *File) addChart(formatSet *formatChart) {
980991
}
981992
}
982993
addChart(xlsxChartSpace.Chart.PlotArea, plotAreaFunc[formatSet.Type](formatSet))
983-
if formatSet.Combo != nil {
984-
addChart(xlsxChartSpace.Chart.PlotArea, plotAreaFunc[formatSet.Combo.Type](formatSet.Combo))
994+
order := len(formatSet.Series)
995+
for idx := range comboCharts {
996+
comboCharts[idx].order = order
997+
addChart(xlsxChartSpace.Chart.PlotArea, plotAreaFunc[comboCharts[idx].Type](comboCharts[idx]))
998+
order += len(comboCharts[idx].Series)
985999
}
9861000
chart, _ := xml.Marshal(xlsxChartSpace)
9871001
media := "xl/charts/chart" + strconv.Itoa(count+1) + ".xml"
@@ -1462,15 +1476,11 @@ func (f *File) drawChartShape(formatSet *formatChart) *attrValString {
14621476
// drawChartSeries provides a function to draw the c:ser element by given
14631477
// format sets.
14641478
func (f *File) drawChartSeries(formatSet *formatChart) *[]cSer {
1465-
var baseIdx int
1466-
if formatSet.Combo != nil {
1467-
baseIdx = len(formatSet.Combo.Series)
1468-
}
14691479
ser := []cSer{}
14701480
for k := range formatSet.Series {
14711481
ser = append(ser, cSer{
1472-
IDx: &attrValInt{Val: intPtr(k + baseIdx)},
1473-
Order: &attrValInt{Val: intPtr(k + baseIdx)},
1482+
IDx: &attrValInt{Val: intPtr(k + formatSet.order)},
1483+
Order: &attrValInt{Val: intPtr(k + formatSet.order)},
14741484
Tx: &cTx{
14751485
StrRef: &cStrRef{
14761486
F: formatSet.Series[k].Name,
@@ -1506,9 +1516,9 @@ func (f *File) drawChartSeriesSpPr(i int, formatSet *formatChart) *cSpPr {
15061516
Cap: "rnd", // rnd, sq, flat
15071517
},
15081518
}
1509-
if i < 6 {
1519+
if i+formatSet.order < 6 {
15101520
spPrLine.Ln.SolidFill = &aSolidFill{
1511-
SchemeClr: &aSchemeClr{Val: "accent" + strconv.Itoa(i+1)},
1521+
SchemeClr: &aSchemeClr{Val: "accent" + strconv.Itoa(i+formatSet.order+1)},
15121522
}
15131523
}
15141524
chartSeriesSpPr := map[string]*cSpPr{Line: spPrLine, Scatter: spPrScatter}

‎chart_test.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ func TestAddChart(t *testing.T) {
186186
"Y1": {"doughnut", "Clustered Column - Doughnut Chart"},
187187
}
188188
for axis, props := range clusteredColumnCombo {
189-
assert.NoError(t, f.AddChart("Combo Charts", axis, fmt.Sprintf(`{"type":"col","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"},{"name":"Sheet1!$A$33","categories":"Sheet1!$B$29:$D$29","values":"Sheet1!$B$33:$D$33"}],"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":"%s"},"plotarea":{"show_bubble_size":true,"show_cat_name":false,"show_leader_lines":false,"show_percent":true,"show_series_name":true,"show_val":true},"combo":{"type":"%s","series":[{"name":"Sheet1!$A$34","categories":"Sheet1!$B$29:$D$29","values":"Sheet1!$B$34:$D$34"},{"name":"Sheet1!$A$35","categories":"Sheet1!$B$29:$D$29","values":"Sheet1!$B$35:$D$35"},{"name":"Sheet1!$A$36","categories":"Sheet1!$B$29:$D$29","values":"Sheet1!$B$36:$D$36"},{"name":"Sheet1!$A$37","categories":"Sheet1!$B$29:$D$29","values":"Sheet1!$B$37:$D$37"}],"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},"plotarea":{"show_bubble_size":true,"show_cat_name":false,"show_leader_lines":false,"show_percent":true,"show_series_name":true,"show_val":true}}}`, props[1], props[0])))
189+
assert.NoError(t, f.AddChart("Combo Charts", axis, fmt.Sprintf(`{"type":"col","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"},{"name":"Sheet1!$A$33","categories":"Sheet1!$B$29:$D$29","values":"Sheet1!$B$33:$D$33"}],"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":"%s"},"plotarea":{"show_bubble_size":true,"show_cat_name":false,"show_leader_lines":false,"show_percent":true,"show_series_name":true,"show_val":true}}`, props[1]), fmt.Sprintf(`{"type":"%s","series":[{"name":"Sheet1!$A$34","categories":"Sheet1!$B$29:$D$29","values":"Sheet1!$B$34:$D$34"},{"name":"Sheet1!$A$35","categories":"Sheet1!$B$29:$D$29","values":"Sheet1!$B$35:$D$35"},{"name":"Sheet1!$A$36","categories":"Sheet1!$B$29:$D$29","values":"Sheet1!$B$36:$D$36"},{"name":"Sheet1!$A$37","categories":"Sheet1!$B$29:$D$29","values":"Sheet1!$B$37:$D$37"}],"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},"plotarea":{"show_bubble_size":true,"show_cat_name":false,"show_leader_lines":false,"show_percent":true,"show_series_name":true,"show_val":true}}`, props[0])))
190190
}
191191
stackedAreaCombo := map[string][]string{
192192
"A16": {"line", "Stacked Area - Line Chart"},
@@ -195,9 +195,10 @@ func TestAddChart(t *testing.T) {
195195
"Y16": {"doughnut", "Stacked Area - Doughnut Chart"},
196196
}
197197
for axis, props := range stackedAreaCombo {
198-
assert.NoError(t, f.AddChart("Combo Charts", axis, fmt.Sprintf(`{"type":"areaStacked","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"},{"name":"Sheet1!$A$33","categories":"Sheet1!$B$29:$D$29","values":"Sheet1!$B$33:$D$33"}],"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":"%s"},"plotarea":{"show_bubble_size":true,"show_cat_name":false,"show_leader_lines":false,"show_percent":true,"show_series_name":true,"show_val":true},"combo":{"type":"%s","series":[{"name":"Sheet1!$A$34","categories":"Sheet1!$B$29:$D$29","values":"Sheet1!$B$34:$D$34"},{"name":"Sheet1!$A$35","categories":"Sheet1!$B$29:$D$29","values":"Sheet1!$B$35:$D$35"},{"name":"Sheet1!$A$36","categories":"Sheet1!$B$29:$D$29","values":"Sheet1!$B$36:$D$36"},{"name":"Sheet1!$A$37","categories":"Sheet1!$B$29:$D$29","values":"Sheet1!$B$37:$D$37"}],"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},"plotarea":{"show_bubble_size":true,"show_cat_name":false,"show_leader_lines":false,"show_percent":true,"show_series_name":true,"show_val":true}}}`, props[1], props[0])))
198+
assert.NoError(t, f.AddChart("Combo Charts", axis, fmt.Sprintf(`{"type":"areaStacked","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"},{"name":"Sheet1!$A$33","categories":"Sheet1!$B$29:$D$29","values":"Sheet1!$B$33:$D$33"}],"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":"%s"},"plotarea":{"show_bubble_size":true,"show_cat_name":false,"show_leader_lines":false,"show_percent":true,"show_series_name":true,"show_val":true}}`, props[1]), fmt.Sprintf(`{"type":"%s","series":[{"name":"Sheet1!$A$34","categories":"Sheet1!$B$29:$D$29","values":"Sheet1!$B$34:$D$34"},{"name":"Sheet1!$A$35","categories":"Sheet1!$B$29:$D$29","values":"Sheet1!$B$35:$D$35"},{"name":"Sheet1!$A$36","categories":"Sheet1!$B$29:$D$29","values":"Sheet1!$B$36:$D$36"},{"name":"Sheet1!$A$37","categories":"Sheet1!$B$29:$D$29","values":"Sheet1!$B$37:$D$37"}],"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},"plotarea":{"show_bubble_size":true,"show_cat_name":false,"show_leader_lines":false,"show_percent":true,"show_series_name":true,"show_val":true}}`, props[0])))
199199
}
200200
assert.NoError(t, f.SaveAs(filepath.Join("test", "TestAddChart.xlsx")))
201201
// Test with unsupported chart type
202202
assert.EqualError(t, f.AddChart("Sheet2", "BD32", `{"type":"unknown","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"},{"name":"Sheet1!$A$33","categories":"Sheet1!$B$29:$D$29","values":"Sheet1!$B$33:$D$33"},{"name":"Sheet1!$A$34","categories":"Sheet1!$B$29:$D$29","values":"Sheet1!$B$34:$D$34"},{"name":"Sheet1!$A$35","categories":"Sheet1!$B$29:$D$29","values":"Sheet1!$B$35:$D$35"},{"name":"Sheet1!$A$36","categories":"Sheet1!$B$29:$D$29","values":"Sheet1!$B$36:$D$36"},{"name":"Sheet1!$A$37","categories":"Sheet1!$B$29:$D$29","values":"Sheet1!$B$37:$D$37"}],"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":"Bubble 3D 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"}`), "unsupported chart type unknown")
203+
assert.EqualError(t, f.AddChart("Sheet2", "BD64", `{"type":"barOfPie","series":[{"name":"Sheet1!$A$30","categories":"Sheet1!$A$30:$D$37","values":"Sheet1!$B$30:$B$37"}],"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":"Bar of Pie 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","x_axis":{"major_grid_lines":true},"y_axis":{"major_grid_lines":true}}`, `{"type":"unknown","series":[{"name":"Sheet1!$A$30","categories":"Sheet1!$A$30:$D$37","values":"Sheet1!$B$30:$B$37"}],"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":"Bar of Pie 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","x_axis":{"major_grid_lines":true},"y_axis":{"major_grid_lines":true}}`), "unsupported chart type unknown")
203204
}

‎xmlChart.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -593,11 +593,11 @@ type formatChart struct {
593593
} `json:"fill"`
594594
Layout formatLayout `json:"layout"`
595595
} `json:"plotarea"`
596-
ShowBlanksAs string `json:"show_blanks_as"`
597-
ShowHiddenData bool `json:"show_hidden_data"`
598-
SetRotation int `json:"set_rotation"`
599-
SetHoleSize int `json:"set_hole_size"`
600-
Combo *formatChart `json:"combo"`
596+
ShowBlanksAs string `json:"show_blanks_as"`
597+
ShowHiddenData bool `json:"show_hidden_data"`
598+
SetRotation int `json:"set_rotation"`
599+
SetHoleSize int `json:"set_hole_size"`
600+
order int
601601
}
602602

603603
// formatChartLegend directly maps the format settings of the chart legend.

0 commit comments

Comments
 (0)