Skip to content

Commit 46a3632

Browse files
committed
Fix qax-os#422, avoid accent theme color index overflow
1 parent 421f945 commit 46a3632

File tree

3 files changed

+59
-54
lines changed

3 files changed

+59
-54
lines changed

chart.go

+9-5
Original file line numberDiff line numberDiff line change
@@ -946,11 +946,13 @@ func (f *File) drawChartSeriesSpPr(i int, formatSet *formatChart) *cSpPr {
946946
Ln: &aLn{
947947
W: 25400,
948948
Cap: "rnd", // rnd, sq, flat
949-
SolidFill: &aSolidFill{
950-
SchemeClr: &aSchemeClr{Val: "accent" + strconv.Itoa(i+1)},
951-
},
952949
},
953950
}
951+
if i < 6 {
952+
spPrLine.Ln.SolidFill = &aSolidFill{
953+
SchemeClr: &aSchemeClr{Val: "accent" + strconv.Itoa(i+1)},
954+
}
955+
}
954956
chartSeriesSpPr := map[string]*cSpPr{Area: nil, AreaStacked: nil, AreaPercentStacked: nil, Area3D: nil, Area3DStacked: nil, Area3DPercentStacked: nil, Bar: nil, BarStacked: nil, BarPercentStacked: nil, Bar3DClustered: nil, Bar3DStacked: nil, Bar3DPercentStacked: nil, Col: nil, ColStacked: nil, ColPercentStacked: nil, Col3DClustered: nil, Col3D: nil, Col3DStacked: nil, Col3DPercentStacked: nil, Doughnut: nil, Line: spPrLine, Pie: nil, Pie3D: nil, Radar: nil, Scatter: spPrScatter}
955957
return chartSeriesSpPr[formatSet.Type]
956958
}
@@ -1014,7 +1016,9 @@ func (f *File) drawChartSeriesMarker(i int, formatSet *formatChart) *cMarker {
10141016
marker := &cMarker{
10151017
Symbol: &attrValString{Val: "circle"},
10161018
Size: &attrValInt{Val: 5},
1017-
SpPr: &cSpPr{
1019+
}
1020+
if i < 6 {
1021+
marker.SpPr = &cSpPr{
10181022
SolidFill: &aSolidFill{
10191023
SchemeClr: &aSchemeClr{
10201024
Val: "accent" + strconv.Itoa(i+1),
@@ -1028,7 +1032,7 @@ func (f *File) drawChartSeriesMarker(i int, formatSet *formatChart) *cMarker {
10281032
},
10291033
},
10301034
},
1031-
},
1035+
}
10321036
}
10331037
chartSeriesMarker := map[string]*cMarker{Area: nil, AreaStacked: nil, AreaPercentStacked: nil, Area3D: nil, Area3DStacked: nil, Area3DPercentStacked: nil, Bar: nil, BarStacked: nil, BarPercentStacked: nil, Bar3DClustered: nil, Bar3DStacked: nil, Bar3DPercentStacked: nil, Col: nil, ColStacked: nil, ColPercentStacked: nil, Col3DClustered: nil, Col3D: nil, Col3DStacked: nil, Col3DPercentStacked: nil, Doughnut: nil, Line: nil, Pie: nil, Pie3D: nil, Radar: nil, Scatter: marker}
10341038
return chartSeriesMarker[formatSet.Type]

0 commit comments

Comments
 (0)