update URL in examples

fix: Label position of the pie chart

.github/workflows/test.yml

@@ -14,14 +14,12 @@ jobs:
     strategy:
       matrix:
         go:
+        - '1.22'
+        - '1.21'
         - '1.20'
         - '1.19'
         - '1.18'
         - '1.17'
-        - '1.16'
-        - '1.15'
-        - '1.14'
-        - '1.13'
     steps:
 
     - name: Go ${{ matrix.go }} test 

README.md

@@ -1,5 +1,7 @@
 # go-charts
 
+Clone from https://github.com/vicanso/go-charts
+
 [![license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/vicanso/go-charts/blob/master/LICENSE)
 [![Build Status](https://github.com/vicanso/go-charts/workflows/Test/badge.svg)](https://github.com/vicanso/go-charts/actions)
 
@@ -33,7 +35,7 @@ More examples can be found in the [./examples/](./examples/) directory.
 package main
 
 import (
-	charts "github.com/vicanso/go-charts/v2"
+	charts "git.smarteching.com/zeni/go-charts/v2"
 )
 
 func main() {
@@ -99,7 +101,7 @@ func main() {
 package main
 
 import (
-	"github.com/vicanso/go-charts/v2"
+	"git.smarteching.com/zeni/go-charts/v2"
 )
 
 func main() {
@@ -174,7 +176,7 @@ func main() {
 package main
 
 import (
-	"github.com/vicanso/go-charts/v2"
+	"git.smarteching.com/zeni/go-charts/v2"
 )
 
 func main() {
@@ -231,7 +233,7 @@ func main() {
 package main
 
 import (
-	"github.com/vicanso/go-charts/v2"
+	"git.smarteching.com/zeni/go-charts/v2"
 )
 
 func main() {
@@ -286,7 +288,7 @@ func main() {
 package main
 
 import (
-	"github.com/vicanso/go-charts/v2"
+	"git.smarteching.com/zeni/go-charts/v2"
 )
 
 func main() {
@@ -344,7 +346,7 @@ func main() {
 package main
 
 import (
-	"github.com/vicanso/go-charts/v2"
+	"git.smarteching.com/zeni/go-charts/v2"
 )
 
 func main() {
@@ -384,7 +386,7 @@ func main() {
 package main
 
 import (
-	"github.com/vicanso/go-charts/v2"
+	"git.smarteching.com/zeni/go-charts/v2"
 )
 
 func main() {
@@ -449,7 +451,7 @@ func main() {
 package main
 
 import (
-	"github.com/vicanso/go-charts/v2"
+	"git.smarteching.com/zeni/go-charts/v2"
 )
 
 func main() {

README_zh.md

@@ -32,7 +32,7 @@
 package main
 
 import (
-	charts "github.com/vicanso/go-charts/v2"
+	charts "git.smarteching.com/zeni/go-charts/v2"
 )
 
 func main() {
@@ -98,7 +98,7 @@ func main() {
 package main
 
 import (
-	"github.com/vicanso/go-charts/v2"
+	"git.smarteching.com/zeni/go-charts/v2"
 )
 
 func main() {
@@ -173,7 +173,7 @@ func main() {
 package main
 
 import (
-	"github.com/vicanso/go-charts/v2"
+	"git.smarteching.com/zeni/go-charts/v2"
 )
 
 func main() {
@@ -230,7 +230,7 @@ func main() {
 package main
 
 import (
-	"github.com/vicanso/go-charts/v2"
+	"git.smarteching.com/zeni/go-charts/v2"
 )
 
 func main() {
@@ -285,7 +285,7 @@ func main() {
 package main
 
 import (
-	"github.com/vicanso/go-charts/v2"
+	"git.smarteching.com/zeni/go-charts/v2"
 )
 
 func main() {
@@ -343,7 +343,7 @@ func main() {
 package main
 
 import (
-	"github.com/vicanso/go-charts/v2"
+	"git.smarteching.com/zeni/go-charts/v2"
 )
 
 func main() {
@@ -383,7 +383,7 @@ func main() {
 package main
 
 import (
-	"github.com/vicanso/go-charts/v2"
+	"git.smarteching.com/zeni/go-charts/v2"
 )
 
 func main() {
@@ -447,7 +447,7 @@ func main() {
 package main
 
 import (
-	"github.com/vicanso/go-charts/v2"
+	"git.smarteching.com/zeni/go-charts/v2"
 )
 
 func main() {

alias.go

@@ -23,8 +23,8 @@
 package charts
 
 import (
-	"github.com/wcharczuk/go-chart/v2"
+	"git.smarteching.com/zeni/go-chart/v2"
-	"github.com/wcharczuk/go-chart/v2/drawing"
+	"git.smarteching.com/zeni/go-chart/v2/drawing"
 )
 
 type Box = chart.Box

axis.go

@@ -26,7 +26,7 @@ import (
 	"strings"
 
 	"github.com/golang/freetype/truetype"
-	"github.com/wcharczuk/go-chart/v2"
+	"git.smarteching.com/zeni/go-chart/v2"
 )
 
 type axisPainter struct {

axis_test.go

@@ -26,7 +26,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/wcharczuk/go-chart/v2/drawing"
+	"git.smarteching.com/zeni/go-chart/v2/drawing"
 )
 
 func TestAxis(t *testing.T) {

bar_chart.go

@@ -26,7 +26,7 @@ import (
 	"math"
 
 	"github.com/golang/freetype/truetype"
-	"github.com/wcharczuk/go-chart/v2"
+	"git.smarteching.com/zeni/go-chart/v2"
 )
 
 type barChart struct {
@@ -63,6 +63,8 @@ type BarChartOption struct {
 	// The legend option
 	Legend   LegendOption
 	BarWidth int
+	// Margin of bar
+	BarMargin int
 }
 
 func (b *barChart) render(result *defaultRenderResult, seriesList SeriesList) (Box, error) {
@@ -88,6 +90,9 @@ func (b *barChart) render(result *defaultRenderResult, seriesList SeriesList) (B
 		margin = 5
 		barMargin = 3
 	}
+	if opt.BarMargin > 0 {
+		barMargin = opt.BarMargin
+	}
 	seriesCount := len(seriesList)
 	// 总的宽度-两个margin-(总数-1)的barMargin
 	barWidth := (width - 2*margin - barMargin*(seriesCount-1)) / seriesCount
@@ -142,14 +147,25 @@ func (b *barChart) render(result *defaultRenderResult, seriesList SeriesList) (B
 			}
 			top := barMaxHeight - h
 
-			seriesPainter.OverrideDrawingStyle(Style{
+			if series.RoundRadius <= 0 {
-				FillColor: fillColor,
+				seriesPainter.OverrideDrawingStyle(Style{
-			}).Rect(chart.Box{
+					FillColor: fillColor,
-				Top:    top,
+				}).Rect(chart.Box{
-				Left:   x,
+					Top:    top,
-				Right:  x + barWidth,
+					Left:   x,
-				Bottom: barMaxHeight - 1,
+					Right:  x + barWidth,
-			})
+					Bottom: barMaxHeight - 1,
+				})
+			} else {
+				seriesPainter.OverrideDrawingStyle(Style{
+					FillColor: fillColor,
+				}).RoundedRect(chart.Box{
+					Top:    top,
+					Left:   x,
+					Right:  x + barWidth,
+					Bottom: barMaxHeight - 1,
+				}, series.RoundRadius)
+			}
 			// 用于生成marker point
 			points[j] = Point{
 				// 居中的位置

chart_option.go

@@ -67,6 +67,8 @@ type ChartOption struct {
 	LineStrokeWidth float64
 	// The bar with of bar chart
 	BarWidth int
+	// The margin of each bar
+	BarMargin int
 	// The bar height of horizontal bar chart
 	BarHeight int
 	// Fill the area of line chart

chart_option_test.go

@@ -26,7 +26,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/wcharczuk/go-chart/v2/drawing"
+	"git.smarteching.com/zeni/go-chart/v2/drawing"
 )
 
 func TestChartOption(t *testing.T) {

charts.go

@@ -27,7 +27,7 @@ import (
 	"math"
 	"sort"
 
-	"github.com/wcharczuk/go-chart/v2"
+	"git.smarteching.com/zeni/go-chart/v2"
 )
 
 const labelFontSize = 10
@@ -375,10 +375,11 @@ func Render(opt ChartOption, opts ...OptionFunc) (*Painter, error) {
 	if len(barSeriesList) != 0 {
 		handler.Add(func() error {
 			_, err := NewBarChart(p, BarChartOption{
-				Theme:    opt.theme,
+				Theme:     opt.theme,
-				Font:     opt.font,
+				Font:      opt.font,
-				XAxis:    opt.XAxis,
+				XAxis:     opt.XAxis,
-				BarWidth: opt.BarWidth,
+				BarWidth:  opt.BarWidth,
+				BarMargin: opt.BarMargin,
 			}).render(renderResult, barSeriesList)
 			return err
 		})
@@ -391,6 +392,7 @@ func Render(opt ChartOption, opts ...OptionFunc) (*Painter, error) {
 				Theme:        opt.theme,
 				Font:         opt.font,
 				BarHeight:    opt.BarHeight,
+				BarMargin:    opt.BarMargin,
 				YAxisOptions: opt.YAxisOptions,
 			}).render(renderResult, horizontalBarSeriesList)
 			return err

charts_test.go

@@ -26,7 +26,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/wcharczuk/go-chart/v2"
+	"git.smarteching.com/zeni/go-chart/v2"
 )
 
 func BenchmarkMultiChartPNGRender(b *testing.B) {

echarts.go

@@ -29,7 +29,7 @@ import (
 	"regexp"
 	"strconv"
 
-	"github.com/wcharczuk/go-chart/v2"
+	"git.smarteching.com/zeni/go-chart/v2"
 )
 
 func convertToArray(data []byte) []byte {
@@ -344,6 +344,11 @@ func (esList EChartsSeriesList) ToSeriesList() SeriesList {
 					Data: NewSeriesDataFromValues(dataItem.Value.values),
 					Max:  item.Max,
 					Min:  item.Min,
+					Label: SeriesLabel{
+						Color:    parseColor(item.Label.Color),
+						Show:     item.Label.Show,
+						Distance: item.Label.Distance,
+					},
 				})
 			}
 			continue

echarts_test.go

@@ -27,7 +27,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/wcharczuk/go-chart/v2/drawing"
+	"git.smarteching.com/zeni/go-chart/v2/drawing"
 )
 
 func TestConvertToArray(t *testing.T) {

examples/area_line_chart/main.go

@@ -1,11 +1,10 @@
 package main
 
 import (
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
-	"github.com/vicanso/go-charts/v2"
+	"git.smarteching.com/zeni/go-charts/v2"
 )
 
 func writeFile(buf []byte) error {
@@ -16,7 +15,7 @@ func writeFile(buf []byte) error {
 	}
 
 	file := filepath.Join(tmpPath, "area-line-chart.png")
-	err = ioutil.WriteFile(file, buf, 0600)
+	err = os.WriteFile(file, buf, 0600)
 	if err != nil {
 		return err
 	}

examples/bar_chart/main.go

@@ -1,11 +1,10 @@
 package main
 
 import (
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
-	"github.com/vicanso/go-charts/v2"
+	"git.smarteching.com/zeni/go-charts/v2"
 )
 
 func writeFile(buf []byte) error {
@@ -16,7 +15,7 @@ func writeFile(buf []byte) error {
 	}
 
 	file := filepath.Join(tmpPath, "bar-chart.png")
-	err = ioutil.WriteFile(file, buf, 0600)
+	err = os.WriteFile(file, buf, 0600)
 	if err != nil {
 		return err
 	}

examples/charts/main.go

@@ -6,7 +6,7 @@ import (
 	"net/http"
 	"strconv"
 
-	charts "github.com/vicanso/go-charts/v2"
+	charts "git.smarteching.com/zeni/go-charts/v2"
 )
 
 var html = `<!DOCTYPE html>

examples/chinese/main.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/vicanso/go-charts/v2"
+	"git.smarteching.com/zeni/go-charts/v2"
 )
 
 func writeFile(buf []byte) error {
@@ -16,7 +16,7 @@ func writeFile(buf []byte) error {
 	}
 
 	file := filepath.Join(tmpPath, "chinese-line-chart.png")
-	err = ioutil.WriteFile(file, buf, 0600)
+	err = os.WriteFile(file, buf, 0600)
 	if err != nil {
 		return err
 	}

examples/funnel_chart/main.go

@@ -1,11 +1,10 @@
 package main
 
 import (
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
-	"github.com/vicanso/go-charts/v2"
+	"git.smarteching.com/zeni/go-charts/v2"
 )
 
 func writeFile(buf []byte) error {
@@ -16,7 +15,7 @@ func writeFile(buf []byte) error {
 	}
 
 	file := filepath.Join(tmpPath, "funnel-chart.png")
-	err = ioutil.WriteFile(file, buf, 0600)
+	err = os.WriteFile(file, buf, 0600)
 	if err != nil {
 		return err
 	}

examples/horizontal_bar_chart/main.go

@@ -1,11 +1,10 @@
 package main
 
 import (
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
-	"github.com/vicanso/go-charts/v2"
+	"git.smarteching.com/zeni/go-charts/v2"
 )
 
 func writeFile(buf []byte) error {
@@ -16,7 +15,7 @@ func writeFile(buf []byte) error {
 	}
 
 	file := filepath.Join(tmpPath, "horizontal-bar-chart.png")
-	err = ioutil.WriteFile(file, buf, 0600)
+	err = os.WriteFile(file, buf, 0600)
 	if err != nil {
 		return err
 	}
@@ -66,6 +65,9 @@ func main() {
 			"China",
 			"World",
 		}),
+		func(opt *charts.ChartOption) {
+			opt.SeriesList[0].RoundRadius = 5
+		},
 	)
 	if err != nil {
 		panic(err)

examples/line_chart/main.go

@@ -2,11 +2,10 @@ package main
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
-	"github.com/vicanso/go-charts/v2"
+	"git.smarteching.com/zeni/go-charts/v2"
 )
 
 func writeFile(buf []byte) error {
@@ -17,7 +16,7 @@ func writeFile(buf []byte) error {
 	}
 
 	file := filepath.Join(tmpPath, "line-chart.png")
-	err = ioutil.WriteFile(file, buf, 0600)
+	err = os.WriteFile(file, buf, 0600)
 	if err != nil {
 		return err
 	}
@@ -97,6 +96,11 @@ func main() {
 				Top:    5,
 				Bottom: 10,
 			}
+			opt.YAxisOptions = []charts.YAxisOption{
+				{
+					SplitLineShow: charts.FalseFlag(),
+				},
+			}
 			opt.SymbolShow = charts.FalseFlag()
 			opt.LineStrokeWidth = 1
 			opt.ValueFormatter = func(f float64) string {

examples/painter/main.go

@@ -1,12 +1,11 @@
 package main
 
 import (
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
-	charts "github.com/vicanso/go-charts/v2"
+	charts "git.smarteching.com/zeni/go-charts/v2"
-	"github.com/wcharczuk/go-chart/v2/drawing"
+	"git.smarteching.com/zeni/go-chart/v2/drawing"
 )
 
 func writeFile(buf []byte) error {
@@ -17,7 +16,7 @@ func writeFile(buf []byte) error {
 	}
 
 	file := filepath.Join(tmpPath, "painter.png")
-	err = ioutil.WriteFile(file, buf, 0600)
+	err = os.WriteFile(file, buf, 0600)
 	if err != nil {
 		return err
 	}

examples/pie_chart/main.go

@@ -1,11 +1,10 @@
 package main
 
 import (
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
-	"github.com/vicanso/go-charts/v2"
+	"git.smarteching.com/zeni/go-charts/v2"
 )
 
 func writeFile(buf []byte) error {
@@ -16,7 +15,7 @@ func writeFile(buf []byte) error {
 	}
 
 	file := filepath.Join(tmpPath, "pie-chart.png")
-	err = ioutil.WriteFile(file, buf, 0600)
+	err = os.WriteFile(file, buf, 0600)
 	if err != nil {
 		return err
 	}

examples/radar_chart/main.go

@@ -1,11 +1,10 @@
 package main
 
 import (
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
-	"github.com/vicanso/go-charts/v2"
+	"git.smarteching.com/zeni/go-charts/v2"
 )
 
 func writeFile(buf []byte) error {
@@ -16,7 +15,7 @@ func writeFile(buf []byte) error {
 	}
 
 	file := filepath.Join(tmpPath, "radar-chart.png")
-	err = ioutil.WriteFile(file, buf, 0600)
+	err = os.WriteFile(file, buf, 0600)
 	if err != nil {
 		return err
 	}

examples/table/main.go

@@ -1,14 +1,13 @@
 package main
 
 import (
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strconv"
 	"strings"
 
-	"github.com/vicanso/go-charts/v2"
+	"git.smarteching.com/zeni/go-charts/v2"
-	"github.com/wcharczuk/go-chart/v2/drawing"
+	"git.smarteching.com/zeni/go-chart/v2/drawing"
 )
 
 func writeFile(buf []byte, filename string) error {
@@ -19,7 +18,7 @@ func writeFile(buf []byte, filename string) error {
 	}
 
 	file := filepath.Join(tmpPath, filename)
-	err = ioutil.WriteFile(file, buf, 0600)
+	err = os.WriteFile(file, buf, 0600)
 	if err != nil {
 		return err
 	}

examples/time_line_chart/main.go

@@ -3,13 +3,12 @@ package main
 import (
 	"crypto/rand"
 	"fmt"
-	"io/ioutil"
 	"math/big"
 	"os"
 	"path/filepath"
 	"time"
 
-	"github.com/vicanso/go-charts/v2"
+	"git.smarteching.com/zeni/go-charts/v2"
 )
 
 func writeFile(buf []byte) error {
@@ -20,7 +19,7 @@ func writeFile(buf []byte) error {
 	}
 
 	file := filepath.Join(tmpPath, "time-line-chart.png")
-	err = ioutil.WriteFile(file, buf, 0600)
+	err = os.WriteFile(file, buf, 0600)
 	if err != nil {
 		return err
 	}

font.go

@@ -27,7 +27,7 @@ import (
 	"sync"
 
 	"github.com/golang/freetype/truetype"
-	"github.com/wcharczuk/go-chart/v2/roboto"
+	"git.smarteching.com/zeni/go-chart/v2/roboto"
 )
 
 var fonts = sync.Map{}

font_test.go

@@ -26,7 +26,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/wcharczuk/go-chart/v2/roboto"
+	"git.smarteching.com/zeni/go-chart/v2/roboto"
 )
 
 func TestInstallFont(t *testing.T) {

go.mod

@@ -1,17 +1,17 @@
-module github.com/vicanso/go-charts/v2
+module git.smarteching.com/zeni/go-charts/v2
 
-go 1.17
+go 1.24.1
 
 require (
+	git.smarteching.com/zeni/go-chart/v2 v2.1.4
 	github.com/dustin/go-humanize v1.0.1
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0
-	github.com/stretchr/testify v1.8.2
+	github.com/stretchr/testify v1.10.0
-	github.com/wcharczuk/go-chart/v2 v2.1.0
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	golang.org/x/image v0.0.0-20200927104501-e162460cd6b5 // indirect
+	golang.org/x/image v0.21.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -1,4 +1,5 @@
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+git.smarteching.com/zeni/go-chart/v2 v2.1.4 h1:pF06+F6eqJLIG8uMiTVPR5TygPGMjM/FHMzTxmu5V/Q=
+git.smarteching.com/zeni/go-chart/v2 v2.1.4/go.mod h1:b3ueW9h3pGGXyhkormZAvilHaG4+mQti+bMNPdQBeOQ=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
@@ -7,20 +8,11 @@ github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF0
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+golang.org/x/image v0.21.0 h1:c5qV36ajHpdj4Qi0GnE0jUc/yuo33OLFaa0d+crTD5s=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+golang.org/x/image v0.21.0/go.mod h1:vUbsLavqK/W303ZroQQVKQ+Af3Yl6Uz1Ppu5J/cLz78=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
-github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/wcharczuk/go-chart/v2 v2.1.0 h1:tY2slqVQ6bN+yHSnDYwZebLQFkphK4WNrVwnt7CJZ2I=
-github.com/wcharczuk/go-chart/v2 v2.1.0/go.mod h1:yx7MvAVNcP/kN9lKXM/NTce4au4DFN99j6i1OwDclNA=
-golang.org/x/image v0.0.0-20200927104501-e162460cd6b5 h1:QelT11PB4FXiDEXucrfNckHoFxwt8USGY1ajP1ZF5lM=
-golang.org/x/image v0.0.0-20200927104501-e162460cd6b5/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

grid_test.go

@@ -26,7 +26,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/wcharczuk/go-chart/v2/drawing"
+	"git.smarteching.com/zeni/go-chart/v2/drawing"
 )
 
 func TestGrid(t *testing.T) {

horizontal_bar_chart.go

@@ -24,7 +24,7 @@ package charts
 
 import (
 	"github.com/golang/freetype/truetype"
-	"github.com/wcharczuk/go-chart/v2"
+	"git.smarteching.com/zeni/go-chart/v2"
 )
 
 type horizontalBarChart struct {
@@ -50,6 +50,8 @@ type HorizontalBarChartOption struct {
 	// The legend option
 	Legend    LegendOption
 	BarHeight int
+	// Margin of bar
+	BarMargin int
 }
 
 // NewHorizontalBarChart returns a horizontal bar chart renderer
@@ -81,6 +83,9 @@ func (h *horizontalBarChart) render(result *defaultRenderResult, seriesList Seri
 		margin = 5
 		barMargin = 3
 	}
+	if opt.BarMargin > 0 {
+		barMargin = opt.BarMargin
+	}
 	seriesCount := len(seriesList)
 	// 总的高度-两个margin-(总数-1)的barMargin
 	barHeight := (height - 2*margin - barMargin*(seriesCount-1)) / seriesCount
@@ -136,14 +141,26 @@ func (h *horizontalBarChart) render(result *defaultRenderResult, seriesList Seri
 				fillColor = item.Style.FillColor
 			}
 			right := w
-			seriesPainter.OverrideDrawingStyle(Style{
+			if series.RoundRadius <= 0 {
-				FillColor: fillColor,
+				seriesPainter.OverrideDrawingStyle(Style{
-			}).Rect(chart.Box{
+					FillColor: fillColor,
-				Top:    y,
+				}).Rect(chart.Box{
-				Left:   0,
+					Top:    y,
-				Right:  right,
+					Left:   0,
-				Bottom: y + barHeight,
+					Right:  right,
-			})
+					Bottom: y + barHeight,
+				})
+			} else {
+				seriesPainter.OverrideDrawingStyle(Style{
+					FillColor: fillColor,
+				}).RoundedRect(chart.Box{
+					Top:    y,
+					Left:   0,
+					Right:  right,
+					Bottom: y + barHeight,
+				}, series.RoundRadius)
+			}
+
 			// 如果label不需要展示，则返回
 			if labelPainter == nil {
 				continue

line_chart.go

@@ -26,7 +26,7 @@ import (
 	"math"
 
 	"github.com/golang/freetype/truetype"
-	"github.com/wcharczuk/go-chart/v2/drawing"
+	"git.smarteching.com/zeni/go-chart/v2/drawing"
 )
 
 type lineChart struct {
@@ -115,6 +115,9 @@ func (l *lineChart) render(result *defaultRenderResult, seriesList SeriesList) (
 			StrokeColor: seriesColor,
 			StrokeWidth: strokeWidth,
 		}
+		if len(series.Style.StrokeDashArray) > 0 {
+			drawingStyle.StrokeDashArray = series.Style.StrokeDashArray
+		}
 
 		yRange := result.axisRanges[series.AxisIndex]
 		points := make([]Point, 0)

mark_line_test.go

@@ -26,7 +26,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/wcharczuk/go-chart/v2/drawing"
+	"git.smarteching.com/zeni/go-chart/v2/drawing"
 )
 
 func TestMarkLine(t *testing.T) {

mark_point_test.go

@@ -26,7 +26,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/wcharczuk/go-chart/v2/drawing"
+	"git.smarteching.com/zeni/go-chart/v2/drawing"
 )
 
 func TestMarkPoint(t *testing.T) {

painter.go

@@ -28,7 +28,7 @@ import (
 	"math"
 
 	"github.com/golang/freetype/truetype"
-	"github.com/wcharczuk/go-chart/v2"
+	"git.smarteching.com/zeni/go-chart/v2"
 )
 
 type ValueFormatter func(float64) string
@@ -803,6 +803,48 @@ func (p *Painter) Rect(box Box) *Painter {
 	return p
 }
 
+func (p *Painter) RoundedRect(box Box, radius int) *Painter {
+	r := (box.Right - box.Left) / 2
+	if radius > r {
+		radius = r
+	}
+	rx := float64(radius)
+	ry := float64(radius)
+	p.MoveTo(box.Left+radius, box.Top)
+	p.LineTo(box.Right-radius, box.Top)
+
+	cx := box.Right - radius
+	cy := box.Top + radius
+	// right top
+	p.ArcTo(cx, cy, rx, ry, -math.Pi/2, math.Pi/2)
+
+	p.LineTo(box.Right, box.Bottom-radius)
+
+	// right bottom
+	cx = box.Right - radius
+	cy = box.Bottom - radius
+	p.ArcTo(cx, cy, rx, ry, 0.0, math.Pi/2)
+
+	p.LineTo(box.Left+radius, box.Bottom)
+
+	// left bottom
+	cx = box.Left + radius
+	cy = box.Bottom - radius
+	p.ArcTo(cx, cy, rx, ry, math.Pi/2, math.Pi/2)
+
+	p.LineTo(box.Left, box.Top+radius)
+
+	// left top
+	cx = box.Left + radius
+	cy = box.Top + radius
+	p.ArcTo(cx, cy, rx, ry, math.Pi, math.Pi/2)
+
+	p.Close()
+	p.FillStroke()
+	p.Fill()
+	return p
+}
+
 func (p *Painter) LegendLineDot(box Box) *Painter {
 	width := box.Width()
 	height := box.Height()
@@ -818,3 +860,7 @@ func (p *Painter) LegendLineDot(box Box) *Painter {
 	p.FillStroke()
 	return p
 }
+
+func (p *Painter) GetRenderer() chart.Renderer {
+	return p.render
+}

painter_test.go

@@ -28,8 +28,8 @@ import (
 
 	"github.com/golang/freetype/truetype"
 	"github.com/stretchr/testify/assert"
-	"github.com/wcharczuk/go-chart/v2"
+	"git.smarteching.com/zeni/go-chart/v2"
-	"github.com/wcharczuk/go-chart/v2/drawing"
+	"git.smarteching.com/zeni/go-chart/v2/drawing"
 )
 
 func TestPainterOption(t *testing.T) {
@@ -343,6 +343,29 @@ func TestPainter(t *testing.T) {
 	}
 }
 
+func TestRoundedRect(t *testing.T) {
+	assert := assert.New(t)
+	p, err := NewPainter(PainterOptions{
+		Width:  400,
+		Height: 300,
+		Type:   ChartOutputSVG,
+	})
+	assert.Nil(err)
+	p.OverrideDrawingStyle(Style{
+		FillColor:   drawing.ColorWhite,
+		StrokeWidth: 1,
+		StrokeColor: drawing.ColorWhite,
+	}).RoundedRect(Box{
+		Left:   10,
+		Right:  30,
+		Bottom: 150,
+		Top:    10,
+	}, 5)
+	buf, err := p.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 15 10\nL 25 10\nL 25 10\nA 5 5 90.00 0 1 30 15\nL 30 145\nL 30 145\nA 5 5 90.00 0 1 25 150\nL 15 150\nL 15 150\nA 5 5 90.00 0 1 10 145\nL 10 15\nL 10 15\nA 5 5 90.00 0 1 15 10\nZ\" style=\"stroke-width:1;stroke:rgba(255,255,255,1.0);fill:rgba(255,255,255,1.0)\"/><path  d=\"\" style=\"stroke-width:1;stroke:rgba(255,255,255,1.0);fill:rgba(255,255,255,1.0)\"/></svg>", string(buf))
+}
+
 func TestPainterTextFit(t *testing.T) {
 	assert := assert.New(t)
 	p, err := NewPainter(PainterOptions{

pie_chart.go

@@ -27,7 +27,7 @@ import (
 	"math"
 
 	"github.com/golang/freetype/truetype"
-	"github.com/wcharczuk/go-chart/v2"
+	"git.smarteching.com/zeni/go-chart/v2"
 )
 
 type pieChart struct {
@@ -63,6 +63,96 @@ func NewPieChart(p *Painter, opt PieChartOption) *pieChart {
 	}
 }
 
+type sector struct {
+	value       float64
+	percent     float64
+	cx          int
+	cy          int
+	rx          float64
+	ry          float64
+	start       float64
+	delta       float64
+	offset      int
+	quadrant    int
+	lineStartX  int
+	lineStartY  int
+	lineBranchX int
+	lineBranchY int
+	lineEndX    int
+	lineEndY    int
+	showLabel   bool
+	label       string
+	series      Series
+	color       Color
+}
+
+func NewSector(cx int, cy int, radius float64, labelRadius float64, value float64, currentValue float64, totalValue float64, labelLineLength int, label string, series Series, color Color) sector {
+	s := sector{}
+	s.value = value
+	s.percent = value / totalValue
+	s.cx = cx
+	s.cy = cy
+	s.rx = radius
+	s.ry = radius
+	p := (currentValue + value/2) / totalValue
+	if p < 0.25 {
+		s.quadrant = 1
+	} else if p < 0.5 {
+		s.quadrant = 4
+	} else if p < 0.75 {
+		s.quadrant = 3
+	} else {
+		s.quadrant = 2
+	}
+	s.start = chart.PercentToRadians(currentValue/totalValue) - math.Pi/2
+	s.delta = chart.PercentToRadians(value / totalValue)
+	angle := s.start + s.delta/2
+	s.lineStartX = cx + int(radius*math.Cos(angle))
+	s.lineStartY = cy + int(radius*math.Sin(angle))
+	s.lineBranchX = cx + int(labelRadius*math.Cos(angle))
+	s.lineBranchY = cy + int(labelRadius*math.Sin(angle))
+	s.offset = labelLineLength
+	if s.lineBranchX <= cx {
+		s.offset *= -1
+	}
+	s.lineEndX = s.lineBranchX + s.offset
+	s.lineEndY = s.lineBranchY
+	s.series = series
+	s.color = color
+	s.showLabel = series.Label.Show
+	s.label = NewPieLabelFormatter([]string{label}, series.Label.Formatter)(0, s.value, s.percent)
+	return s
+}
+
+func (s *sector) calculateY(prevY int) int {
+	for i := 0; i <= s.cy; i++ {
+		if s.quadrant <= 2 {
+			if (prevY - s.lineBranchY) > labelFontSize+5 {
+				break
+			}
+			s.lineBranchY -= 1
+		} else {
+			if (s.lineBranchY - prevY) > labelFontSize+5 {
+				break
+			}
+			s.lineBranchY += 1
+		}
+	}
+	s.lineEndY = s.lineBranchY
+	return s.lineBranchY
+}
+
+func (s *sector) calculateTextXY(textBox Box) (x int, y int) {
+	textMargin := 3
+	x = s.lineEndX + textMargin
+	y = s.lineEndY + textBox.Height()>>1 - 1
+	if s.offset < 0 {
+		textWidth := textBox.Width()
+		x = s.lineEndX - textWidth - textMargin
+	}
+	return
+}
+
 func (p *pieChart) render(result *defaultRenderResult, seriesList SeriesList) (Box, error) {
 	opt := p.opt
 	values := make([]float64, len(seriesList))
@@ -101,98 +191,103 @@ func (p *pieChart) render(result *defaultRenderResult, seriesList SeriesList) (B
 	theme := opt.Theme
 
 	currentValue := float64(0)
-	prevPoints := make([]Point, 0)
 
-	isOverride := func(x, y int) bool {
+	var quadrant1, quadrant2, quadrant3, quadrant4 []sector
-		for _, p := range prevPoints {
+	for index, v := range values {
-			if math.Abs(float64(p.Y-y)) > labelFontSize {
+		series := seriesList[index]
-				continue
+		color := theme.GetSeriesColor(index)
-			}
+		if index == len(values)-1 {
-			// label可能较多内容，不好计算横向占用空间
+			if color == theme.GetSeriesColor(0) {
-			// 因此x的位置需要中间位置两侧，否则认为override
+				color = theme.GetSeriesColor(1)
-			if (p.X <= cx && x <= cx) ||
-				(p.X > cx && x > cx) {
-				return true
 			}
 		}
-		return false
+		s := NewSector(cx, cy, radius, labelRadius, v, currentValue, total, labelLineWidth, seriesNames[index], series, color)
+		switch quadrant := s.quadrant; quadrant {
+		case 1:
+			quadrant1 = append([]sector{s}, quadrant1...)
+		case 2:
+			quadrant2 = append(quadrant2, s)
+		case 3:
+			quadrant3 = append([]sector{s}, quadrant3...)
+		case 4:
+			quadrant4 = append(quadrant4, s)
+		}
+		currentValue += v
 	}
+	sectors := append(quadrant1, quadrant4...)
+	sectors = append(sectors, quadrant3...)
+	sectors = append(sectors, quadrant2...)
 
-	for index, v := range values {
+	currentQuadrant := 0
+	prevY := 0
+	maxY := 0
+	minY := 0
+	for _, s := range sectors {
 		seriesPainter.OverrideDrawingStyle(Style{
 			StrokeWidth: 1,
-			StrokeColor: theme.GetSeriesColor(index),
+			StrokeColor: s.color,
-			FillColor:   theme.GetSeriesColor(index),
+			FillColor:   s.color,
 		})
-		seriesPainter.MoveTo(cx, cy)
+		seriesPainter.MoveTo(s.cx, s.cy)
-		start := chart.PercentToRadians(currentValue/total) - math.Pi/2
+		seriesPainter.ArcTo(s.cx, s.cy, s.rx, s.ry, s.start, s.delta).LineTo(s.cx, s.cy).Close().FillStroke()
-		currentValue += v
+		if !s.showLabel {
-		percent := (v / total)
-		delta := chart.PercentToRadians(percent)
-		seriesPainter.ArcTo(cx, cy, radius, radius, start, delta).
-			LineTo(cx, cy).
-			Close().
-			FillStroke()
-
-		series := seriesList[index]
-		// 是否显示label
-		showLabel := series.Label.Show
-		if !showLabel {
 			continue
 		}
-
+		if currentQuadrant != s.quadrant {
-		// label的角度为饼块中间
+			if s.quadrant == 1 {
-		angle := start + delta/2
+				minY = cy * 2
-		startx := cx + int(radius*math.Cos(angle))
+				maxY = 0
-		starty := cy + int(radius*math.Sin(angle))
+				prevY = cy * 2
-
-		endx := cx + int(labelRadius*math.Cos(angle))
-		endy := cy + int(labelRadius*math.Sin(angle))
-		// 计算是否有重叠，如果有则调整y坐标位置
-		// 最多只尝试5次
-		for i := 0; i < 5; i++ {
-			if !isOverride(endx, endy) {
-				break
 			}
-			endy -= (labelFontSize << 1)
+			if s.quadrant == 2 {
+				if currentQuadrant != 3 {
+					prevY = s.lineEndY
+				} else {
+					prevY = minY
+				}
+			}
+			if s.quadrant == 3 {
+				if currentQuadrant != 4 {
+					prevY = s.lineEndY
+				} else {
+					minY = cy * 2
+					maxY = 0
+					prevY = 0
+				}
+			}
+			if s.quadrant == 4 {
+				if currentQuadrant != 1 {
+					prevY = s.lineEndY
+				} else {
+					prevY = maxY
+				}
+			}
+			currentQuadrant = s.quadrant
 		}
-		prevPoints = append(prevPoints, Point{
+		prevY = s.calculateY(prevY)
-			X: endx,
+		if prevY > maxY {
-			Y: endy,
+			maxY = prevY
-		})
-
-		seriesPainter.MoveTo(startx, starty)
-		seriesPainter.LineTo(endx, endy)
-		offset := labelLineWidth
-		if endx < cx {
-			offset *= -1
 		}
-		seriesPainter.MoveTo(endx, endy)
+		if prevY < minY {
-		endx += offset
+			minY = prevY
-		seriesPainter.LineTo(endx, endy)
+		}
+		seriesPainter.MoveTo(s.lineStartX, s.lineStartY)
+		seriesPainter.LineTo(s.lineBranchX, s.lineBranchY)
+		seriesPainter.MoveTo(s.lineBranchX, s.lineBranchY)
+		seriesPainter.LineTo(s.lineEndX, s.lineEndY)
 		seriesPainter.Stroke()
-
 		textStyle := Style{
 			FontColor: theme.GetTextColor(),
 			FontSize:  labelFontSize,
 			Font:      opt.Font,
 		}
-		if !series.Label.Color.IsZero() {
+		if !s.series.Label.Color.IsZero() {
-			textStyle.FontColor = series.Label.Color
+			textStyle.FontColor = s.series.Label.Color
 		}
 		seriesPainter.OverrideTextStyle(textStyle)
-		text := NewPieLabelFormatter(seriesNames, series.Label.Formatter)(index, v, percent)
+		x, y := s.calculateTextXY(seriesPainter.MeasureText(s.label))
-		textBox := seriesPainter.MeasureText(text)
+		seriesPainter.Text(s.label, x, y)
-		textMargin := 3
-		x := endx + textMargin
-		y := endy + textBox.Height()>>1 - 1
-		if offset < 0 {
-			textWidth := textBox.Width()
-			x = endx - textWidth - textMargin
-		}
-		seriesPainter.Text(text, x, y)
 	}
-
 	return p.p.box, nil
 }
 

radar_chart.go

@@ -25,9 +25,10 @@ package charts
 import (
 	"errors"
 
+	"github.com/dustin/go-humanize"
 	"github.com/golang/freetype/truetype"
-	"github.com/wcharczuk/go-chart/v2"
+	"git.smarteching.com/zeni/go-chart/v2"
-	"github.com/wcharczuk/go-chart/v2/drawing"
+	"git.smarteching.com/zeni/go-chart/v2/drawing"
 )
 
 type radarChart struct {
@@ -230,9 +231,15 @@ func (r *radarChart) render(result *defaultRenderResult, seriesList SeriesList)
 			StrokeColor: color,
 			FillColor:   dotFillColor,
 		})
-		for _, point := range linePoints {
+		for index, point := range linePoints {
 			seriesPainter.Circle(dotWith, point.X, point.Y)
 			seriesPainter.FillStroke()
+			if series.Label.Show && index < len(series.Data) {
+				value := humanize.FtoaWithDigits(series.Data[index].Value, 2)
+				b := seriesPainter.MeasureText(value)
+				seriesPainter.Text(value, point.X-b.Width()/2, point.Y)
+			}
+
 		}
 	}
 

series.go

@@ -26,7 +26,7 @@ import (
 	"strings"
 
 	"github.com/dustin/go-humanize"
-	"github.com/wcharczuk/go-chart/v2"
+	"git.smarteching.com/zeni/go-chart/v2"
 )
 
 type SeriesData struct {
@@ -126,6 +126,8 @@ type Series struct {
 	Name string
 	// Radius for Pie chart, e.g.: 40%, default is "40%"
 	Radius string
+	// Round for bar chart
+	RoundRadius int
 	// Mark point for series
 	MarkPoint SeriesMarkPoint
 	// Make line for series

series_label.go

@@ -24,7 +24,7 @@ package charts
 
 import (
 	"github.com/golang/freetype/truetype"
-	"github.com/wcharczuk/go-chart/v2"
+	"git.smarteching.com/zeni/go-chart/v2"
 )
 
 type labelRenderValue struct {

table.go

@@ -26,8 +26,8 @@ import (
 	"errors"
 
 	"github.com/golang/freetype/truetype"
-	"github.com/wcharczuk/go-chart/v2"
+	"git.smarteching.com/zeni/go-chart/v2"
-	"github.com/wcharczuk/go-chart/v2/drawing"
+	"git.smarteching.com/zeni/go-chart/v2/drawing"
 )
 
 type tableChart struct {

theme.go

@@ -24,7 +24,7 @@ package charts
 
 import (
 	"github.com/golang/freetype/truetype"
-	"github.com/wcharczuk/go-chart/v2/drawing"
+	"git.smarteching.com/zeni/go-chart/v2/drawing"
 )
 
 const ThemeDark = "dark"

util.go

@@ -29,8 +29,8 @@ import (
 	"strings"
 
 	"github.com/dustin/go-humanize"
-	"github.com/wcharczuk/go-chart/v2"
+	"git.smarteching.com/zeni/go-chart/v2"
-	"github.com/wcharczuk/go-chart/v2/drawing"
+	"git.smarteching.com/zeni/go-chart/v2/drawing"
 )
 
 func TrueFlag() *bool {

util_test.go

@@ -26,8 +26,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/wcharczuk/go-chart/v2"
+	"git.smarteching.com/zeni/go-chart/v2"
-	"github.com/wcharczuk/go-chart/v2/drawing"
+	"git.smarteching.com/zeni/go-chart/v2/drawing"
 )
 
 func TestGetDefaultInt(t *testing.T) {

yaxis.go

@@ -50,6 +50,8 @@ type YAxisOption struct {
 	DivideCount    int
 	Unit           int
 	isCategoryAxis bool
+	// The flag for show axis split line, set this to true will show axis split line
+	SplitLineShow *bool
 }
 
 // NewYAxisOptions returns a y axis option
@@ -100,6 +102,9 @@ func (opt *YAxisOption) ToAxisOption(p *Painter) AxisOption {
 		axisOpt.StrokeWidth = 1
 		axisOpt.SplitLineShow = false
 	}
+	if opt.SplitLineShow != nil {
+		axisOpt.SplitLineShow = *opt.SplitLineShow
+	}
 	return axisOpt
 }