test: add test for bar chart

bar_chart.go

@@ -33,7 +33,7 @@ type barChartOption struct {
 	Font       *truetype.Font
 }
 
-func barChartRender(opt barChartOption, result *basicRenderResult) ([]*markPointRenderOption, error) {
+func barChartRender(opt barChartOption, result *basicRenderResult) ([]markPointRenderOption, error) {
 
 	d, err := NewDraw(DrawOption{
 		Parent: result.d,
@@ -67,7 +67,7 @@ func barChartRender(opt barChartOption, result *basicRenderResult) ([]*markPoint
 
 	r := d.Render
 
-	markPointRenderOptions := make([]*markPointRenderOption, 0)
+	markPointRenderOptions := make([]markPointRenderOption, 0)
 
 	for i, s := range opt.SeriesList {
 		// 由于series是for range，为同一个数据，因此需要clone
@@ -81,7 +81,7 @@ func barChartRender(opt barChartOption, result *basicRenderResult) ([]*markPoint
 		}
 		seriesColor := theme.GetSeriesColor(index)
 		// mark line
-		markLineRender(&markLineRenderOption{
+		markLineRender(markLineRenderOption{
 			Draw:        d,
 			FillColor:   seriesColor,
 			FontColor:   theme.GetTextColor(),
@@ -135,7 +135,7 @@ func barChartRender(opt barChartOption, result *basicRenderResult) ([]*markPoint
 			d.text(text, x+(barWidth-textBox.Width())>>1, barMaxHeight-h-5)
 		}
 
-		markPointRenderOptions = append(markPointRenderOptions, &markPointRenderOption{
+		markPointRenderOptions = append(markPointRenderOptions, markPointRenderOption{
 			Draw:      d,
 			FillColor: seriesColor,
 			Font:      opt.Font,

bar_chart_test.go

@@ -0,0 +1,96 @@
+// MIT License
+
+// Copyright (c) 2022 Tree Xie
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+package charts
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/wcharczuk/go-chart/v2"
+	"github.com/wcharczuk/go-chart/v2/drawing"
+)
+
+func TestBarChartRender(t *testing.T) {
+	assert := assert.New(t)
+
+	width := 400
+	height := 300
+	d, err := NewDraw(DrawOption{
+		Width:  width,
+		Height: height,
+	})
+	assert.Nil(err)
+
+	result := basicRenderResult{
+		xRange: &Range{
+			divideCount: 4,
+			Size:        width,
+			Boundary:    true,
+		},
+		yRangeList: []*Range{
+			{
+				divideCount: 6,
+				Max:         100,
+				Min:         0,
+				Size:        height,
+			},
+		},
+		d: d,
+	}
+	f, _ := chart.GetDefaultFont()
+
+	barChartRender(barChartOption{
+		Font: f,
+		SeriesList: SeriesList{
+			{
+				Label: SeriesLabel{
+					Show:  true,
+					Color: drawing.ColorBlue,
+				},
+				Data: []SeriesData{
+					{
+						Value: 20,
+					},
+					{
+						Value: 60,
+						Style: chart.Style{
+							FillColor: drawing.ColorRed,
+						},
+					},
+					{
+						Value: 90,
+					},
+				},
+			},
+			NewSeriesFromValues([]float64{
+				80,
+				30,
+				70,
+			}),
+		},
+	}, &result)
+
+	data, err := d.Bytes()
+	assert.Nil(err)
+	assert.Equal("<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" width=\"400\" height=\"300\">\\n<path  d=\"M 50 240\nL 87 240\nL 87 299\nL 50 299\nL 50 240\" style=\"stroke-width:1;stroke:rgba(84,112,198,1.0);fill:rgba(84,112,198,1.0)\"/><text x=\"61\" y=\"235\" style=\"stroke-width:0;stroke:none;fill:rgba(0,0,255,1.0);font-size:12.8px;font-family:'Roboto Medium',sans-serif\">20</text><path  d=\"M 150 120\nL 187 120\nL 187 299\nL 150 299\nL 150 120\" style=\"stroke-width:1;stroke:rgba(255,0,0,1.0);fill:rgba(255,0,0,1.0)\"/><text x=\"161\" y=\"115\" style=\"stroke-width:0;stroke:none;fill:rgba(0,0,255,1.0);font-size:12.8px;font-family:'Roboto Medium',sans-serif\">60</text><path  d=\"M 250 30\nL 287 30\nL 287 299\nL 250 299\nL 250 30\" style=\"stroke-width:1;stroke:rgba(84,112,198,1.0);fill:rgba(84,112,198,1.0)\"/><text x=\"261\" y=\"25\" style=\"stroke-width:0;stroke:none;fill:rgba(0,0,255,1.0);font-size:12.8px;font-family:'Roboto Medium',sans-serif\">90</text><path  d=\"M 92 60\nL 129 60\nL 129 299\nL 92 299\nL 92 60\" style=\"stroke-width:1;stroke:rgba(145,204,117,1.0);fill:rgba(145,204,117,1.0)\"/><path  d=\"M 192 210\nL 229 210\nL 229 299\nL 192 299\nL 192 210\" style=\"stroke-width:1;stroke:rgba(145,204,117,1.0);fill:rgba(145,204,117,1.0)\"/><path  d=\"M 292 90\nL 329 90\nL 329 299\nL 292 299\nL 292 90\" style=\"stroke-width:1;stroke:rgba(145,204,117,1.0);fill:rgba(145,204,117,1.0)\"/></svg>", string(data))
+}

chart.go

@@ -259,7 +259,7 @@ func Render(opt ChartOption) (*Draw, error) {
 	if err != nil {
 		return nil, err
 	}
-	markPointRenderOptions := make([]*markPointRenderOption, 0)
+	markPointRenderOptions := make([]markPointRenderOption, 0)
 	fns := []func() error{
 		// pie render
 		func() error {

line_chart.go

@@ -34,7 +34,7 @@ type lineChartOption struct {
 	Font       *truetype.Font
 }
 
-func lineChartRender(opt lineChartOption, result *basicRenderResult) ([]*markPointRenderOption, error) {
+func lineChartRender(opt lineChartOption, result *basicRenderResult) ([]markPointRenderOption, error) {
 
 	theme := NewTheme(opt.Theme)
 
@@ -51,7 +51,7 @@ func lineChartRender(opt lineChartOption, result *basicRenderResult) ([]*markPoi
 
 	r := d.Render
 	xRange := result.xRange
-	markPointRenderOptions := make([]*markPointRenderOption, 0)
+	markPointRenderOptions := make([]markPointRenderOption, 0)
 	for i, s := range opt.SeriesList {
 		// 由于series是for range，为同一个数据，因此需要clone
 		// 后续需要使用，如mark point
@@ -65,7 +65,7 @@ func lineChartRender(opt lineChartOption, result *basicRenderResult) ([]*markPoi
 		yRange := result.getYRange(series.YAxisIndex)
 		points := make([]Point, len(series.Data))
 		// mark line
-		markLineRender(&markLineRenderOption{
+		markLineRender(markLineRenderOption{
 			Draw:        d,
 			FillColor:   seriesColor,
 			FontColor:   theme.GetTextColor(),
@@ -111,7 +111,7 @@ func lineChartRender(opt lineChartOption, result *basicRenderResult) ([]*markPoi
 			DotFillColor: dotFillColor,
 		})
 		// draw mark point
-		markPointRenderOptions = append(markPointRenderOptions, &markPointRenderOption{
+		markPointRenderOptions = append(markPointRenderOptions, markPointRenderOption{
 			Draw:      d,
 			FillColor: seriesColor,
 			Font:      opt.Font,

mark_line.go

@@ -50,7 +50,7 @@ type markLineRenderOption struct {
 	Range       *Range
 }
 
-func markLineRender(opt *markLineRenderOption) {
+func markLineRender(opt markLineRenderOption) {
 	d := opt.Draw
 	s := opt.Series
 	if len(s.MarkLine.Data) == 0 {

mark_line_test.go

@@ -67,7 +67,7 @@ func TestMarkLineRender(t *testing.T) {
 	assert.Nil(err)
 	f, _ := chart.GetDefaultFont()
 
-	markLineRender(&markLineRenderOption{
+	markLineRender(markLineRenderOption{
 		Draw:        d,
 		FillColor:   drawing.ColorBlack,
 		FontColor:   drawing.ColorBlack,

mark_point.go

@@ -48,7 +48,7 @@ type markPointRenderOption struct {
 	Points    []Point
 }
 
-func markPointRender(opt *markPointRenderOption) {
+func markPointRender(opt markPointRenderOption) {
 	d := opt.Draw
 	s := opt.Series
 	if len(s.MarkPoint.Data) == 0 {

mark_point_test.go

@@ -68,7 +68,7 @@ func TestMarkPointRender(t *testing.T) {
 	assert.Nil(err)
 	f, _ := chart.GetDefaultFont()
 
-	markPointRender(&markPointRenderOption{
+	markPointRender(markPointRenderOption{
 		Draw:      d,
 		FillColor: drawing.ColorBlack,
 		Font:      f,