Support set dash line and marker border type of charts

- Add Dash and Fill fields in the ChartLine data type
- Add Border field in the ChartMarker data type
- Add new ChartDashType data type
- Support setting dash type of line charts
- Update unit tests

Author: xuri

chart.go

@@ -80,6 +80,25 @@ const (
 	Bubble3D
 )
 
+// ChartDashType is the type of supported chart dash types.
+type ChartDashType byte
+
+// This section defines the currently supported chart dash types enumeration.
+const (
+	ChartDashUnset ChartDashType = iota
+	ChartDashSolid
+	ChartDashDot
+	ChartDashDash
+	ChartDashLgDash
+	ChartDashSashDot
+	ChartDashLgDashDot
+	ChartDashLgDashDotDot
+	ChartDashSysDash
+	ChartDashSysDot
+	ChartDashSysDashDot
+	ChartDashSysDashDotDot
+)
+
 // ChartLineType is the type of supported chart line types.
 type ChartLineType byte
 

chart_test.go

@@ -163,7 +163,13 @@ func TestAddChart(t *testing.T) {
 		{
 			Name: "Sheet1!$A$37", Categories: "Sheet1!$B$29:$D$29", Values: "Sheet1!$B$37:$D$37",
 			Marker: ChartMarker{
-				Fill: Fill{Type: "pattern", Color: []string{"FFFF00"}, Pattern: 1},
+				Fill: Fill{Type: "pattern", Color: []string{"FFFFFF"}, Pattern: 1},
+				Border: ChartLine{
+					Type:  ChartLineSolid,
+					Dash:  ChartDashDot,
+					Fill:  Fill{Type: "pattern", Color: []string{"#FFFF00"}, Pattern: 1},
+					Width: 1,
+				},
 			},
 		},
 	}
