github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-03 10:11:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

filter loopback adjacents on radial layout

Browse Source 
needed to adjust size of nodes, too
This commit is contained in:
David Kaltschmidt
2015-09-18 17:18:32 +02:00
parent 6e3883d07e
commit 808fc55832
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
client/app/scripts/charts/nodes-chart.js
View File

@@ -19,9 +19,9 @@ const MARGINS = {
bottom: 0
};
// make sure circular layouts lots of nodes spread out
const radiusDensity = d3.scale.sqrt()
.domain([12, 2]).range([3, 4]).clamp(true);
// make sure circular layouts a bit denser with 3-6 nodes
const radiusDensity = d3.scale.threshold()
.domain([3, 6]).range([3, 4, 3]);
const NodesChart = React.createClass({
@@ -270,7 +270,10 @@ const NodesChart = React.createClass({
const adjacentLayoutNodes = [];
adjacency.forEach(function(adjacentId) {
adjacentLayoutNodes.push(layoutNodes[adjacentId]);
// filter loopback
if (adjacentId !== props.selectedNodeId) {
adjacentLayoutNodes.push(layoutNodes[adjacentId]);
}
});
// shift center node a bit
@@ -314,7 +317,7 @@ const NodesChart = React.createClass({
const offsetX = translate[0];
// normalize graph coordinates by zoomScale
const zoomScale = state.scale;
const outerRadius = radius + this.state.nodeScale(2);
const outerRadius = radius + this.state.nodeScale(1.5);
if (offsetX + (centerX + outerRadius) * zoomScale > visibleWidth) {
// shift left if blocked by details
const shift = (centerX + outerRadius) * zoomScale - visibleWidth;
@@ -386,8 +389,9 @@ const NodesChart = React.createClass({
const edges = this.initEdges(props.nodes, nodes);
const expanse = Math.min(props.height, props.width);
const nodeSize = expanse / 2;
const nodeScale = this.state.nodeScale.range([0, nodeSize / Math.pow(n, 0.7)]);
const nodeSize = expanse / 3; // single node should fill a third of the screen
const normalizedNodeSize = nodeSize / Math.sqrt(n); // assuming rectangular layout
const nodeScale = this.state.nodeScale.range([0, normalizedNodeSize]);
const timedLayouter = timely(NodesLayout.doLayout);
const graph = timedLayouter(

4
client/app/scripts/charts/nodes-layout.js
View File

@@ -33,8 +33,8 @@ const doLayout = function(nodes, edges, width, height, scale, margins, topologyI
if (!graph.hasNode(node.id)) {
graph.setNode(node.id, {
id: node.id,
width: scale(0.75),
height: scale(0.75)
width: scale(1),
height: scale(1)
});
}
});