Skip to content

Expand functionality of emphasis trajectory to the new trajectoryColor #1

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

Open
frendyisentia wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Expand functionality of emphasis trajectory to the new trajectoryColor #1

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 src/chart/sankey/SankeySeries.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ interface SankeyEdgeStyleOption extends LineStyleOption {

interface ExtraStateOption {
emphasis?: {
focus?: DefaultEmphasisFocus | 'adjacency' | 'trajectory'
focus?: DefaultEmphasisFocus | 'adjacency' | 'trajectory' | 'trajectoryColor'
}
}

Expand Down
3 changes: 3 additions & 0 deletions src/chart/sankey/SankeyView.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,7 @@ class SankeyView extends ChartView {
curve,
focus === 'adjacency' ? edge.getAdjacentDataIndices()
: focus === 'trajectory' ? edge.getTrajectoryDataIndices()
: focus === 'trajectoryColor' ? edge.getTrajectoryColorDataIndices()
: focus,
emphasisModel.get('blurScope'),
emphasisModel.get('disabled')
Expand Down Expand Up @@ -300,6 +301,8 @@ class SankeyView extends ChartView {
? node.getAdjacentDataIndices()
: focus === 'trajectory'
? node.getTrajectoryDataIndices()
: focus === 'trajectoryColor'
? node.getTrajectoryColorDataIndices()
: focus,
emphasisModel.get('blurScope'),
emphasisModel.get('disabled')
Expand Down
132 changes: 132 additions & 0 deletions src/data/Graph.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,6 +432,74 @@ class GraphNode {
node: connectedNodesMap.keys()
};
}

getTrajectoryColorDataIndices(): {node: number[], edge: number[]} {
const connectedEdgesMap = zrUtil.createHashMap<boolean, number>();
const connectedNodesMap = zrUtil.createHashMap<boolean, number>();

const data = this.hostGraph.data;
const getColor = (index: number) => {
const rawData: any = data.getRawDataItem(index);
return rawData?.itemStyle?.color;
};
const currentNodeColor = getColor(this.dataIndex);

for (let i = 0; i < this.edges.length; i++) {
const adjacentEdge = this.edges[i];
if (adjacentEdge.dataIndex < 0) {
continue;
}
const sourceNodeColor = getColor(adjacentEdge.node1.dataIndex);
const targetNodeColor = getColor(adjacentEdge.node2.dataIndex);
if (sourceNodeColor === currentNodeColor || targetNodeColor === currentNodeColor) {
connectedEdgesMap.set(adjacentEdge.dataIndex, true);
}

const sourceNodesQueue = [adjacentEdge.node1];
const targetNodesQueue = [adjacentEdge.node2];

let nodeIteratorIndex = 0;
while (nodeIteratorIndex < sourceNodesQueue.length) {
const sourceNode = sourceNodesQueue[nodeIteratorIndex];
nodeIteratorIndex++;
if (getColor(sourceNode.dataIndex) === currentNodeColor) {
connectedNodesMap.set(sourceNode.dataIndex, true);
}

for (let j = 0; j < sourceNode.inEdges.length; j++) {
const sourceNodeColor = getColor(sourceNode.inEdges[j].node1.dataIndex);
const targetNodeColor = getColor(sourceNode.inEdges[j].node2.dataIndex);
if (sourceNodeColor === currentNodeColor || targetNodeColor === currentNodeColor) {
connectedEdgesMap.set(sourceNode.inEdges[j].dataIndex, true);
}
sourceNodesQueue.push(sourceNode.inEdges[j].node1);
}
}

nodeIteratorIndex = 0;
while (nodeIteratorIndex < targetNodesQueue.length) {
const targetNode = targetNodesQueue[nodeIteratorIndex];
nodeIteratorIndex++;
if (getColor(targetNode.dataIndex) === currentNodeColor) {
connectedNodesMap.set(targetNode.dataIndex, true);
}
for (let j = 0; j < targetNode.outEdges.length; j++) {
connectedEdgesMap.set(targetNode.outEdges[j].dataIndex, true);
const sourceNodeColor = getColor(targetNode.outEdges[j].node1.dataIndex);
const targetNodeColor = getColor(targetNode.outEdges[j].node2.dataIndex);
if (sourceNodeColor === currentNodeColor || targetNodeColor === currentNodeColor) {
connectedEdgesMap.set(targetNode.outEdges[j].dataIndex, true);
}
targetNodesQueue.push(targetNode.outEdges[j].node2);
}
}
}

return {
edge: connectedEdgesMap.keys(),
node: connectedNodesMap.keys()
};
}
}


Expand Down Expand Up @@ -515,6 +583,70 @@ class GraphEdge {
node: connectedNodesMap.keys()
};
}

getTrajectoryColorDataIndices(): {node: number[], edge: number[]} {
const connectedEdgesMap = zrUtil.createHashMap<boolean, number>();
const connectedNodesMap = zrUtil.createHashMap<boolean, number>();
const data = this.hostGraph.data;
const getColor = (index: number) => {
const rawData: any = data.getRawDataItem(index);
return rawData?.itemStyle?.color;
};
const currentLinkColor = getColor(this.node1.dataIndex);

const sourceNodeColor = getColor(this.node1.dataIndex);
const targetNodeColor = getColor(this.node2.dataIndex);
if (sourceNodeColor === currentLinkColor || targetNodeColor === currentLinkColor) {
connectedEdgesMap.set(this.dataIndex, true);
}

const sourceNodes = [this.node1];
const targetNodes = [this.node2];

let nodeIteratorIndex = 0;
while (nodeIteratorIndex < sourceNodes.length) {
const sourceNode = sourceNodes[nodeIteratorIndex];
nodeIteratorIndex++;

if (getColor(sourceNode.dataIndex) === currentLinkColor) {
connectedNodesMap.set(sourceNode.dataIndex, true);
}

for (let j = 0; j < sourceNode.inEdges.length; j++) {
const sourceNodeColor = getColor(sourceNode.inEdges[j].node1.dataIndex);
const targetNodeColor = getColor(sourceNode.inEdges[j].node2.dataIndex);
if (sourceNodeColor === currentLinkColor || targetNodeColor === currentLinkColor) {
connectedEdgesMap.set(sourceNode.inEdges[j].dataIndex, true);
}
sourceNodes.push(sourceNode.inEdges[j].node1);
}
}

nodeIteratorIndex = 0;
while (nodeIteratorIndex < targetNodes.length) {
const targetNode = targetNodes[nodeIteratorIndex];
nodeIteratorIndex++;

if (getColor(targetNode.dataIndex) === currentLinkColor) {
connectedNodesMap.set(targetNode.dataIndex, true);
}

for (let j = 0; j < targetNode.outEdges.length; j++) {
connectedEdgesMap.set(targetNode.outEdges[j].dataIndex, true);
const sourceNodeColor = getColor(targetNode.outEdges[j].node1.dataIndex);
const targetNodeColor = getColor(targetNode.outEdges[j].node2.dataIndex);
if (sourceNodeColor === currentLinkColor || targetNodeColor === currentLinkColor) {
connectedEdgesMap.set(targetNode.outEdges[j].dataIndex, true);
}
targetNodes.push(targetNode.outEdges[j].node2);
}
}

return {
edge: connectedEdgesMap.keys(),
node: connectedNodesMap.keys()
};
}
}

type GetDataName<Host> = Host extends GraphEdge ? 'edgeData' : 'data';
Expand Down
132 changes: 132 additions & 0 deletions test/sankey.html
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.