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

Export .png, .html, .arrow #1740

Merged
merged 4 commits into from
Mar 6, 2022
Merged

Export .png, .html, .arrow #1740

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
22908d8
D3FC render-to-canvas method
texodus Mar 6, 2022
97327b6
Fix treemap to inline style for render-to-canvas support
texodus Mar 6, 2022
dda829f
Add export menu to `perspective-viewer` with CSV, Arrow, PNG, HTML
texodus Mar 6, 2022
0b32780
Fix tests
texodus Mar 6, 2022
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
Prev Previous commit
Next Next commit
Fix treemap to inline style for render-to-canvas support
  • Loading branch information
@texodus
texodus committed Mar 6, 2022
commit 97327b64512dfa2f10066932138597efdd956e33
37 changes: 20 additions & 17 deletions packages/perspective-viewer-d3fc/src/js/series/treemap/treemapLabel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ export const labelMapExists = (d) =>
d.target && d.target.textAttributes ? true : false;

export const toggleLabels = (nodes, treemapLevel, crossValues) => {
nodes
.selectAll("text")
.style("font-size", null)
.attr("class", (d) => textLevelHelper(d, treemapLevel, crossValues));
nodes.selectAll("text").each(function (d, i) {
const help = textLevelHelper(d, treemapLevel, crossValues);
this.style = help;
});

const visibleNodes = selectVisibleNodes(nodes);
centerLabels(visibleNodes);
Expand All @@ -32,8 +32,7 @@ export const restoreLabels = (nodes) => {
label
.attr("dx", d.target.textAttributes.dx)
.attr("dy", d.target.textAttributes.dy)
.attr("class", d.target.textAttributes.class)
.style("font-size", d.target.textAttributes["font-size"]);
.attr("style", d.target.textAttributes.style);
});
};

Expand All @@ -47,15 +46,15 @@ export const preventTextCollisions = (nodes) => {
.selectAll("text")
.filter(
(_, i, nodes) =>
select(nodes[i]).attr("class") === textVisability.high
select(nodes[i]).attr("style") === textVisibility.high
)
.each((_, i, nodes) => topNodes.push(nodes[i]));

nodes
.selectAll("text")
.filter(
(_, i, nodes) =>
select(nodes[i]).attr("class") === textVisability.low
select(nodes[i]).attr("style") === textVisibility.low
)
.each((_, i, nodes) => {
const lowerNode = nodes[i];
Expand Down Expand Up @@ -93,8 +92,8 @@ export const textOpacity = {top: 1, mid: 0.7, lower: 0};
export const selectVisibleNodes = (nodes) =>
nodes.filter(
(_, i, nodes) =>
select(nodes[i]).selectAll("text").attr("class") !==
textVisability.zero
select(nodes[i]).selectAll("text").attr("style") !==
textVisibility.zero
);

export const adjustLabelsThatOverflow = (nodes) =>
Expand All @@ -118,7 +117,7 @@ const shrinkOrHideText = (d) => {
const rectRect = rect.getBBox();

if (!needsToShrinkOrHide(d, rectRect, textRect)) {
select(d).attr("class", select(d).attr("class"));
select(d).attr("style", select(d).attr("style"));
}
};

Expand All @@ -136,7 +135,7 @@ const needsToShrinkOrHide = (d, rectRect, textRect) => {
centerText(d);
} else {
select(d).style("font-size", null);
select(d).attr("class", textVisability.zero);
select(d).style("opacity", "0");
}
return true;
}
Expand All @@ -149,15 +148,19 @@ const textLevelHelper = (d, treemapLevel, crossValues) => {
.filter((x) => x !== "")
.every((x) => d.crossValue.includes(x))
)
return textVisability.zero;
return textVisibility.zero;
switch (d.depth) {
case treemapLevel + 1:
return textVisability.high;
return textVisibility.high;
case treemapLevel + 2:
return textVisability.low;
return textVisibility.low;
default:
return textVisability.zero;
return textVisibility.zero;
}
};

const textVisability = {high: "top", low: "mid", zero: "lower"};
const textVisibility = {
high: "font-size:14px;z-index:5;pointer-events: none;",
low: "font-size:8px;opacity:0.7;z-index:4;",
zero: "font-size:0px;opacity:0;z-index:4;",
};
11 changes: 8 additions & 3 deletions packages/perspective-viewer-d3fc/src/js/series/treemap/treemapSeries.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,17 @@ export function treemapSeries() {
.style("width", (d) => calcWidth(d))
.style("height", (d) => calcHeight(d));

color &&
rects.style("fill", (d) => {
rects.style("fill", (d) => {
if (nodeLevelHelper(maxDepth, d) === nodeLevel.leaf) {
if (d.data.color) {
return color(d.data.color);
} else {
return root_settings.colorStyles.series;
}
});
} else {
return "transparent";
}
});

const labels = nodesMerge
.filter((d) => d.value !== 0)
Expand Down