README.md

@@ -1,7 +1,5 @@
 # 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)
 
@@ -35,7 +33,7 @@ More examples can be found in the [./examples/](./examples/) directory.
 package main
 
 import (
-	charts "git.smarteching.com/zeni/go-charts/v2"
+	charts "github.com/vicanso/go-charts/v2"
 )
 
 func main() {
@@ -101,7 +99,7 @@ func main() {
 package main
 
 import (
-	"git.smarteching.com/zeni/go-charts/v2"
+	"github.com/vicanso/go-charts/v2"
 )
 
 func main() {
@@ -176,7 +174,7 @@ func main() {
 package main
 
 import (
-	"git.smarteching.com/zeni/go-charts/v2"
+	"github.com/vicanso/go-charts/v2"
 )
 
 func main() {
@@ -233,7 +231,7 @@ func main() {
 package main
 
 import (
-	"git.smarteching.com/zeni/go-charts/v2"
+	"github.com/vicanso/go-charts/v2"
 )
 
 func main() {
@@ -288,7 +286,7 @@ func main() {
 package main
 
 import (
-	"git.smarteching.com/zeni/go-charts/v2"
+	"github.com/vicanso/go-charts/v2"
 )
 
 func main() {
@@ -346,7 +344,7 @@ func main() {
 package main
 
 import (
-	"git.smarteching.com/zeni/go-charts/v2"
+	"github.com/vicanso/go-charts/v2"
 )
 
 func main() {
@@ -386,7 +384,7 @@ func main() {
 package main
 
 import (
-	"git.smarteching.com/zeni/go-charts/v2"
+	"github.com/vicanso/go-charts/v2"
 )
 
 func main() {
@@ -451,7 +449,7 @@ func main() {
 package main
 
 import (
-	"git.smarteching.com/zeni/go-charts/v2"
+	"github.com/vicanso/go-charts/v2"
 )
 
 func main() {

README_zh.md

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

alias.go

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

axis.go

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

axis_test.go

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

bar_chart.go

@@ -26,7 +26,7 @@ import (
 	"math"
 
 	"github.com/golang/freetype/truetype"
-	"git.smarteching.com/zeni/go-chart/v2"
+	"github.com/wcharczuk/go-chart/v2"
 )
 
 type barChart struct {
@@ -63,8 +63,6 @@ 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) {
@@ -90,9 +88,6 @@ 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

chart_option.go

@@ -67,8 +67,6 @@ 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"
-	"git.smarteching.com/zeni/go-chart/v2/drawing"
+	"github.com/wcharczuk/go-chart/v2/drawing"
 )
 
 func TestChartOption(t *testing.T) {

charts.go

@@ -27,7 +27,7 @@ import (
 	"math"
 	"sort"
 
-	"git.smarteching.com/zeni/go-chart/v2"
+	"github.com/wcharczuk/go-chart/v2"
 )
 
 const labelFontSize = 10
@@ -375,11 +375,10 @@ 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
 		})
@@ -392,7 +391,6 @@ 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"
 
-	"git.smarteching.com/zeni/go-chart/v2"
+	"github.com/wcharczuk/go-chart/v2"
 )
 
 func BenchmarkMultiChartPNGRender(b *testing.B) {

echarts.go

@@ -29,7 +29,7 @@ import (
 	"regexp"
 	"strconv"
 
-	"git.smarteching.com/zeni/go-chart/v2"
+	"github.com/wcharczuk/go-chart/v2"
 )
 
 func convertToArray(data []byte) []byte {

echarts_test.go

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

examples/area_line_chart/main.go

@@ -4,7 +4,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"git.smarteching.com/zeni/go-charts/v2"
+	"github.com/vicanso/go-charts/v2"
 )
 
 func writeFile(buf []byte) error {

examples/bar_chart/main.go

@@ -4,7 +4,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"git.smarteching.com/zeni/go-charts/v2"
+	"github.com/vicanso/go-charts/v2"
 )
 
 func writeFile(buf []byte) error {

examples/charts/main.go

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

examples/chinese/main.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"git.smarteching.com/zeni/go-charts/v2"
+	"github.com/vicanso/go-charts/v2"
 )
 
 func writeFile(buf []byte) error {

examples/funnel_chart/main.go

@@ -4,7 +4,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"git.smarteching.com/zeni/go-charts/v2"
+	"github.com/vicanso/go-charts/v2"
 )
 
 func writeFile(buf []byte) error {

examples/horizontal_bar_chart/main.go

@@ -4,7 +4,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"git.smarteching.com/zeni/go-charts/v2"
+	"github.com/vicanso/go-charts/v2"
 )
 
 func writeFile(buf []byte) error {
@@ -65,9 +65,6 @@ func main() {
 			"China",
 			"World",
 		}),
-		func(opt *charts.ChartOption) {
-			opt.SeriesList[0].RoundRadius = 5
-		},
 	)
 	if err != nil {
 		panic(err)

examples/line_chart/main.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"git.smarteching.com/zeni/go-charts/v2"
+	"github.com/vicanso/go-charts/v2"
 )
 
 func writeFile(buf []byte) error {

examples/painter/main.go

@@ -4,8 +4,8 @@ import (
 	"os"
 	"path/filepath"
 
-	charts "git.smarteching.com/zeni/go-charts/v2"
+	charts "github.com/vicanso/go-charts/v2"
-	"git.smarteching.com/zeni/go-chart/v2/drawing"
+	"github.com/wcharczuk/go-chart/v2/drawing"
 )
 
 func writeFile(buf []byte) error {

examples/pie_chart/main.go

@@ -4,7 +4,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"git.smarteching.com/zeni/go-charts/v2"
+	"github.com/vicanso/go-charts/v2"
 )
 
 func writeFile(buf []byte) error {

examples/radar_chart/main.go

@@ -4,7 +4,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"git.smarteching.com/zeni/go-charts/v2"
+	"github.com/vicanso/go-charts/v2"
 )
 
 func writeFile(buf []byte) error {

examples/table/main.go

@@ -6,8 +6,8 @@ import (
 	"strconv"
 	"strings"
 
-	"git.smarteching.com/zeni/go-charts/v2"
+	"github.com/vicanso/go-charts/v2"
-	"git.smarteching.com/zeni/go-chart/v2/drawing"
+	"github.com/wcharczuk/go-chart/v2/drawing"
 )
 
 func writeFile(buf []byte, filename string) error {

examples/time_line_chart/main.go

@@ -8,7 +8,7 @@ import (
 	"path/filepath"
 	"time"
 
-	"git.smarteching.com/zeni/go-charts/v2"
+	"github.com/vicanso/go-charts/v2"
 )
 
 func writeFile(buf []byte) error {

font.go

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

font_test.go

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

go.mod

@@ -1,17 +1,17 @@
-module git.smarteching.com/zeni/go-charts/v2
+module github.com/vicanso/go-charts/v2
 
-go 1.24.1
+go 1.17
 
 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.10.0
+	github.com/stretchr/testify v1.8.2
+	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.21.0 // indirect
+	golang.org/x/image v0.0.0-20200927104501-e162460cd6b5 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -1,5 +1,4 @@
-git.smarteching.com/zeni/go-chart/v2 v2.1.4 h1:pF06+F6eqJLIG8uMiTVPR5TygPGMjM/FHMzTxmu5V/Q=
+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/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=
@@ -8,11 +7,20 @@ 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/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-golang.org/x/image v0.21.0 h1:c5qV36ajHpdj4Qi0GnE0jUc/yuo33OLFaa0d+crTD5s=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-golang.org/x/image v0.21.0/go.mod h1:vUbsLavqK/W303ZroQQVKQ+Af3Yl6Uz1Ppu5J/cLz78=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+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"
-	"git.smarteching.com/zeni/go-chart/v2/drawing"
+	"github.com/wcharczuk/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"
-	"git.smarteching.com/zeni/go-chart/v2"
+	"github.com/wcharczuk/go-chart/v2"
 )
 
 type horizontalBarChart struct {
@@ -50,8 +50,6 @@ type HorizontalBarChartOption struct {
 	// The legend option
 	Legend    LegendOption
 	BarHeight int
-	// Margin of bar
-	BarMargin int
 }
 
 // NewHorizontalBarChart returns a horizontal bar chart renderer
@@ -83,9 +81,6 @@ 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
@@ -141,26 +136,14 @@ func (h *horizontalBarChart) render(result *defaultRenderResult, seriesList Seri
 				fillColor = item.Style.FillColor
 			}
 			right := w
-			if series.RoundRadius <= 0 {
+			seriesPainter.OverrideDrawingStyle(Style{
-				seriesPainter.OverrideDrawingStyle(Style{
+				FillColor: fillColor,
-					FillColor: fillColor,
+			}).Rect(chart.Box{
-				}).Rect(chart.Box{
+				Top:    y,
-					Top:    y,
+				Left:   0,
-					Left:   0,
+				Right:  right,
-					Right:  right,
+				Bottom: y + barHeight,
-					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"
-	"git.smarteching.com/zeni/go-chart/v2/drawing"
+	"github.com/wcharczuk/go-chart/v2/drawing"
 )
 
 type lineChart struct {

mark_line_test.go

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

mark_point_test.go

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

painter.go

@@ -28,7 +28,7 @@ import (
 	"math"
 
 	"github.com/golang/freetype/truetype"
-	"git.smarteching.com/zeni/go-chart/v2"
+	"github.com/wcharczuk/go-chart/v2"
 )
 
 type ValueFormatter func(float64) string
@@ -860,7 +860,3 @@ 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"
-	"git.smarteching.com/zeni/go-chart/v2"
+	"github.com/wcharczuk/go-chart/v2"
-	"git.smarteching.com/zeni/go-chart/v2/drawing"
+	"github.com/wcharczuk/go-chart/v2/drawing"
 )
 
 func TestPainterOption(t *testing.T) {

pie_chart.go

@@ -27,7 +27,7 @@ import (
 	"math"
 
 	"github.com/golang/freetype/truetype"
-	"git.smarteching.com/zeni/go-chart/v2"
+	"github.com/wcharczuk/go-chart/v2"
 )
 
 type pieChart struct {
@@ -234,35 +234,23 @@ func (p *pieChart) render(result *defaultRenderResult, seriesList SeriesList) (B
 			continue
 		}
 		if currentQuadrant != s.quadrant {
+			currentQuadrant = s.quadrant
 			if s.quadrant == 1 {
 				minY = cy * 2
 				maxY = 0
 				prevY = cy * 2
 			}
 			if s.quadrant == 2 {
-				if currentQuadrant != 3 {
+				prevY = minY
-					prevY = s.lineEndY
-				} else {
-					prevY = minY
-				}
 			}
 			if s.quadrant == 3 {
-				if currentQuadrant != 4 {
+				minY = cy * 2
-					prevY = s.lineEndY
+				maxY = 0
-				} else {
+				prevY = 0
-					minY = cy * 2
-					maxY = 0
-					prevY = 0
-				}
 			}
 			if s.quadrant == 4 {
-				if currentQuadrant != 1 {
+				prevY = maxY
-					prevY = s.lineEndY
-				} else {
-					prevY = maxY
-				}
 			}
-			currentQuadrant = s.quadrant
 		}
 		prevY = s.calculateY(prevY)
 		if prevY > maxY {

radar_chart.go

@@ -27,8 +27,8 @@ import (
 
 	"github.com/dustin/go-humanize"
 	"github.com/golang/freetype/truetype"
-	"git.smarteching.com/zeni/go-chart/v2"
+	"github.com/wcharczuk/go-chart/v2"
-	"git.smarteching.com/zeni/go-chart/v2/drawing"
+	"github.com/wcharczuk/go-chart/v2/drawing"
 )
 
 type radarChart struct {

series.go

@@ -26,7 +26,7 @@ import (
 	"strings"
 
 	"github.com/dustin/go-humanize"
-	"git.smarteching.com/zeni/go-chart/v2"
+	"github.com/wcharczuk/go-chart/v2"
 )
 
 type SeriesData struct {

series_label.go

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

table.go

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

theme.go

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

util.go

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

util_test.go

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