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

Revert "Improvements to how the X Axis is rendered"

Browse source
This commit is contained in:
Tree Xie 2023-12-27 18:20:55 +08:00 • committed by GitHub
parent 0ddb9e4ef1
commit 8bcb584aba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 20 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

30
painter.go
View file

@ -615,20 +615,6 @@ func (p *Painter) TextFit(body string, x, y, width int, textAligns ...string) ch
return output
}
func isTick(totalRange int, unit int, index int) bool {
numTicks := (totalRange / unit) + 1
step := float64(totalRange-1) / float64(numTicks-1)
for i := int(float64(index) / step); i < numTicks; i++ {
value := int((float64(i) * step) + 0.5)
if value == index {
return true
} else if value > index {
break
}
}
return false
}
func (p *Painter) Ticks(opt TicksOption) *Painter {
if opt.Count <= 0 || opt.Length <= 0 {
return p
@ -652,7 +638,7 @@ func (p *Painter) Ticks(opt TicksOption) *Painter {
if index < first {
continue
}
if ! isTick(len(values), unit, index) {
if (index-first)%unit != 0 {
continue
}
if isVertical {
@ -688,13 +674,15 @@ func (p *Painter) MultiText(opt MultiTextOption) *Painter {
}
count := len(opt.TextList)
positionCenter := true
tickLimit := true
showIndex := opt.Unit / 2
if containsString([]string{
PositionLeft,
PositionTop,
}, opt.Position) {
positionCenter = false
count--
// 非居中
showIndex = 0
}
width := p.Width()
height := p.Height()
@ -702,7 +690,6 @@ func (p *Painter) MultiText(opt MultiTextOption) *Painter {
isVertical := opt.Orient == OrientVertical
if isVertical {
values = autoDivide(height, count)
tickLimit = false
} else {
values = autoDivide(width, count)
}
@ -712,7 +699,7 @@ func (p *Painter) MultiText(opt MultiTextOption) *Painter {
if index < opt.First {
continue
}
if opt.Unit != 0 && tickLimit && ! isTick(len(opt.TextList)-opt.First, opt.Unit, index-opt.First) {
if opt.Unit != 0 && (index-opt.First)%opt.Unit != showIndex {
continue
}
if isTextRotation {
@ -737,11 +724,7 @@ func (p *Painter) MultiText(opt MultiTextOption) *Painter {
x = 0
}
} else {
if index == len(opt.TextList) - 1 {
x = start - box.Width() + 10
} else {
x = start - box.Width()>>1
}
x = start - box.Width()>>1
}
x += offset.Left
y += offset.Top
@ -766,6 +749,7 @@ func (p *Painter) Grid(opt GridOption) *Painter {
x1 := 0
y1 := 0
if isVertical {
x0 = v
x1 = v
y1 = height