zeni/go-charts
1
0
Fork 0
Code Issues Pull requests Projects Releases 47 Packages Wiki Activity Actions

Compare commits

base: zeni:main
Branches Tags
zeni:main
zeni:revert-56-xAxisImprovements
zeni:web
zeni:v1
zeni:v2.6.11
zeni:v2.6.10
zeni:v2.6.9
zeni:v2.6.8
zeni:v2.6.7
zeni:v2.6.6
zeni:v2.6.5
zeni:v2.6.4
zeni:v2.6.3
zeni:v2.6.2
zeni:v2.6.1
zeni:v2.6.0
zeni:v2.5.7
zeni:v2.5.6
zeni:v2.5.5
zeni:v2.5.4
zeni:v2.5.3
zeni:v2.5.2
zeni:v2.5.1
zeni:v2.5.0
zeni:v2.4.4
zeni:v2.4.3
zeni:v2.4.2
zeni:v2.4.1
zeni:v2.4.0
zeni:v2.3.0
zeni:v2.2.0
zeni:v2.1.1
zeni:v2.1.0
zeni:v2.0.7
zeni:v2.0.6
zeni:v2.0.5
zeni:v2.0.4
zeni:v2.0.3
zeni:v2.0.2
zeni:v2.0.1
zeni:v2.0.0
zeni:v2.0.0-alpha
zeni:v1.2.2
zeni:v1.2.1
zeni:v1.2.0
zeni:v1.1.1
zeni:v1.1.0
zeni:v1.0.0
zeni:v0.0.4
zeni:v0.0.3
zeni:v0.0.2
zeni:v0.0.1
..
compare: zeni:v2.6.8
Branches Tags
zeni:main
zeni:revert-56-xAxisImprovements
zeni:web
zeni:v1
zeni:v2.6.11
zeni:v2.6.10
zeni:v2.6.9
zeni:v2.6.8
zeni:v2.6.7
zeni:v2.6.6
zeni:v2.6.5
zeni:v2.6.4
zeni:v2.6.3
zeni:v2.6.2
zeni:v2.6.1
zeni:v2.6.0
zeni:v2.5.7
zeni:v2.5.6
zeni:v2.5.5
zeni:v2.5.4
zeni:v2.5.3
zeni:v2.5.2
zeni:v2.5.1
zeni:v2.5.0
zeni:v2.4.4
zeni:v2.4.3
zeni:v2.4.2
zeni:v2.4.1
zeni:v2.4.0
zeni:v2.3.0
zeni:v2.2.0
zeni:v2.1.1
zeni:v2.1.0
zeni:v2.0.7
zeni:v2.0.6
zeni:v2.0.5
zeni:v2.0.4
zeni:v2.0.3
zeni:v2.0.2
zeni:v2.0.1
zeni:v2.0.0
zeni:v2.0.0-alpha
zeni:v1.2.2
zeni:v1.2.1
zeni:v1.2.0
zeni:v1.1.1
zeni:v1.1.0
zeni:v1.0.0
zeni:v0.0.4
zeni:v0.0.3
zeni:v0.0.2
zeni:v0.0.1

No commits in common. "main" and "v2.6.8" have entirely different histories.
main ... v2.6.8

43 changed files with 91 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

18
README.md
View file

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

16
README_zh.md
View file

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

4
alias.go
View file

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

2
axis.go
View file

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

2
axis_test.go
View file

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

7
bar_chart.go
View file

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

2
chart_option.go
View file

@ -67,8 +67,6 @@ 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

2
chart_option_test.go
View file

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

4
charts.go
View file

@ -27,7 +27,7 @@ import (
"math" "math"
"sort" "sort"
"git.smarteching.com/zeni/go-chart/v2" "github.com/wcharczuk/go-chart/v2"
) )
const labelFontSize = 10 const labelFontSize = 10
@ -379,7 +379,6 @@ func Render(opt ChartOption, opts ...OptionFunc) (*Painter, error) {
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
}) })
@ -392,7 +391,6 @@ 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

2
charts_test.go
View file

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

2
echarts.go
View file

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

2
echarts_test.go
View file

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

2
examples/area_line_chart/main.go
View file

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

2
examples/bar_chart/main.go
View file

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

2
examples/charts/main.go
View file

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

2
examples/chinese/main.go
View file

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

2
examples/funnel_chart/main.go
View file

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

2
examples/horizontal_bar_chart/main.go
View file

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

2
examples/line_chart/main.go
View file

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

4
examples/painter/main.go
View file

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

2
examples/pie_chart/main.go
View file

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

2
examples/radar_chart/main.go
View file

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

4
examples/table/main.go
View file

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

2
examples/time_line_chart/main.go
View file

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

2
font.go
View file

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

2
font_test.go
View file

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

10
go.mod
View file

@ -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 ( 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.10.0 github.com/stretchr/testify v1.8.2
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.21.0 // indirect golang.org/x/image v0.0.0-20200927104501-e162460cd6b5 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect
) )

20
go.sum
View file

@ -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 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=
@ -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/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/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 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=

2
grid_test.go
View file

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

7
horizontal_bar_chart.go
View file

@ -24,7 +24,7 @@ package charts
import ( import (
"github.com/golang/freetype/truetype" "github.com/golang/freetype/truetype"
"git.smarteching.com/zeni/go-chart/v2" "github.com/wcharczuk/go-chart/v2"
) )
type horizontalBarChart struct { type horizontalBarChart struct {
@ -50,8 +50,6 @@ 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
@ -83,9 +81,6 @@ 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

2
line_chart.go
View file

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

2
mark_line_test.go
View file

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

2
mark_point_test.go
View file

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

2
painter.go
View file

@ -28,7 +28,7 @@ import (
"math" "math"
"github.com/golang/freetype/truetype" "github.com/golang/freetype/truetype"
"git.smarteching.com/zeni/go-chart/v2" "github.com/wcharczuk/go-chart/v2"
) )
type ValueFormatter func(float64) string type ValueFormatter func(float64) string

4
painter_test.go
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"
"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) { func TestPainterOption(t *testing.T) {

16
pie_chart.go
View file

@ -27,7 +27,7 @@ import (
"math" "math"
"github.com/golang/freetype/truetype" "github.com/golang/freetype/truetype"
"git.smarteching.com/zeni/go-chart/v2" "github.com/wcharczuk/go-chart/v2"
) )
type pieChart struct { type pieChart struct {
@ -234,36 +234,24 @@ 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 {
if currentQuadrant != 3 {
prevY = s.lineEndY
} else {
prevY = minY prevY = minY
} }
}
if s.quadrant == 3 { if s.quadrant == 3 {
if currentQuadrant != 4 {
prevY = s.lineEndY
} else {
minY = cy * 2 minY = cy * 2
maxY = 0 maxY = 0
prevY = 0 prevY = 0
} }
}
if s.quadrant == 4 { if s.quadrant == 4 {
if currentQuadrant != 1 {
prevY = s.lineEndY
} else {
prevY = maxY prevY = maxY
} }
} }
currentQuadrant = s.quadrant
}
prevY = s.calculateY(prevY) prevY = s.calculateY(prevY)
if prevY > maxY { if prevY > maxY {
maxY = prevY maxY = prevY

4
radar_chart.go
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"
"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 { type radarChart struct {

2
series.go
View file

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

2
series_label.go
View file

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

4
table.go
View file

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

2
theme.go
View file

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

4
util.go
View file

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

4
util_test.go
View file

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