From d180437411905c79f21df89931998a8a7e4b609b Mon Sep 17 00:00:00 2001 From: Filip Barl Date: Mon, 7 Aug 2017 16:41:46 +0100 Subject: [PATCH] Decreased the graph complexity treshold. --- client/app/scripts/charts/nodes-chart-elements.js | 7 +------ client/app/scripts/components/node-details.js | 1 - client/app/scripts/selectors/topology.js | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/client/app/scripts/charts/nodes-chart-elements.js b/client/app/scripts/charts/nodes-chart-elements.js index 551b83557..65d0b186b 100644 --- a/client/app/scripts/charts/nodes-chart-elements.js +++ b/client/app/scripts/charts/nodes-chart-elements.js @@ -222,11 +222,6 @@ class NodesChartElements extends React.Component { .map(this.edgeScaleDecorator) .groupBy(this.edgeDisplayLayer); - // const orderedElements = makeList([ - // edges, - // nodes, - // ]).flatten(true); - // NOTE: The elements need to be arranged into a single array outside // of DOM structure for React rendering engine to do smart rearrangements // without unnecessary re-rendering of the elements themselves. So e.g. @@ -257,7 +252,7 @@ function mapStateToProps(state) { hasSelectedNode: hasSelectedNodeFn(state), layoutNodes: layoutNodesSelector(state), layoutEdges: layoutEdgesSelector(state), - isAnimated: false && !graphExceedsComplexityThreshSelector(state), + isAnimated: !graphExceedsComplexityThreshSelector(state), highlightedNodeIds: highlightedNodeIdsSelector(state), highlightedEdgeIds: highlightedEdgeIdsSelector(state), selectedNetworkNodesIds: selectedNetworkNodesIdsSelector(state), diff --git a/client/app/scripts/components/node-details.js b/client/app/scripts/components/node-details.js index bd0386424..6feafe0d0 100644 --- a/client/app/scripts/components/node-details.js +++ b/client/app/scripts/components/node-details.js @@ -151,7 +151,6 @@ class NodeDetails extends React.Component { } renderDetails() { - console.log('render details'); const { details, nodeControlStatus, nodeMatches = makeMap() } = this.props; const showControls = details.controls && details.controls.length > 0; const nodeColor = getNodeColorDark(details.rank, details.label, details.pseudo); diff --git a/client/app/scripts/selectors/topology.js b/client/app/scripts/selectors/topology.js index 6c9465ff3..c4d06655a 100644 --- a/client/app/scripts/selectors/topology.js +++ b/client/app/scripts/selectors/topology.js @@ -46,7 +46,7 @@ export const graphExceedsComplexityThreshSelector = createSelector( state => state.getIn(['currentTopology', 'stats', 'node_count']) || 0, state => state.getIn(['currentTopology', 'stats', 'edge_count']) || 0, ], - (nodeCount, edgeCount) => (nodeCount + (2 * edgeCount)) > 1000 + (nodeCount, edgeCount) => (nodeCount + (2 * edgeCount)) > 500 ); // Options for current topology, sub-topologies share options with parent