This closes #657 and closes #748, AddChart support custom marker symbol and symbol size, fix AddPicture auto fit failure with multi merged cells

1 files changed, 9 insertions, 2 deletions

diff --git a/drawing.go b/drawing.go
index 42eb420..0db5d0e 100644
--- a/drawing.go
+++ b/drawing.go
@@ -841,10 +841,17 @@ func (f *File) drawChartSeriesVal(v formatChartSeries, formatSet *formatChart) *
 // drawChartSeriesMarker provides a function to draw the c:marker element by
 // given data index and format sets.
 func (f *File) drawChartSeriesMarker(i int, formatSet *formatChart) *cMarker {
+	defaultSymbol := map[string]*attrValString{Scatter: &attrValString{Val: stringPtr("circle")}}
 	marker := &cMarker{
-		Symbol: &attrValString{Val: stringPtr("circle")},
+		Symbol: defaultSymbol[formatSet.Type],
 		Size:   &attrValInt{Val: intPtr(5)},
 	}
+	if symbol := stringPtr(formatSet.Series[i].Marker.Symbol); *symbol != "" {
+		marker.Symbol = &attrValString{Val: symbol}
+	}
+	if size := intPtr(formatSet.Series[i].Marker.Size); *size != 0 {
+		marker.Size = &attrValInt{Val: size}
+	}
 	if i < 6 {
 		marker.SpPr = &cSpPr{
 			SolidFill: &aSolidFill{
@@ -862,7 +869,7 @@ func (f *File) drawChartSeriesMarker(i int, formatSet *formatChart) *cMarker {
 			},
 		}
 	}
-	chartSeriesMarker := map[string]*cMarker{Scatter: marker}
+	chartSeriesMarker := map[string]*cMarker{Scatter: marker, Line: marker}
 	return chartSeriesMarker[formatSet.Type]
 }