summaryrefslogtreecommitdiff
path: root/chart.go
diff options
context:
space:
mode:
Diffstat (limited to 'chart.go')
-rw-r--r--chart.go42
1 files changed, 6 insertions, 36 deletions
diff --git a/chart.go b/chart.go
index b589726..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,
@@ -351,13 +355,7 @@ func parseFormatChartSet(formatSet string) *formatChart {
// maximum: Specifies that the fixed maximum, 0 is auto. The maximum property is optional. The default value is auto.
// minimum: Specifies that the fixed minimum, 0 is auto. The minimum property is optional. The default value is auto.
//
-func (f *File) AddChart(sheet, cell, format string, opts ...chartOpts) {
-
- var defOpts = defaultChartOptions
- for _, optF := range opts {
- optF(&defOpts)
- }
-
+func (f *File) AddChart(sheet, cell, format string) {
formatSet := parseFormatChartSet(format)
// Read sheet data.
xlsx := f.workSheetReader(sheet)
@@ -367,40 +365,12 @@ func (f *File) AddChart(sheet, cell, format string, opts ...chartOpts) {
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, defOpts.width, defOpts.height, 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")
}
-type chartOptions struct {
- width int
- height int
-}
-
-var defaultChartOptions = chartOptions{
- width: 480,
- height: 290,
-}
-
-type chartOpts func(opts *chartOptions)
-
-// ChartWidth sets the chart width.
-func ChartWidth(width int) chartOpts {
- return func(opts *chartOptions) {
- opts.width = width
- return
- }
-}
-
-// ChartHeight sets the chart height.
-func ChartHeight(height int) chartOpts {
- return func(opts *chartOptions) {
- opts.height = height
- return
- }
-}
-
// countCharts provides function to get chart files count storage in the
// folder xl/charts.
func (f *File) countCharts() int {