Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

implicit trim for log ticks #254

Merged
merged 1 commit into from
Sep 19, 2021
Merged

implicit trim for log ticks #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/log.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {ticks} from "d3-array";
import {format} from "d3-format";
import {format, formatSpecifier} from "d3-format";
import nice from "./nice.js";
import {copy, transformer} from "./continuous.js";
import {initRange} from "./init.js";
Expand Down Expand Up @@ -111,10 +111,13 @@ export function loggish(transform) {
};

scale.tickFormat = function(count, specifier) {
if (count == null) count = 10;
if (specifier == null) specifier = base === 10 ? ".0e" : ",";
if (typeof specifier !== "function") specifier = format(specifier);
if (typeof specifier !== "function") {
if (!(base % 1) && (specifier = formatSpecifier(specifier)).precision == null) specifier.trim = true;
specifier = format(specifier);
}
if (count === Infinity) return specifier;
if (count == null) count = 10;
var k = Math.max(1, base * count / scale.ticks().length); // TODO fast estimate?
return function(d) {
var i = d / pows(Math.round(logs(d)));
Expand Down
31 changes: 30 additions & 1 deletion test/log-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,14 +401,43 @@ it("log.tickFormat(count, format) returns a filtered format", () => {

it("log.tickFormat(count, specifier) returns a filtered format", () => {
const x = scaleLog().domain([1000.1, 1]);
assert.deepStrictEqual(x.ticks().map(x.tickFormat(10, ".1s")), [
assert.deepStrictEqual(x.ticks().map(x.tickFormat(10, "s")), [
"1k",
"", "", "", "", "", "", "300", "200", "100",
"", "", "", "", "", "", "30", "20", "10",
"", "", "", "", "", "", "3", "2", "1"
]);
});

it("log.tickFormat(count, specifier) trims trailing zeroes by default", () => {
const x = scaleLog().domain([100.1, 0.02]);
assert.deepStrictEqual(x.ticks().map(x.tickFormat(10, "f")), [
"100",
"", "", "", "", "", "", "", "20", "10",
"", "", "", "", "", "", "", "2", "1",
"", "", "", "", "", "", "", "0.2", "0.1",
"", "", "", "", "", "", "", "0.02"
]);
});

it("log.tickFormat(count, specifier) with base two trims trailing zeroes by default", () => {
const x = scaleLog().base(2).domain([100.1, 0.02]);
assert.deepStrictEqual(x.ticks().map(x.tickFormat(10, "f")), [
"64", "32", "16", "8", "4", "2", "1", "0.5", "0.25", "0.125", "0.0625", "0.03125"
]);
});

it("log.tickFormat(count, specifier) preserves trailing zeroes if needed", () => {
const x = scaleLog().domain([100.1, 0.02]);
assert.deepStrictEqual(x.ticks().map(x.tickFormat(10, ".1f")), [
"100.0",
"", "", "", "", "", "", "", "20.0", "10.0",
"", "", "", "", "", "", "", "2.0", "1.0",
"", "", "", "", "", "", "", "0.2", "0.1",
"", "", "", "", "", "", "", "0.0"
]);
});

it("log.ticks() returns the empty array when the domain is degenerate", () => {
const x = scaleLog();
assert.deepStrictEqual(x.domain([0, 1]).ticks(), []);
Expand Down