@@ -490,14 +490,14 @@ type DefaultTicks struct{}
490
490
var _ Ticker = DefaultTicks {}
491
491
492
492
// Ticks returns Ticks in the specified range.
493
- func (DefaultTicks ) Ticks (minTick , maxTick float64 ) []Tick {
494
- if maxTick <= minTick {
493
+ func (DefaultTicks ) Ticks (min , max float64 ) []Tick {
494
+ if max <= min {
495
495
panic ("illegal range" )
496
496
}
497
497
498
498
const suggestedTicks = 3
499
499
500
- labels , step , q , mag := talbotLinHanrahan (minTick , maxTick , suggestedTicks , withinData , nil , nil , nil )
500
+ labels , step , q , mag := talbotLinHanrahan (min , max , suggestedTicks , withinData , nil , nil , nil )
501
501
majorDelta := step * math .Pow10 (mag )
502
502
if q == 0 {
503
503
// Simple fall back was chosen, so
@@ -516,7 +516,7 @@ func (DefaultTicks) Ticks(minTick, maxTick float64) []Tick {
516
516
if math .Trunc (q ) != q {
517
517
off += 2
518
518
}
519
- prec := min (6 , max (off , - mag ))
519
+ prec := minInt (6 , maxInt (off , - mag ))
520
520
ticks := make ([]Tick , len (labels ))
521
521
for i , v := range labels {
522
522
ticks [i ] = Tick {Value : v , Label : strconv .FormatFloat (v , fc , prec , 64 )}
@@ -539,15 +539,15 @@ func (DefaultTicks) Ticks(minTick, maxTick float64) []Tick {
539
539
// Find the first minor tick not greater
540
540
// than the lowest data value.
541
541
var i float64
542
- for labels [0 ]+ (i - 1 )* minorDelta > minTick {
542
+ for labels [0 ]+ (i - 1 )* minorDelta > min {
543
543
i --
544
544
}
545
545
// Add ticks at minorDelta intervals when
546
546
// they are not within minorDelta/2 of a
547
547
// labelled tick.
548
548
for {
549
549
val := labels [0 ] + i * minorDelta
550
- if val > maxTick {
550
+ if val > max {
551
551
break
552
552
}
553
553
found := false
@@ -565,6 +565,14 @@ func (DefaultTicks) Ticks(minTick, maxTick float64) []Tick {
565
565
return ticks
566
566
}
567
567
568
+ func minInt (a , b int ) int {
569
+ return min (a , b )
570
+ }
571
+
572
+ func maxInt (a , b int ) int {
573
+ return max (a , b )
574
+ }
575
+
568
576
// LogTicks is suitable for the Tick.Marker field of an Axis,
569
577
// it returns tick marks suitable for a log-scale axis.
570
578
type LogTicks struct {
0 commit comments