Merge branch 'master' into legend-improvements

.gitignore

@@ -16,4 +16,5 @@
 # Other
 .vscode
 .DS_Store
-coverage.html
+coverage.html
+.idea/

_examples/horizontal_stacked_bar/main.go

@@ -1,10 +1,9 @@
 package main
 
 import (
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/chart"
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/drawing"
 	"os"
-
-	"github.com/wcharczuk/go-chart/v2"
-	"github.com/wcharczuk/go-chart/v2/drawing"
 )
 
 func main() {

_examples/stacked_bar_labels/main.go

@@ -1,10 +1,9 @@
 package main
 
 import (
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/chart"
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/drawing"
 	"os"
-
-	"github.com/wcharczuk/go-chart/v2"
-	"github.com/wcharczuk/go-chart/v2/drawing"
 )
 
 func main() {

cmd/chart/main.go

@@ -3,11 +3,10 @@ package main
 import (
 	"flag"
 	"fmt"
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/chart"
 	"io/ioutil"
 	"os"
 	"strings"
-
-	"github.com/wcharczuk/go-chart/v2"
 )
 
 var (

examples/annotations/main.go

@@ -3,9 +3,8 @@ package main
 //go:generate go run main.go
 
 import (
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/chart"
 	"os"
-
-	"github.com/wcharczuk/go-chart/v2"
 )
 
 func main() {

examples/axes/main.go

@@ -3,9 +3,8 @@ package main
 //go:generate go run main.go
 
 import (
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/chart"
 	"os"
-
-	chart "github.com/wcharczuk/go-chart/v2"
 )
 
 func main() {

examples/axes_labels/main.go

@@ -3,9 +3,8 @@ package main
 //go:generate go run main.go
 
 import (
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/chart"
 	"os"
-
-	chart "github.com/wcharczuk/go-chart/v2"
 )
 
 func main() {

examples/bar_chart/main.go

@@ -3,9 +3,8 @@ package main
 //go:generate go run main.go
 
 import (
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/chart"
 	"os"
-
-	"github.com/wcharczuk/go-chart/v2"
 )
 
 func main() {

examples/bar_chart_base_value/main.go

@@ -3,10 +3,9 @@ package main
 //go:generate go run main.go
 
 import (
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/chart"
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/drawing"
 	"os"
-
-	"github.com/wcharczuk/go-chart/v2"
-	"github.com/wcharczuk/go-chart/v2/drawing"
 )
 
 func main() {

examples/basic/main.go

@@ -3,9 +3,8 @@ package main
 //go:generate go run main.go
 
 import (
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/chart"
 	"os"
-
-	"github.com/wcharczuk/go-chart/v2"
 )
 
 func main() {

examples/benchmark_line_charts/main.go

@@ -4,11 +4,10 @@ package main
 
 import (
 	"fmt"
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/chart"
 	"math/rand"
 	"os"
 	"time"
-
-	"github.com/wcharczuk/go-chart/v2"
 )
 
 func random(min, max float64) float64 {

examples/css_classes/main.go

@@ -2,10 +2,9 @@ package main
 
 import (
 	"fmt"
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/chart"
 	"log"
 	"net/http"
-
-	"github.com/wcharczuk/go-chart/v2"
 )
 
 // Note: Additional examples on how to add Stylesheets are in the custom_stylesheets example

examples/custom_formatters/main.go

@@ -4,9 +4,8 @@ package main
 
 import (
 	"fmt"
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/chart"
 	"os"
-
-	"github.com/wcharczuk/go-chart/v2"
 )
 
 func main() {

examples/custom_padding/main.go

@@ -3,10 +3,9 @@ package main
 //go:generate go run main.go
 
 import (
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/chart"
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/drawing"
 	"os"
-
-	"github.com/wcharczuk/go-chart/v2"
-	"github.com/wcharczuk/go-chart/v2/drawing"
 )
 
 func main() {

examples/custom_ranges/main.go

@@ -3,9 +3,8 @@ package main
 //go:generate go run main.go
 
 import (
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/chart"
 	"os"
-
-	"github.com/wcharczuk/go-chart/v2"
 )
 
 func main() {

examples/custom_styles/main.go

@@ -3,10 +3,9 @@ package main
 //go:generate go run main.go
 
 import (
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/chart"
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/drawing"
 	"os"
-
-	"github.com/wcharczuk/go-chart/v2"
-	"github.com/wcharczuk/go-chart/v2/drawing"
 )
 
 func main() {

examples/custom_stylesheets/main.go

@@ -2,10 +2,9 @@ package main
 
 import (
 	"fmt"
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/chart"
 	"log"
 	"net/http"
-
-	"github.com/wcharczuk/go-chart/v2"
 )
 
 const style = "svg .background { fill: white; }" +

examples/custom_ticks/main.go

@@ -3,9 +3,8 @@ package main
 //go:generate go run main.go
 
 import (
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/chart"
 	"os"
-
-	"github.com/wcharczuk/go-chart/v2"
 )
 
 func main() {

examples/descending/main.go

@@ -3,9 +3,8 @@ package main
 //go:generate go run main.go
 
 import (
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/chart"
 	"os"
-
-	"github.com/wcharczuk/go-chart/v2"
 )
 
 func main() {

examples/donut_chart/main.go

@@ -3,9 +3,8 @@ package main
 //go:generate go run main.go
 
 import (
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/chart"
 	"os"
-
-	"github.com/wcharczuk/go-chart/v2"
 )
 
 func main() {

examples/image_writer/main.go

@@ -2,9 +2,8 @@ package main
 
 import (
 	"fmt"
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/chart"
 	"log"
-
-	"github.com/wcharczuk/go-chart/v2"
 )
 
 func main() {

examples/legend/main.go

@@ -3,9 +3,8 @@ package main
 //go:generate go run main.go
 
 import (
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/chart"
 	"os"
-
-	chart "github.com/wcharczuk/go-chart/v2"
 )
 
 func main() {

examples/legend_left/main.go

@@ -3,9 +3,8 @@ package main
 //go:generate go run main.go
 
 import (
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/chart"
 	"os"
-
-	"github.com/wcharczuk/go-chart/v2"
 )
 
 func main() {

examples/linear_regression/main.go

@@ -3,9 +3,8 @@ package main
 //go:generate go run main.go
 
 import (
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/chart"
 	"os"
-
-	chart "github.com/wcharczuk/go-chart/v2"
 )
 
 func main() {

examples/min_max/main.go

@@ -3,9 +3,8 @@ package main
 //go:generate go run main.go
 
 import (
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/chart"
 	"os"
-
-	"github.com/wcharczuk/go-chart/v2"
 )
 
 func main() {

examples/pie_chart/main.go

@@ -3,9 +3,8 @@ package main
 //go:generate go run main.go
 
 import (
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/chart"
 	"os"
-
-	"github.com/wcharczuk/go-chart/v2"
 )
 
 func main() {

examples/poly_regression/main.go

@@ -3,9 +3,8 @@ package main
 //go:generate go run main.go
 
 import (
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/chart"
 	"os"
-
-	chart "github.com/wcharczuk/go-chart/v2"
 )
 
 func main() {

examples/request_timings/main.go

@@ -4,12 +4,11 @@ package main
 
 import (
 	"fmt"
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/chart"
 	"net/http"
 	"os"
 	"strconv"
 	"time"
-
-	"github.com/wcharczuk/go-chart/v2"
 )
 
 func main() {

examples/rerender/main.go

@@ -1,12 +1,11 @@
 package main
 
 import (
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/chart"
 	"log"
 	"net/http"
 	"sync"
 	"time"
-
-	"github.com/wcharczuk/go-chart/v2"
 )
 
 var lock sync.Mutex

examples/scatter/main.go

@@ -1,13 +1,12 @@
 package main
 
 import (
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/chart"
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/drawing"
 	"log"
 	"net/http"
 
 	_ "net/http/pprof"
-
-	"github.com/wcharczuk/go-chart/v2"
-	"github.com/wcharczuk/go-chart/v2/drawing"
 )
 
 func drawChart(res http.ResponseWriter, req *http.Request) {

examples/simple_moving_average/main.go

@@ -3,9 +3,8 @@ package main
 //go:generate go run main.go
 
 import (
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/chart"
 	"os"
-
-	"github.com/wcharczuk/go-chart/v2"
 )
 
 func main() {

examples/stacked_bar/main.go

@@ -1,9 +1,8 @@
 package main
 
 import (
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/chart"
 	"os"
-
-	"github.com/wcharczuk/go-chart/v2"
 )
 
 func main() {

examples/stock_analysis/main.go

@@ -3,11 +3,10 @@ package main
 //go:generate go run main.go
 
 import (
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/chart"
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/drawing"
 	"os"
 	"time"
-
-	"github.com/wcharczuk/go-chart/v2"
-	"github.com/wcharczuk/go-chart/v2/drawing"
 )
 
 func main() {

examples/text_rotation/main.go

@@ -3,10 +3,9 @@ package main
 //go:generate go run main.go
 
 import (
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/chart"
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/drawing"
 	"os"
-
-	"github.com/wcharczuk/go-chart/v2"
-	"github.com/wcharczuk/go-chart/v2/drawing"
 )
 
 func main() {

examples/timeseries/main.go

@@ -1,10 +1,9 @@
 package main
 
 import (
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/chart"
 	"net/http"
 	"time"
-
-	chart "github.com/wcharczuk/go-chart/v2"
 )
 
 func drawChart(res http.ResponseWriter, req *http.Request) {

examples/twoaxis/main.go

@@ -4,9 +4,8 @@ package main
 
 import (
 	"fmt"
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/chart"
 	"os"
-
-	"github.com/wcharczuk/go-chart/v2"
 )
 
 func main() {

examples/twopoint/main.go

@@ -4,10 +4,9 @@ package main
 
 import (
 	"bytes"
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/chart"
 	"log"
 	"os"
-
-	"github.com/wcharczuk/go-chart/v2"
 )
 
 func main() {

go.mod

@@ -1,4 +1,4 @@
-module github.com/wcharczuk/go-chart/v2
+module github.com/d-Rickyy-b/go-chart-x/v2
 
 go 1.15
 

pkg/chart/annotation_series_test.go

@@ -1,11 +1,11 @@
 package chart
 
 import (
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/drawing"
 	"image/color"
 	"testing"
 
-	"github.com/wcharczuk/go-chart/v2/drawing"
+	"github.com/d-Rickyy-b/go-chart-x/v2/testutil"
-	"github.com/wcharczuk/go-chart/v2/testutil"
 )
 
 func TestAnnotationSeriesMeasure(t *testing.T) {

pkg/chart/bar_chart_test.go

@@ -5,7 +5,7 @@ import (
 	"math"
 	"testing"
 
-	"github.com/wcharczuk/go-chart/v2/testutil"
+	"github.com/d-Rickyy-b/go-chart-x/v2/testutil"
 )
 
 func TestBarChartRender(t *testing.T) {

pkg/chart/bollinger_band_series_test.go

@@ -5,7 +5,7 @@ import (
 	"math"
 	"testing"
 
-	"github.com/wcharczuk/go-chart/v2/testutil"
+	"github.com/d-Rickyy-b/go-chart-x/v2/testutil"
 )
 
 func TestBollingerBandSeries(t *testing.T) {

pkg/chart/box_test.go

@@ -4,7 +4,7 @@ import (
 	"math"
 	"testing"
 
-	"github.com/wcharczuk/go-chart/v2/testutil"
+	"github.com/d-Rickyy-b/go-chart-x/v2/testutil"
 )
 
 func TestBoxClone(t *testing.T) {

pkg/chart/chart_test.go

@@ -2,14 +2,14 @@ package chart
 
 import (
 	"bytes"
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/drawing"
 	"image"
 	"image/png"
 	"math"
 	"testing"
 	"time"
 
-	"github.com/wcharczuk/go-chart/v2/drawing"
+	"github.com/d-Rickyy-b/go-chart-x/v2/testutil"
-	"github.com/wcharczuk/go-chart/v2/testutil"
 )
 
 func TestChartGetDPI(t *testing.T) {

pkg/chart/colors.go

@@ -1,6 +1,8 @@
 package chart
 
-import "github.com/wcharczuk/go-chart/v2/drawing"
+import (
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/drawing"
+)
 
 var (
 	// ColorWhite is white.

pkg/chart/concat_series_test.go

@@ -3,7 +3,7 @@ package chart
 import (
 	"testing"
 
-	"github.com/wcharczuk/go-chart/v2/testutil"
+	"github.com/d-Rickyy-b/go-chart-x/v2/testutil"
 )
 
 func TestConcatSeries(t *testing.T) {

pkg/chart/continuous_range_test.go

@@ -3,7 +3,7 @@ package chart
 import (
 	"testing"
 
-	"github.com/wcharczuk/go-chart/v2/testutil"
+	"github.com/d-Rickyy-b/go-chart-x/v2/testutil"
 )
 
 func TestRangeTranslate(t *testing.T) {

pkg/chart/continuous_series_test.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/wcharczuk/go-chart/v2/testutil"
+	"github.com/d-Rickyy-b/go-chart-x/v2/testutil"
 )
 
 func TestContinuousSeries(t *testing.T) {

pkg/chart/donut_chart_test.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/wcharczuk/go-chart/v2/testutil"
+	"github.com/d-Rickyy-b/go-chart-x/v2/testutil"
 )
 
 func TestDonutChart(t *testing.T) {

pkg/chart/ema_series_test.go

@@ -3,7 +3,7 @@ package chart
 import (
 	"testing"
 
-	"github.com/wcharczuk/go-chart/v2/testutil"
+	"github.com/d-Rickyy-b/go-chart-x/v2/testutil"
 )
 
 var (

pkg/chart/first_value_annotation_test.go

@@ -3,7 +3,7 @@ package chart
 import (
 	"testing"
 
-	"github.com/wcharczuk/go-chart/v2/testutil"
+	"github.com/d-Rickyy-b/go-chart-x/v2/testutil"
 )
 
 func TestFirstValueAnnotation(t *testing.T) {

pkg/chart/font.go

@@ -1,10 +1,10 @@
 package chart
 
 import (
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/roboto"
 	"sync"
 
 	"github.com/golang/freetype/truetype"
-	"github.com/wcharczuk/go-chart/v2/roboto"
 )
 
 var (

pkg/chart/grid_line_test.go

@@ -3,7 +3,7 @@ package chart
 import (
 	"testing"
 
-	"github.com/wcharczuk/go-chart/v2/testutil"
+	"github.com/d-Rickyy-b/go-chart-x/v2/testutil"
 )
 
 func TestGenerateGridLines(t *testing.T) {

pkg/chart/histogram_series_test.go

@@ -3,7 +3,7 @@ package chart
 import (
 	"testing"
 
-	"github.com/wcharczuk/go-chart/v2/testutil"
+	"github.com/d-Rickyy-b/go-chart-x/v2/testutil"
 )
 
 func TestHistogramSeries(t *testing.T) {

pkg/chart/jet.go

@@ -1,6 +1,8 @@
 package chart
 
-import "github.com/wcharczuk/go-chart/v2/drawing"
+import (
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/drawing"
+)
 
 // Jet is a color map provider based on matlab's jet color map.
 func Jet(v, vmin, vmax float64) drawing.Color {

pkg/chart/last_value_annotation_series_test.go

@@ -3,7 +3,7 @@ package chart
 import (
 	"testing"
 
-	"github.com/wcharczuk/go-chart/v2/testutil"
+	"github.com/d-Rickyy-b/go-chart-x/v2/testutil"
 )
 
 func TestLastValueAnnotationSeries(t *testing.T) {

pkg/chart/legend.go

@@ -1,7 +1,7 @@
 package chart
 
 import (
-	"github.com/wcharczuk/go-chart/v2/drawing"
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/drawing"
 )
 
 // Legend returns a legend renderable function.

pkg/chart/legend_test.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/wcharczuk/go-chart/v2/testutil"
+	"github.com/d-Rickyy-b/go-chart-x/v2/testutil"
 )
 
 func TestLegend(t *testing.T) {

pkg/chart/linear_regression_series_test.go

@@ -3,7 +3,7 @@ package chart
 import (
 	"testing"
 
-	"github.com/wcharczuk/go-chart/v2/testutil"
+	"github.com/d-Rickyy-b/go-chart-x/v2/testutil"
 )
 
 func TestLinearRegressionSeries(t *testing.T) {

pkg/chart/macd_series_test.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/wcharczuk/go-chart/v2/testutil"
+	"github.com/d-Rickyy-b/go-chart-x/v2/testutil"
 )
 
 var (

pkg/chart/percent_change_series_test.go

@@ -3,7 +3,7 @@ package chart
 import (
 	"testing"
 
-	"github.com/wcharczuk/go-chart/v2/testutil"
+	"github.com/d-Rickyy-b/go-chart-x/v2/testutil"
 )
 
 func TestPercentageDifferenceSeries(t *testing.T) {

pkg/chart/pie_chart_test.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/wcharczuk/go-chart/v2/testutil"
+	"github.com/d-Rickyy-b/go-chart-x/v2/testutil"
 )
 
 func TestPieChart(t *testing.T) {

pkg/chart/polynomial_regression_series.go

@@ -2,9 +2,8 @@ package chart
 
 import (
 	"fmt"
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/matrix"
 	"math"
-
-	"github.com/wcharczuk/go-chart/v2/matrix"
 )
 
 // Interface Assertions.

pkg/chart/polynomial_regression_test.go

@@ -1,10 +1,10 @@
 package chart
 
 import (
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/matrix"
 	"testing"
 
-	"github.com/wcharczuk/go-chart/v2/matrix"
+	"github.com/d-Rickyy-b/go-chart-x/v2/testutil"
-	"github.com/wcharczuk/go-chart/v2/testutil"
 )
 
 func TestPolynomialRegression(t *testing.T) {

pkg/chart/raster_renderer.go

@@ -1,13 +1,13 @@
 package chart
 
 import (
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/drawing"
 	"image"
 	"image/png"
 	"io"
 	"math"
 
 	"github.com/golang/freetype/truetype"
-	"github.com/wcharczuk/go-chart/v2/drawing"
 )
 
 // PNG returns a new png/raster renderer.

pkg/chart/renderer.go

@@ -1,10 +1,10 @@
 package chart
 
 import (
+	"github.com/d-Rickyy-b/go-chart-x/v2/pkg/drawing"
 	"io"
 
 	"github.com/golang/freetype/truetype"
-	"github.com/wcharczuk/go-chart/v2/drawing"
 )
 
 // Renderer represents the basic methods required to draw a chart.