[US-25] Update tick calculation to show nicer rounded value (#4)

* add license loading in examples

* update examples dependecy

* add rounded tick label calculation for float type label only

* update example results

* update max tick rendering

* handle descending ticks order

* update example resuls

* fix typo

* add unit test

* add pdf to image generator in examples folder

* fix shifted x ticks

* rename preview image file name

* update readme file

* separate example module

* remove dependency to unipdf

* auto crop preview image and use fixed time in code

* fix y axis and tick position

* replace float tick label check

* revert go mod changes

* go mod tidy

* render y axis line after rendering chart series

Author: 3ace

README.md

@@ -38,13 +38,9 @@ For usage and output samples, see the [examples](examples) directory.
 
 ![Sample donut chart output](examples/donut_chart/preview.png)
 
-### Linear Progress Bar
+### Progress Bar
 
-![Sample linear progress bar](examples/progress_bar/preview_linear.png)
-
-### Circular Progress Bar
-
-![Sample circular progress bar](examples/progress_bar/preview_circular.png)
+![Sample progress bar](examples/progress_bar/preview.png)
 
 # License
 

bar_chart.go

@@ -128,6 +128,17 @@ func (bc *BarChart) Render(rp render.RendererProvider, w io.Writer) error {
 
 	if bc.hasAxes() {
 		yt = bc.getAxesTicks(r, yr, yf)
+
+		// Adjust domain range before adjusting the canvas box
+		// if the generated max tick value is exceeding the original max range.
+		if yr.IsDescending() {
+			yr.SetMax(yt[0].Value)
+		} else {
+			yr.SetMax(yt[len(yt)-1].Value)
+		}
+
+		yr = bc.setRangeDomains(canvasBox, yr)
+
 		canvasBox = bc.getAdjustedCanvasBox(r, canvasBox, yr, yt)
 		yr = bc.setRangeDomains(canvasBox, yr)
 	}

chart.go

@@ -114,6 +114,32 @@ func (c *Chart) Render(rp render.RendererProvider, w io.Writer) error {
 
 	if c.hasAxes() {
 		xt, yt, yta = c.getAxesTicks(r, xr, yr, yra, xf, yf, yfa)
+
+		// Adjust domain range before adjusting the canvas box
+		// if the generated max tick value is exceeding the original max range.
+		firstXTick := xt[0].Value
+		lastXTick := xt[len(xt)-1].Value
+		firstYTick := yt[0].Value
+		lastYTick := yt[len(yt)-1].Value
+
+		if xr.IsDescending() {
+			xr.SetMin(lastXTick)
+			xr.SetMax(firstXTick)
+		} else {
+			xr.SetMin(firstXTick)
+			xr.SetMax(lastXTick)
+		}
+
+		if yr.IsDescending() {
+			yr.SetMin(lastYTick)
+			yr.SetMax(firstYTick)
+		} else {
+			yr.SetMin(firstYTick)
+			yr.SetMax(lastYTick)
+		}
+
+		xr, yr, yra = c.setRangeDomains(canvasBox, xr, yr, yra)
+
 		canvasBox = c.getAxesAdjustedCanvasBox(r, canvasBox, xr, yr, yra, xt, yt, yta)
 		xr, yr, yra = c.setRangeDomains(canvasBox, xr, yr, yra)
 
@@ -135,6 +161,7 @@ func (c *Chart) Render(rp render.RendererProvider, w io.Writer) error {
 		c.drawSeries(r, canvasBox, xr, yr, yra, series, index)
 	}
 
+	c.drawYAxisLine(r, canvasBox, xr, yr, yra, xt, yt, yta)
 	c.drawTitle(r)
 
 	for _, a := range c.Elements {
@@ -473,6 +500,15 @@ func (c *Chart) drawAxes(r render.Renderer, canvasBox render.Box, xrange, yrange
 	}
 }
 
+func (c *Chart) drawYAxisLine(r render.Renderer, canvasBox render.Box, xrange, yrange, yrangeAlt sequence.Range, xticks, yticks, yticksAlt []Tick) {
+	if !c.YAxis.Style.Hidden {
+		c.YAxis.RenderAxisLine(r, canvasBox, yrange, c.styleDefaultsAxes(), yticks)
+	}
+	if !c.YAxisSecondary.Style.Hidden {
+		c.YAxisSecondary.RenderAxisLine(r, canvasBox, yrangeAlt, c.styleDefaultsAxes(), yticksAlt)
+	}
+}
+
 func (c *Chart) drawSeries(r render.Renderer, canvasBox render.Box, xrange, yrange, yrangeAlt sequence.Range, s dataset.Series, seriesIndex int) {
 	if !s.GetStyle().Hidden {
 		if s.GetYAxis() == dataset.YAxisPrimary {

examples/annotations/main.go

@@ -2,12 +2,24 @@ package main
 
 import (
 	"log"
+	"os"
 
 	"github.com/unidoc/unichart"
 	"github.com/unidoc/unichart/dataset"
+	"github.com/unidoc/unichart/examples"
+	"github.com/unidoc/unipdf/v3/common/license"
 	"github.com/unidoc/unipdf/v3/creator"
 )
 
+func init() {
+	// Make sure to load your metered License API key prior to using the library.
+	// If you need a key, you can sign up and create a free one at https://cloud.unidoc.io
+	err := license.SetMeteredKey(os.Getenv(`UNIDOC_LICENSE_API_KEY`))
+	if err != nil {
+		panic(err)
+	}
+}
+
 func main() {
 	// Create chart component.
 	chart := &unichart.Chart{
@@ -42,4 +54,6 @@ func main() {
 	if err := c.WriteToFile("output.pdf"); err != nil {
 		log.Fatalf("failed to write output file: %v", err)
 	}
+
+	examples.RenderPDFToImage("output.pdf")
 }

examples/annotations/output.pdf

@@ -2,13 +2,25 @@ package main
 
 import (
 	"log"
+	"os"
 
 	"github.com/unidoc/unichart"
 	"github.com/unidoc/unichart/dataset"
+	"github.com/unidoc/unichart/examples"
 	"github.com/unidoc/unichart/render"
+	"github.com/unidoc/unipdf/v3/common/license"
 	"github.com/unidoc/unipdf/v3/creator"
 )
 
+func init() {
+	// Make sure to load your metered License API key prior to using the library.
+	// If you need a key, you can sign up and create a free one at https://cloud.unidoc.io
+	err := license.SetMeteredKey(os.Getenv(`UNIDOC_LICENSE_API_KEY`))
+	if err != nil {
+		panic(err)
+	}
+}
+
 func main() {
 	// Create chart component.
 	chart := &unichart.Chart{
@@ -35,4 +47,6 @@ func main() {
 	if err := c.WriteToFile("output.pdf"); err != nil {
 		log.Fatalf("failed to write output file: %v", err)
 	}
+
+	examples.RenderPDFToImage("output.pdf")
 }

examples/annotations/preview.png

@@ -3,13 +3,25 @@ package main
 import (
 	"image/color"
 	"log"
+	"os"
 
 	"github.com/unidoc/unichart"
 	"github.com/unidoc/unichart/dataset"
+	"github.com/unidoc/unichart/examples"
 	"github.com/unidoc/unichart/render"
+	"github.com/unidoc/unipdf/v3/common/license"
 	"github.com/unidoc/unipdf/v3/creator"
 )
 
+func init() {
+	// Make sure to load your metered License API key prior to using the library.
+	// If you need a key, you can sign up and create a free one at https://cloud.unidoc.io
+	err := license.SetMeteredKey(os.Getenv(`UNIDOC_LICENSE_API_KEY`))
+	if err != nil {
+		panic(err)
+	}
+}
+
 func main() {
 	// Create chart component.
 	chart := &unichart.Chart{
@@ -45,4 +57,6 @@ func main() {
 	if err := c.WriteToFile("output.pdf"); err != nil {
 		log.Fatalf("failed to write output file: %v", err)
 	}
+
+	examples.RenderPDFToImage("output.pdf")
 }