Merge pull request #219 from jdevelop/feature/chart-size

Added helper functions to set the chart size.

4 files changed, 85 insertions, 9 deletions

diff --git a/README.md b/README.md
index d9c70df..ecba08b 100644
--- a/README.md
+++ b/README.md
@@ -109,7 +109,7 @@ func main() {
     for k, v := range values {
         xlsx.SetCellValue("Sheet1", k, v)
     }
-    xlsx.AddChart("Sheet1", "E1", `{"type":"col3DClustered","series":[{"name":"Sheet1!$A$2","categories":"Sheet1!$B$1:$D$1","values":"Sheet1!$B$2:$D$2"},{"name":"Sheet1!$A$3","categories":"Sheet1!$B$1:$D$1","values":"Sheet1!$B$3:$D$3"},{"name":"Sheet1!$A$4","categories":"Sheet1!$B$1:$D$1","values":"Sheet1!$B$4:$D$4"}],"title":{"name":"Fruit 3D Clustered Column Chart"}}`)
+    xlsx.AddChart("Sheet1", "E1", `{"type":"col3DClustered","dimension":{"width":640, "height":480},"series":[{"name":"Sheet1!$A$2","categories":"Sheet1!$B$1:$D$1","values":"Sheet1!$B$2:$D$2"},{"name":"Sheet1!$A$3","categories":"Sheet1!$B$1:$D$1","values":"Sheet1!$B$3:$D$3"},{"name":"Sheet1!$A$4","categories":"Sheet1!$B$1:$D$1","values":"Sheet1!$B$4:$D$4"}],"title":{"name":"Fruit 3D Clustered Column Chart"}}`)
     // Save xlsx file by the given path.
     err := xlsx.SaveAs("./Book1.xlsx")
     if err != nil {
diff --git a/chart.go b/chart.go
index c71dd9f..78bbe6e 100644
--- a/chart.go
+++ b/chart.go
@@ -194,6 +194,10 @@ var (
 // chart with default value.
 func parseFormatChartSet(formatSet string) *formatChart {
 	format := formatChart{
+		Dimension: formatChartDimension{
+			Width:  480,
+			Height: 290,
+		},
 		Format: formatPicture{
 			FPrintsWithSheet: true,
 			FLocksWithSheet:  false,
@@ -361,7 +365,7 @@ func (f *File) AddChart(sheet, cell, format string) {
 	drawingXML := "xl/drawings/drawing" + strconv.Itoa(drawingID) + ".xml"
 	drawingID, drawingXML = f.prepareDrawing(xlsx, drawingID, sheet, drawingXML)
 	drawingRID := f.addDrawingRelationships(drawingID, SourceRelationshipChart, "../charts/chart"+strconv.Itoa(chartID)+".xml", "")
-	f.addDrawingChart(sheet, drawingXML, cell, 480, 290, drawingRID, &formatSet.Format)
+	f.addDrawingChart(sheet, drawingXML, cell, formatSet.Dimension.Width, formatSet.Dimension.Height, drawingRID, &formatSet.Format)
 	f.addChart(formatSet)
 	f.addContentTypePart(chartID, "chart")
 	f.addContentTypePart(drawingID, "drawings")
diff --git a/chart_test.go b/chart_test.go
new file mode 100644
index 0000000..d35c272
--- /dev/null
+++ b/chart_test.go
@@ -0,0 +1,66 @@
+package excelize
+
+import (
+	"bytes"
+	"encoding/xml"
+	"testing"
+)
+
+func TestChartSize(t *testing.T) {
+
+	var buffer bytes.Buffer
+
+	categories := map[string]string{"A2": "Small", "A3": "Normal", "A4": "Large", "B1": "Apple", "C1": "Orange", "D1": "Pear"}
+	values := map[string]int{"B2": 2, "C2": 3, "D2": 3, "B3": 5, "C3": 2, "D3": 4, "B4": 6, "C4": 7, "D4": 8}
+	xlsx := NewFile()
+	for k, v := range categories {
+		xlsx.SetCellValue("Sheet1", k, v)
+	}
+	for k, v := range values {
+		xlsx.SetCellValue("Sheet1", k, v)
+	}
+	xlsx.AddChart("Sheet1", "E4", `{"type":"col3DClustered","dimension":{"width":640, "height":480},"series":[{"name":"Sheet1!$A$2","categories":"Sheet1!$B$1:$D$1","values":"Sheet1!$B$2:$D$2"},{"name":"Sheet1!$A$3","categories":"Sheet1!$B$1:$D$1","values":"Sheet1!$B$3:$D$3"},{"name":"Sheet1!$A$4","categories":"Sheet1!$B$1:$D$1","values":"Sheet1!$B$4:$D$4"}],"title":{"name":"Fruit 3D Clustered Column Chart"}}`)
+	// Save xlsx file by the given path.
+	err := xlsx.Write(&buffer)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	newFile, err := OpenReader(&buffer)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	chartsNum := newFile.countCharts()
+	if chartsNum != 1 {
+		t.Fatalf("Expected 1 chart, actual %d", chartsNum)
+	}
+
+	var (
+		workdir decodeWsDr
+		anchor  decodeTwoCellAnchor
+	)
+
+	content, ok := newFile.XLSX["xl/drawings/drawing1.xml"]
+	if !ok {
+		t.Fatal("Can't open the chart")
+	}
+
+	err = xml.Unmarshal([]byte(content), &workdir)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = xml.Unmarshal([]byte("<decodeTwoCellAnchor>"+workdir.TwoCellAnchor[0].Content+"</decodeTwoCellAnchor>"), &anchor)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if anchor.From.Col != 4 || anchor.From.Row != 3 {
+		t.Fatalf("From: Expected column 4, row 3, actual column %d, row %d", anchor.From.Col, anchor.From.Row)
+	}
+	if anchor.To.Col != 14 || anchor.To.Row != 27 {
+		t.Fatalf("To: Expected column 14, row 27, actual column %d, row %d", anchor.To.Col, anchor.To.Row)
+	}
+
+}
diff --git a/xmlChart.go b/xmlChart.go
index 252a896..a263334 100644
--- a/xmlChart.go
+++ b/xmlChart.go
@@ -506,15 +506,21 @@ type formatChartAxis struct {
 	NameLayout formatLayout `json:"name_layout"`
 }
 
+type formatChartDimension struct {
+	Width  int `json:"width"`
+	Height int `json:"height"`
+}
+
 // formatChart directly maps the format settings of the chart.
 type formatChart struct {
-	Type      string              `json:"type"`
-	Series    []formatChartSeries `json:"series"`
-	Format    formatPicture       `json:"format"`
-	Legend    formatChartLegend   `json:"legend"`
-	Title     formatChartTitle    `json:"title"`
-	XAxis     formatChartAxis     `json:"x_axis"`
-	YAxis     formatChartAxis     `json:"y_axis"`
+	Type      string               `json:"type"`
+	Series    []formatChartSeries  `json:"series"`
+	Format    formatPicture        `json:"format"`
+	Dimension formatChartDimension `json:"dimension"`
+	Legend    formatChartLegend    `json:"legend"`
+	Title     formatChartTitle     `json:"title"`
+	XAxis     formatChartAxis      `json:"x_axis"`
+	YAxis     formatChartAxis      `json:"y_axis"`
 	Chartarea struct {
 		Border struct {
 			None bool `json:"none"`