@@ -179,7 +185,7 @@ func TestAddChart(t *testing.T) {
 		{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", Line: ChartLine{Width: 0.25}},
+		{Name: "Sheet1!$A$37", Categories: "Sheet1!$B$29:$D$29", Values: "Sheet1!$B$37:$D$37", Line: ChartLine{Dash: ChartDashDash, Width: 0.25}},
 	}
 	series3 := []ChartSeries{{Name: "Sheet1!$A$30", Categories: "Sheet1!$A$30:$D$37", Values: "Sheet1!$B$30:$B$37"}}
 	series4 := []ChartSeries{

drawing.go

@@ -816,6 +816,9 @@ func (f *File) drawChartSeriesSpPr(i int, opts *Chart) *cSpPr {
 			SolidFill: spPr.SolidFill,
 		},
 	}
+	if opts.Series[i].Line.Dash != ChartDashUnset {
+		solid.Ln.PrstDash = &attrValString{Val: stringPtr(chartDashTypes[opts.Series[i].Line.Dash])}
+	}
 	noLn := &cSpPr{Ln: &aLn{NoFill: &attrValString{}}}
 	if chartSeriesSpPr, ok := map[ChartType]map[ChartLineType]*cSpPr{
 		Line:    {ChartLineUnset: solid, ChartLineSolid: solid, ChartLineNone: noLn, ChartLineAutomatic: solid},
@@ -903,23 +906,14 @@ func (f *File) drawChartSeriesMarker(i int, opts *Chart) *cMarker {
 		marker.Size = &attrValInt{Val: size}
 	}
 	if i < 6 {
-		marker.SpPr = &cSpPr{
-			SolidFill: &aSolidFill{
-				SchemeClr: &aSchemeClr{
-					Val: "accent" + strconv.Itoa(i+1),
-				},
-			},
-			Ln: &aLn{
-				W: 9252,
-				SolidFill: &aSolidFill{
-					SchemeClr: &aSchemeClr{
-						Val: "accent" + strconv.Itoa(i+1),
-					},
-				},
-			},
-		}
+		marker.SpPr = &cSpPr{SolidFill: &aSolidFill{
+			SchemeClr: &aSchemeClr{Val: "accent" + strconv.Itoa(i+1)},
+		}, Ln: &aLn{W: 9252}}
 	}
 	marker.SpPr = f.drawShapeFill(opts.Series[i].Marker.Fill, marker.SpPr)
+	if marker.SpPr != nil && marker.SpPr.Ln != nil {
+		marker.SpPr.Ln = f.drawChartLn(&opts.Series[i].Marker.Border)
+	}
 	chartSeriesMarker := map[ChartType]*cMarker{Scatter: marker, Line: marker}
 	return chartSeriesMarker[opts.Type]
 }
@@ -1322,19 +1316,24 @@ func (f *File) drawChartLn(opts *ChartLine) *aLn {
 		Cmpd: "sng",
 		Algn: "ctr",
 	}
+	if opts.Dash != ChartDashUnset {
+		ln.PrstDash = &attrValString{Val: stringPtr(chartDashTypes[opts.Dash])}
+	}
 	switch opts.Type {
 	case ChartLineSolid:
-		ln.SolidFill = &aSolidFill{
-			SchemeClr: &aSchemeClr{
-				Val: "tx1",
-				LumMod: &attrValInt{
-					Val: intPtr(15000),
-				},
-				LumOff: &attrValInt{
-					Val: intPtr(85000),
+		ln.SolidFill = f.drawShapeFill(opts.Fill, &cSpPr{
+			SolidFill: &aSolidFill{
+				SchemeClr: &aSchemeClr{
+					Val: "tx1",
+					LumMod: &attrValInt{
+						Val: intPtr(15000),
+					},
+					LumOff: &attrValInt{
+						Val: intPtr(85000),
+					},
 				},
 			},
-		}
+		}).SolidFill
 		return ln
 	case ChartLineNone:
 		ln.NoFill = &attrValString{}

rows.go

@@ -585,7 +585,7 @@ func (f *File) GetRowVisible(sheet string, row int) (bool, error) {
 }
 
 // SetRowOutlineLevel provides a function to set outline level number of a
-// single row by given worksheet name and row number. The range of 'level' 
+// single row by given worksheet name and row number. The range of 'level'
 // parameter value from 1 to 7. For example, outline row 2 in Sheet1 to level 1:
 //
 //	err := f.SetRowOutlineLevel("Sheet1", 2, 1)

templates.go

@@ -255,6 +255,21 @@ var chartDataLabelsPositionTypes = map[ChartDataLabelPositionType]string{
 	ChartDataLabelsPositionAbove:      "t",
 }
 
+// chartDashTypes defined supported preset chart dash types.
+var chartDashTypes = map[ChartDashType]string{
+	ChartDashSolid:         "solid",
+	ChartDashDot:           "dot",
+	ChartDashDash:          "dash",
+	ChartDashLgDash:        "lgDash",
+	ChartDashSashDot:       "dashDot",
+	ChartDashLgDashDot:     "lgDashDot",
+	ChartDashLgDashDotDot:  "lgDashDotDot",
+	ChartDashSysDash:       "sysDash",
+	ChartDashSysDot:        "sysDot",
+	ChartDashSysDashDot:    "sysDashDot",
+	ChartDashSysDashDotDot: "sysDashDotDot",
+}
+
 // supportedChartDataLabelsPosition defined supported chart data labels position
 // types for each type of chart.
 var supportedChartDataLabelsPosition = map[ChartType][]ChartDataLabelPositionType{

xmlChart.go

@@ -266,6 +266,7 @@ type aLn struct {
 	NoFill    *attrValString `xml:"a:noFill"`
 	Round     string         `xml:"a:round,omitempty"`
 	SolidFill *aSolidFill    `xml:"a:solidFill"`
+	PrstDash  *attrValString `xml:"a:prstDash"`
 }
 
 // cTxPr (Text Properties) directly maps the txPr element. This element
@@ -614,6 +615,7 @@ type ChartLegend struct {
 
 // ChartMarker directly maps the format settings of the chart marker.
 type ChartMarker struct {
+	Border ChartLine
 	Fill   Fill
 	Symbol string
 	Size   int
@@ -622,6 +624,8 @@ type ChartMarker struct {
 // ChartLine directly maps the format settings of the chart line.
 type ChartLine struct {
 	Type   ChartLineType
+	Dash   ChartDashType
+	Fill   Fill
 	Smooth bool
 	Width  float64
 }