Compare commits

..

6 commits
v2.6.7 ... main

Author SHA1 Message Date
958172a1f1 update URL in examples
Some checks failed
Test / Build (push) Has been cancelled
2025-05-13 21:53:31 -05:00
0eacc8e394 start migration to our packages
Some checks are pending
Test / Build (push) Waiting to run
2025-05-13 21:46:02 -05:00
vicanso
d25a827706 fix: fix label position of pie, #86 2024-08-15 20:37:07 +08:00
vicanso
5842c71b1d refactor: remove unused code 2024-08-01 21:44:52 +08:00
vicanso
e7dc4189d5 feat: support bar margin 2024-06-07 20:35:03 +08:00
vicanso
32e6dd52d0 refactor: export GetRenderer function to get chart renderer 2024-06-05 21:13:03 +08:00
43 changed files with 115 additions and 91 deletions

View file

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

View file

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

View file

@ -23,8 +23,8 @@
package charts package charts
import ( 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 type Box = chart.Box

View file

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

View file

@ -26,7 +26,7 @@ import (
"testing" "testing"
"github.com/stretchr/testify/assert" "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) { func TestAxis(t *testing.T) {

View file

@ -26,7 +26,7 @@ import (
"math" "math"
"github.com/golang/freetype/truetype" "github.com/golang/freetype/truetype"
"github.com/wcharczuk/go-chart/v2" "git.smarteching.com/zeni/go-chart/v2"
) )
type barChart struct { type barChart struct {
@ -63,6 +63,8 @@ type BarChartOption struct {
// The legend option // The legend option
Legend LegendOption Legend LegendOption
BarWidth int BarWidth int
// Margin of bar
BarMargin int
} }
func (b *barChart) render(result *defaultRenderResult, seriesList SeriesList) (Box, error) { 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 margin = 5
barMargin = 3 barMargin = 3
} }
if opt.BarMargin > 0 {
barMargin = opt.BarMargin
}
seriesCount := len(seriesList) seriesCount := len(seriesList)
// 总的宽度-两个margin-(总数-1)的barMargin // 总的宽度-两个margin-(总数-1)的barMargin
barWidth := (width - 2*margin - barMargin*(seriesCount-1)) / seriesCount barWidth := (width - 2*margin - barMargin*(seriesCount-1)) / seriesCount

View file

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

View file

@ -26,7 +26,7 @@ import (
"testing" "testing"
"github.com/stretchr/testify/assert" "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) { func TestChartOption(t *testing.T) {

View file

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

View file

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

View file

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

View file

@ -27,7 +27,7 @@ import (
"testing" "testing"
"github.com/stretchr/testify/assert" "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) { func TestConvertToArray(t *testing.T) {

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -4,8 +4,8 @@ import (
"os" "os"
"path/filepath" "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 { func writeFile(buf []byte) error {

View file

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

View file

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

View file

@ -6,8 +6,8 @@ import (
"strconv" "strconv"
"strings" "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 { func writeFile(buf []byte, filename string) error {

View file

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

View file

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

View file

@ -26,7 +26,7 @@ import (
"testing" "testing"
"github.com/stretchr/testify/assert" "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) { func TestInstallFont(t *testing.T) {

10
go.mod
View file

@ -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 ( require (
git.smarteching.com/zeni/go-chart/v2 v2.1.4
github.com/dustin/go-humanize v1.0.1 github.com/dustin/go-humanize v1.0.1
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 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 ( require (
github.com/davecgh/go-spew v1.1.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // 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 gopkg.in/yaml.v3 v3.0.1 // indirect
) )

20
go.sum
View file

@ -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 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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= 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/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 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= 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 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= 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 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

View file

@ -26,7 +26,7 @@ import (
"testing" "testing"
"github.com/stretchr/testify/assert" "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) { func TestGrid(t *testing.T) {

View file

@ -24,7 +24,7 @@ package charts
import ( import (
"github.com/golang/freetype/truetype" "github.com/golang/freetype/truetype"
"github.com/wcharczuk/go-chart/v2" "git.smarteching.com/zeni/go-chart/v2"
) )
type horizontalBarChart struct { type horizontalBarChart struct {
@ -50,6 +50,8 @@ type HorizontalBarChartOption struct {
// The legend option // The legend option
Legend LegendOption Legend LegendOption
BarHeight int BarHeight int
// Margin of bar
BarMargin int
} }
// NewHorizontalBarChart returns a horizontal bar chart renderer // NewHorizontalBarChart returns a horizontal bar chart renderer
@ -81,6 +83,9 @@ func (h *horizontalBarChart) render(result *defaultRenderResult, seriesList Seri
margin = 5 margin = 5
barMargin = 3 barMargin = 3
} }
if opt.BarMargin > 0 {
barMargin = opt.BarMargin
}
seriesCount := len(seriesList) seriesCount := len(seriesList)
// 总的高度-两个margin-(总数-1)的barMargin // 总的高度-两个margin-(总数-1)的barMargin
barHeight := (height - 2*margin - barMargin*(seriesCount-1)) / seriesCount barHeight := (height - 2*margin - barMargin*(seriesCount-1)) / seriesCount

View file

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

View file

@ -26,7 +26,7 @@ import (
"testing" "testing"
"github.com/stretchr/testify/assert" "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) { func TestMarkLine(t *testing.T) {

View file

@ -26,7 +26,7 @@ import (
"testing" "testing"
"github.com/stretchr/testify/assert" "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) { func TestMarkPoint(t *testing.T) {

View file

@ -28,7 +28,7 @@ import (
"math" "math"
"github.com/golang/freetype/truetype" "github.com/golang/freetype/truetype"
"github.com/wcharczuk/go-chart/v2" "git.smarteching.com/zeni/go-chart/v2"
) )
type ValueFormatter func(float64) string type ValueFormatter func(float64) string
@ -860,3 +860,7 @@ func (p *Painter) LegendLineDot(box Box) *Painter {
p.FillStroke() p.FillStroke()
return p return p
} }
func (p *Painter) GetRenderer() chart.Renderer {
return p.render
}

View file

@ -28,8 +28,8 @@ import (
"github.com/golang/freetype/truetype" "github.com/golang/freetype/truetype"
"github.com/stretchr/testify/assert" "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) { func TestPainterOption(t *testing.T) {

View file

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

View file

@ -27,8 +27,8 @@ import (
"github.com/dustin/go-humanize" "github.com/dustin/go-humanize"
"github.com/golang/freetype/truetype" "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 { type radarChart struct {

View file

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

View file

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

View file

@ -26,8 +26,8 @@ import (
"errors" "errors"
"github.com/golang/freetype/truetype" "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 { type tableChart struct {

View file

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

View file

@ -29,8 +29,8 @@ import (
"strings" "strings"
"github.com/dustin/go-humanize" "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 { func TrueFlag() *bool {

View file

@ -26,8 +26,8 @@ import (
"testing" "testing"
"github.com/stretchr/testify/assert" "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) { func TestGetDefaultInt(t *testing.T) {