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

fixing undertick

Browse source
This commit is contained in:
Will Charczuk 2016-07-30 10:01:16 -07:00
parent bf962d256a
commit 457fefbc6d
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
xaxis.go
View file

@ -110,20 +110,22 @@ func (xa XAxis) Render(r Renderer, canvasBox Box, ra Range, defaults Style, tick
for index, t := range ticks { for index, t := range ticks {
v := t.Value v := t.Value
lx := ra.Translate(v) lx := ra.Translate(v)
tb := r.MeasureText(t.Label)
tx = canvasBox.Left + lx tx = canvasBox.Left + lx
ty = canvasBox.Bottom + DefaultXAxisMargin + tb.Height()
tickStyle.GetStrokeOptions().WriteToRenderer(r) tickStyle.GetStrokeOptions().WriteToRenderer(r)
r.MoveTo(tx, canvasBox.Bottom) r.MoveTo(tx, canvasBox.Bottom)
r.LineTo(tx, canvasBox.Bottom+DefaultVerticalTickHeight) r.LineTo(tx, canvasBox.Bottom+DefaultVerticalTickHeight)
r.Stroke() r.Stroke()
tickStyle.GetTextOptions().WriteToRenderer(r)
tb := r.MeasureText(t.Label)
switch tp { switch tp {
case TickPositionUnderTick: case TickPositionUnderTick, TickPositionUnset:
tickStyle.GetTextOptions().WriteToRenderer(r) ty = canvasBox.Bottom + DefaultXAxisMargin + tb.Height()
r.Text(t.Label, tx-tb.Width()>>1, ty) r.Text(t.Label, tx-tb.Width()>>1, ty)
break
case TickPositionBetweenTicks: case TickPositionBetweenTicks:
if index > 0 { if index > 0 {
llx := ra.Translate(ticks[index-1].Value) llx := ra.Translate(ticks[index-1].Value)
@ -135,6 +137,7 @@ func (xa XAxis) Render(r Renderer, canvasBox Box, ra Range, defaults Style, tick
Bottom: canvasBox.Bottom + DefaultXAxisMargin + tb.Height(), Bottom: canvasBox.Bottom + DefaultXAxisMargin + tb.Height(),
}, tickStyle.InheritFrom(Style{TextHorizontalAlign: TextHorizontalAlignCenter})) }, tickStyle.InheritFrom(Style{TextHorizontalAlign: TextHorizontalAlignCenter}))
} }
break
} }
} }