small bugfix for edge case.
This commit is contained in:
parent
3432bd9443
commit
d455b775da
3 changed files with 45 additions and 0 deletions
4
chart.go
4
chart.go
|
@ -104,7 +104,11 @@ func (c Chart) Render(rp RendererProvider, w io.Writer) error {
|
||||||
xt, yt, yta = c.getAxesTicks(r, xr, yr, yra, xf, yf, yfa)
|
xt, yt, yta = c.getAxesTicks(r, xr, yr, yra, xf, yf, yfa)
|
||||||
canvasBox = c.getAxisAdjustedCanvasBox(r, canvasBox, xr, yr, yra, xt, yt, yta)
|
canvasBox = c.getAxisAdjustedCanvasBox(r, canvasBox, xr, yr, yra, xt, yt, yta)
|
||||||
xr, yr, yra = c.setRangeDomains(canvasBox, xr, yr, yra)
|
xr, yr, yra = c.setRangeDomains(canvasBox, xr, yr, yra)
|
||||||
|
|
||||||
|
// do a second pass in case things haven't settled yet.
|
||||||
xt, yt, yta = c.getAxesTicks(r, xr, yr, yra, xf, yf, yfa)
|
xt, yt, yta = c.getAxesTicks(r, xr, yr, yra, xf, yf, yfa)
|
||||||
|
canvasBox = c.getAxisAdjustedCanvasBox(r, canvasBox, xr, yr, yra, xt, yt, yta)
|
||||||
|
xr, yr, yra = c.setRangeDomains(canvasBox, xr, yr, yra)
|
||||||
}
|
}
|
||||||
|
|
||||||
if c.hasAnnotationSeries() {
|
if c.hasAnnotationSeries() {
|
||||||
|
|
|
@ -42,7 +42,46 @@ func drawChart(res http.ResponseWriter, req *http.Request) {
|
||||||
graph.Render(chart.PNG, res)
|
graph.Render(chart.PNG, res)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func drawCustomChart(res http.ResponseWriter, req *http.Request) {
|
||||||
|
/*
|
||||||
|
This is basically the other timeseries example, except we switch to hour intervals and specify a different formatter from default for the xaxis tick labels.
|
||||||
|
*/
|
||||||
|
graph := chart.Chart{
|
||||||
|
XAxis: chart.XAxis{
|
||||||
|
Style: chart.Style{
|
||||||
|
Show: true,
|
||||||
|
},
|
||||||
|
ValueFormatter: chart.TimeHourValueFormatter,
|
||||||
|
},
|
||||||
|
Series: []chart.Series{
|
||||||
|
chart.TimeSeries{
|
||||||
|
XValues: []time.Time{
|
||||||
|
time.Now().Add(-10 * time.Hour),
|
||||||
|
time.Now().Add(-9 * time.Hour),
|
||||||
|
time.Now().Add(-8 * time.Hour),
|
||||||
|
time.Now().Add(-7 * time.Hour),
|
||||||
|
time.Now().Add(-6 * time.Hour),
|
||||||
|
time.Now().Add(-5 * time.Hour),
|
||||||
|
time.Now().Add(-4 * time.Hour),
|
||||||
|
time.Now().Add(-3 * time.Hour),
|
||||||
|
time.Now().Add(-2 * time.Hour),
|
||||||
|
time.Now().Add(-1 * time.Hour),
|
||||||
|
time.Now(),
|
||||||
|
},
|
||||||
|
YValues: []float64{1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
res.Header().Set("Content-Type", "image/png")
|
||||||
|
graph.Render(chart.PNG, res)
|
||||||
|
}
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
http.HandleFunc("/", drawChart)
|
http.HandleFunc("/", drawChart)
|
||||||
|
http.HandleFunc("/favico.ico", func(res http.ResponseWriter, req *http.Request) {
|
||||||
|
res.Write([]byte{})
|
||||||
|
})
|
||||||
|
http.HandleFunc("/custom", drawCustomChart)
|
||||||
http.ListenAndServe(":8080", nil)
|
http.ListenAndServe(":8080", nil)
|
||||||
}
|
}
|
||||||
|
|
2
xaxis.go
2
xaxis.go
|
@ -78,6 +78,7 @@ func (xa XAxis) GetGridLines(ticks []Tick) []GridLine {
|
||||||
func (xa XAxis) Measure(r Renderer, canvasBox Box, ra Range, defaults Style, ticks []Tick) Box {
|
func (xa XAxis) Measure(r Renderer, canvasBox Box, ra Range, defaults Style, ticks []Tick) Box {
|
||||||
r.SetStrokeColor(xa.Style.GetStrokeColor(defaults.StrokeColor))
|
r.SetStrokeColor(xa.Style.GetStrokeColor(defaults.StrokeColor))
|
||||||
r.SetStrokeWidth(xa.Style.GetStrokeWidth(defaults.StrokeWidth))
|
r.SetStrokeWidth(xa.Style.GetStrokeWidth(defaults.StrokeWidth))
|
||||||
|
r.SetStrokeDashArray(xa.Style.GetStrokeDashArray())
|
||||||
r.SetFont(xa.Style.GetFont(defaults.GetFont()))
|
r.SetFont(xa.Style.GetFont(defaults.GetFont()))
|
||||||
r.SetFontColor(xa.Style.GetFontColor(DefaultAxisColor))
|
r.SetFontColor(xa.Style.GetFontColor(DefaultAxisColor))
|
||||||
r.SetFontSize(xa.Style.GetFontSize(defaults.GetFontSize()))
|
r.SetFontSize(xa.Style.GetFontSize(defaults.GetFontSize()))
|
||||||
|
@ -111,6 +112,7 @@ func (xa XAxis) Measure(r Renderer, canvasBox Box, ra Range, defaults Style, tic
|
||||||
func (xa XAxis) Render(r Renderer, canvasBox Box, ra Range, defaults Style, ticks []Tick) {
|
func (xa XAxis) Render(r Renderer, canvasBox Box, ra Range, defaults Style, ticks []Tick) {
|
||||||
r.SetStrokeColor(xa.Style.GetStrokeColor(defaults.StrokeColor))
|
r.SetStrokeColor(xa.Style.GetStrokeColor(defaults.StrokeColor))
|
||||||
r.SetStrokeWidth(xa.Style.GetStrokeWidth(defaults.StrokeWidth))
|
r.SetStrokeWidth(xa.Style.GetStrokeWidth(defaults.StrokeWidth))
|
||||||
|
r.SetStrokeDashArray(xa.Style.GetStrokeDashArray())
|
||||||
r.SetFont(xa.Style.GetFont(defaults.GetFont()))
|
r.SetFont(xa.Style.GetFont(defaults.GetFont()))
|
||||||
r.SetFontColor(xa.Style.GetFontColor(DefaultAxisColor))
|
r.SetFontColor(xa.Style.GetFontColor(DefaultAxisColor))
|
||||||
r.SetFontSize(xa.Style.GetFontSize(defaults.GetFontSize()))
|
r.SetFontSize(xa.Style.GetFontSize(defaults.GetFontSize()))
|
||||||
|
|
Loading…
Reference in a new issue