Default to suitable precision.

The point of this method is to pick the right precision for you!

Default to suitable precision.
The point of this method is to pick the right precision for you!
28538c40 · Mike Bostock · fe797df4 · 28538c40 · 28538c40 · 28538c40
Commit 28538c40 authored Mar 23, 2014 by Mike Bostock
Expand all Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 6 deletions

d3.js d3.js +2 -1

d3.min.js d3.min.js +1 -1

src/scale/linear.js src/scale/linear.js +2 -1

test/scale/linear-test.js test/scale/linear-test.js +3 -3

No files found.
--- a/d3.js
+++ b/d3.js
@@ -7476,7 +7476,8 @@
      match.shift();
      if (match[8] === "s") {
        var prefix = d3.formatPrefix(Math.max(abs(range[0]), abs(range[1])));
-        match[8] = match[7] ? "f" : "r";
+        if (!match[7]) match[7] = "." + d3_scale_linearPrecision(prefix.scale(range[2]));
+        match[8] = "f";
        format = d3.format(match.join(""));
        return function(d) {
          return format(prefix.scale(d)) + prefix.symbol;

--- a/d3.min.js
+++ b/d3.min.js
--- a/src/scale/linear.js
+++ b/src/scale/linear.js
@@ -122,7 +122,8 @@ function d3_scale_linearTickFormat(domain, m, format) {
    match.shift();
    if (match[8] === "s") {
      var prefix = d3.formatPrefix(Math.max(abs(range[0]), abs(range[1])));
-      match[8] = match[7] ? "f" : "r";
+      if (!match[7]) match[7] = "." + d3_scale_linearPrecision(prefix.scale(range[2]));
+      match[8] = "f";
      format = d3.format(match.join(""));
      return function(d) {
        return format(prefix.scale(d)) + prefix.symbol;

--- a/test/scale/linear-test.js
+++ b/test/scale/linear-test.js
@@ -223,9 +223,9 @@ suite.addBatch({
      },
      "applies fixed-scale SI-prefix notation": function(d3) {
        var x = d3.scale.linear().domain([0, 1e6]);
-        assert.deepEqual(x.ticks(10).map(x.tickFormat(10, "s")), ["0M", "0.1M", "0.2M", "0.3M", "0.4M", "0.5M", "0.6M", "0.7M", "0.8M", "0.9M", "1M"]);
-        assert.deepEqual(x.ticks(10).map(x.tickFormat(10, ".1s")), ["0.0M", "0.1M", "0.2M", "0.3M", "0.4M", "0.5M", "0.6M", "0.7M", "0.8M", "0.9M", "1.0M"]);
-        assert.deepEqual(x.ticks(10).map(x.tickFormat(10, "+$.1s")), ["+$0.0M", "+$0.1M", "+$0.2M", "+$0.3M", "+$0.4M", "+$0.5M", "+$0.6M", "+$0.7M", "+$0.8M", "+$0.9M", "+$1.0M"]);
+        assert.deepEqual(x.ticks(10).map(x.tickFormat(10, "s")), ["0.0M", "0.1M", "0.2M", "0.3M", "0.4M", "0.5M", "0.6M", "0.7M", "0.8M", "0.9M", "1.0M"]);
+        assert.deepEqual(x.ticks(10).map(x.tickFormat(10, ".2s")), ["0.00M", "0.10M", "0.20M", "0.30M", "0.40M", "0.50M", "0.60M", "0.70M", "0.80M", "0.90M", "1.00M"]);
+        assert.deepEqual(x.ticks(10).map(x.tickFormat(10, "+$s")), ["+$0.0M", "+$0.1M", "+$0.2M", "+$0.3M", "+$0.4M", "+$0.5M", "+$0.6M", "+$0.7M", "+$0.8M", "+$0.9M", "+$1.0M"]);
        var x = d3.scale.linear().domain([0, 1e5]);
        assert.deepEqual(x.ticks(10).map(x.tickFormat(10, "s")), ["0k", "10k", "20k", "30k", "40k", "50k", "60k", "70k", "80k", "90k", "100k"]);
        var x = d3.scale.linear().domain([0, 1e-4]);