Skip to content

Invert heatmap y-axis #2113

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

Merged
texodus merged 1 commit into from
Feb 22, 2023
Merged

Invert heatmap y-axis #2113

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
2 changes: 1 addition & 1 deletion examples/blocks/src/movies/layout.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"split_by": ["bucket(\"IMDB Rating\", 0.25)"],
"columns": ["US Gross"],
"filter": [["bucket(\"IMDB Rating\", 0.25)", "is not null", null]],
"sort": [["bucket(\"IMDB Rating\", 0.25)", "col desc"]],
"sort": [],
"expressions": [
"bucket(\"IMDB Rating\", 0.25)",
"bucket(\"Rotten Tomatoes Rating\", 2.5)"
Expand Down
15 changes: 14 additions & 1 deletion packages/perspective-viewer-d3fc/src/js/axis/axisFactory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ export const axisFactory = (settings) => {
let settingName = "crossValues";
let settingValue = null;
let valueNames = ["crossValue"];
let modifyDomain = null;

const optionalParams = ["include", "paddingStrategy", "pad"];
const optional = {};
Expand All @@ -45,7 +46,11 @@ export const axisFactory = (settings) => {
});
if (domainFunction.orient) domainFunction.orient(orient);

const domain = domainFunction(data);
let domain = domainFunction(data);
if (modifyDomain !== null) {
domain = modifyDomain(domain);
}

const component = axis.component
? createComponent(axis, domain, data)
: defaultComponent();
Expand Down Expand Up @@ -131,6 +136,14 @@ export const axisFactory = (settings) => {
return _factory;
};

_factory.modifyDomain = (...args) => {
if (!args.length) {
return modifyDomain;
}
modifyDomain = args[0];
return _factory;
};

optionalParams.forEach((p) => {
_factory[p] = (...args) => {
if (!args.length) {
Expand Down
5 changes: 5 additions & 0 deletions packages/perspective-viewer-d3fc/src/js/charts/heatmap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,15 @@ function heatmapChart(container, settings) {
.excludeType(AXIS_TYPES.linear)
.settingName("crossValues")
.valueName("crossValue")(data);

const yAxis = axisFactory(settings)
.excludeType(AXIS_TYPES.linear)
.settingName("splitValues")
.valueName("mainValue")
.modifyDomain((d) => {
let is_number = !isNaN(d[0]);
return is_number ? d.reverse() : d;
})
.orient("vertical")(data);

const chart = chartCanvasFactory(xAxis, yAxis).plotArea(
Expand Down
9 changes: 5 additions & 4 deletions packages/perspective-viewer-d3fc/test/js/integration/area.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,17 @@ const utils = require("@finos/perspective-test");
const simple_tests = require("@finos/perspective-viewer/test/js/simple_tests.js");

const { withTemplate } = require("./simple-template");
const { util } = require("prettier");
withTemplate("area", "Y Area");

utils.with_server({}, () => {
describe.page(
"area.html",
() => {
simple_tests.default(
utils.get_contents.bind(
null,
"perspective-viewer perspective-viewer-d3fc-yarea"
simple_tests.default((p) =>
utils.get_contents(
"perspective-viewer perspective-viewer-d3fc-yarea",
p
)
);
},
Expand Down
17 changes: 9 additions & 8 deletions packages/perspective-viewer-d3fc/test/js/integration/bar.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,12 @@ utils.with_server({}, () => {
describe.page(
"bar.html",
() => {
const get_contents = utils.get_contents.bind(
null,
"perspective-viewer perspective-viewer-d3fc-ybar"
simple_tests.default((p) =>
utils.get_contents(
"perspective-viewer perspective-viewer-d3fc-ybar",
p
)
);
simple_tests.default(get_contents);
// render_warning_tests.default("Y Bar");
},
{ root: path.join(__dirname, "..", "..", "..") }
Expand All @@ -49,10 +50,10 @@ utils.with_server({}, () => {
describe.page(
"bar-themed.html",
() => {
simple_tests.default(
utils.get_contents.bind(
null,
"perspective-viewer perspective-viewer-d3fc-ybar"
simple_tests.default((p) =>
utils.get_contents(
"perspective-viewer perspective-viewer-d3fc-ybar",
p
)
);
// render_warning_tests.default("Y Bar");
Expand Down
8 changes: 4 additions & 4 deletions packages/perspective-viewer-d3fc/test/js/integration/barWidth.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@ utils.with_server({}, () => {
theme: "Material Light",
});

return await utils.get_contents.bind(
null,
"perspective-viewer perspective-viewer-d3fc-ybar"
)(page);
return await utils.get_contents(
"perspective-viewer perspective-viewer-d3fc-ybar",
page
);
}
);
});
Expand Down
16 changes: 8 additions & 8 deletions packages/perspective-viewer-d3fc/test/js/integration/events.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@ utils.with_server({}, () => {
expect(count).toEqual(1);

// Return the chart contents
return utils.get_contents.bind(
null,
"perspective-viewer perspective-viewer-d3fc-yline"
)(page);
return utils.get_contents(
"perspective-viewer perspective-viewer-d3fc-yline",
page
);
}
);

Expand Down Expand Up @@ -133,10 +133,10 @@ utils.with_server({}, () => {

// Return the chart contents

return utils.get_contents.bind(
null,
"perspective-viewer perspective-viewer-d3fc-yline"
)(page);
return utils.get_contents(
"perspective-viewer perspective-viewer-d3fc-yline",
page
);
}
);
},
Expand Down
24 changes: 18 additions & 6 deletions packages/perspective-viewer-d3fc/test/js/integration/heatmap.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,24 @@ utils.with_server({}, () => {
describe.page(
"heatmap.html",
() => {
simple_tests.default(
utils.get_contents.bind(
null,
"perspective-viewer perspective-viewer-d3fc-heatmap"
)
);
const get_contents = (p) =>
utils.get_contents(
"perspective-viewer perspective-viewer-d3fc-heatmap",
p
);
simple_tests.default(get_contents);

test.capture("by a numerical column", async (page) => {
await page.evaluate(async () => {
const viewer = document.querySelector("perspective-viewer");
await viewer.restore({
split_by: ["Postal Code"],
settings: true,
});
});

return await get_contents(page);
});
// render_warning_tests.default("Heatmap");
},
{ reload_page: false, root: path.join(__dirname, "..", "..", "..") }
Expand Down
27 changes: 21 additions & 6 deletions packages/perspective-viewer-d3fc/test/js/integration/line.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,27 @@ utils.with_server({}, () => {
describe.page(
"line.html",
() => {
simple_tests.default(
utils.get_contents.bind(
null,
"perspective-viewer perspective-viewer-d3fc-yline"
)
);
const get_contents = (p) =>
utils.get_contents(
"perspective-viewer perspective-viewer-d3fc-yline",
p
);
simple_tests.default(get_contents);
// TODO: this shouldnt fail:
// This test fails because when given a column with all nulls
// rendering in d3fc errors. This is mostly benign because
// rendering is already not gonna happen at that point.
test.skip("by a numerical column", async (page) => {
await page.evaluate(async () => {
const viewer = document.querySelector("perspective-viewer");
await viewer.restore({
split_by: ["Postal Code"],
settings: true,
});
});

return await get_contents(page);
});

// test.capture("Sets a category axis when pivoted by an expression datetime", async page => {
// const viewer = await page.$("perspective-viewer");
Expand Down
8 changes: 4 additions & 4 deletions packages/perspective-viewer-d3fc/test/js/integration/scatter.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ utils.with_server({}, () => {
describe.page(
"scatter.html",
() => {
simple_tests.default(
utils.get_contents.bind(
null,
"perspective-viewer perspective-viewer-d3fc-xyscatter"
simple_tests.default((p) =>
utils.get_contents(
"perspective-viewer perspective-viewer-d3fc-xyscatter",
p
)
);

Expand Down
8 changes: 4 additions & 4 deletions packages/perspective-viewer-d3fc/test/js/integration/sunburst.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ utils.with_server({}, () => {
describe.page(
"sunburst.html",
() => {
simple_tests.default(
utils.get_contents.bind(
null,
"perspective-viewer perspective-viewer-d3fc-sunburst"
simple_tests.default((p) =>
utils.get_contents(
"perspective-viewer perspective-viewer-d3fc-sunburst",
p
)
);

Expand Down
8 changes: 4 additions & 4 deletions packages/perspective-viewer-d3fc/test/js/integration/treemap.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ utils.with_server({}, () => {
describe.page(
"treemap.html",
() => {
simple_tests.default(
utils.get_contents.bind(
null,
"perspective-viewer perspective-viewer-d3fc-treemap"
simple_tests.default((p) =>
utils.get_contents(
"perspective-viewer perspective-viewer-d3fc-treemap",
p
)
);

Expand Down
8 changes: 4 additions & 4 deletions packages/perspective-viewer-d3fc/test/js/integration/xy-line.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ utils.with_server({}, () => {
describe.page(
"xyline.html",
() => {
simple_tests.default(
utils.get_contents.bind(
null,
"perspective-viewer perspective-viewer-d3fc-xyline"
simple_tests.default((p) =>
utils.get_contents(
"perspective-viewer perspective-viewer-d3fc-xyline",
p
)
);

Expand Down
9 changes: 4 additions & 5 deletions packages/perspective-viewer-d3fc/test/js/integration/yscatter.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,10 @@ utils.with_server({}, () => {
describe.page(
"yscatter.html",
() => {
simple_tests.default(
utils.get_contents.bind(
null,

"perspective-viewer perspective-viewer-d3fc-yscatter"
simple_tests.default((p) =>
utils.get_contents(
"perspective-viewer perspective-viewer-d3fc-yscatter",
p
)
);
// render_warning_tests.default("Y Scatter");
Expand Down
3 changes: 2 additions & 1 deletion packages/perspective-viewer-d3fc/test/results/results.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,5 +148,6 @@
"bar-themed_filters_filters_by_a_numeric_column": "c9e4e2fc4e1a12aa7684e8608f46c653",
"bar-themed_filters_filters_by_an_alpha_column": "d586997539b9f76b0733efad0631749d",
"bar-themed_filters_filters_with__in__comparator": "914b15437ab74e08463987f7d0166f05",
"xyline_correctly_render_when_a_bar_chart_has_non_equidistant_times_on_a_datetime_axis": "f420990315751370e1237e86b4043332"
"xyline_correctly_render_when_a_bar_chart_has_non_equidistant_times_on_a_datetime_axis": "f420990315751370e1237e86b4043332",
"heatmap_by_a_numerical_column": "c978a9d898ac6dac8b32223aa97d2805"
}