Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(324)

Unified Diff: packages/charted/lib/core/scales/linear_scale.dart

Issue 1521693002: Roll Observatory deps (charted -> ^0.3.0) (Closed) Base URL: https://chromium.googlesource.com/external/github.com/dart-lang/observatory_pub_packages.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « packages/charted/lib/core/scales.dart ('k') | packages/charted/lib/core/scales/log_scale.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: packages/charted/lib/core/scales/linear_scale.dart
diff --git a/packages/charted/lib/core/scales/linear_scale.dart b/packages/charted/lib/core/scales/linear_scale.dart
index a0de8fb6c4c980259d4bd58807f1bf641a355410..4c983dce7005e11152a5e15ebcad72011c9b12d3 100644
--- a/packages/charted/lib/core/scales/linear_scale.dart
+++ b/packages/charted/lib/core/scales/linear_scale.dart
@@ -40,15 +40,15 @@ class LinearScale implements Scale {
_domain, ScaleUtils.niceStep(_linearTickRange().step));
}
- Function linear = math.min(_domain.length, _range.length) > 2 ?
- ScaleUtils.polylinearScale : ScaleUtils.bilinearScale;
+ Function linear = math.min(_domain.length, _range.length) > 2
+ ? ScaleUtils.polylinearScale
+ : ScaleUtils.bilinearScale;
Function uninterpolator = clamp ? uninterpolateClamp : uninterpolateNumber;
InterpolatorGenerator interpolator =
_rounded ? createRoundedNumberInterpolator : createNumberInterpolator;
- _invert =
- linear(_range, _domain, uninterpolator, createNumberInterpolator);
+ _invert = linear(_range, _domain, uninterpolator, createNumberInterpolator);
_scale = linear(_domain, _range, uninterpolator, interpolator);
}
@@ -135,19 +135,19 @@ class LinearScale implements Scale {
if (extent == null) {
extent = ScaleUtils.extent(_domain);
}
- var span = extent.max - extent.min,
- step =
- math.pow(10, (math.log(span / _ticksCount) / math.LN10).floor()),
- err = _ticksCount / span * step;
+ var span = extent.max - extent.min;
+ if (span == 0) {
+ span = 1.0; // [span / _ticksCount] should never be equal zero.
+ }
+ var step = math.pow(10, (math.log(span / _ticksCount) / math.LN10).floor());
+ var err = _ticksCount / span * step;
// Filter ticks to get closer to the desired count.
if (err <= .15) {
step *= 10;
- }
- else if (err <= .35) {
+ } else if (err <= .35) {
step *= 5;
- }
- else if (err <= .75) {
+ } else if (err <= .75) {
step *= 2;
}
« no previous file with comments | « packages/charted/lib/core/scales.dart ('k') | packages/charted/lib/core/scales/log_scale.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698