Browse Source

asynchrome stabilization

flowchartTest
Alex de Mulder 9 years ago
parent
commit
fd9323632f
8 changed files with 117 additions and 154 deletions
  1. +43
    -62
      dist/vis.js
  2. +1
    -1
      dist/vis.map
  3. +15
    -15
      dist/vis.min.js
  4. +16
    -15
      examples/network/39_newClustering.html
  5. +36
    -43
      lib/network/Network.js
  6. +4
    -12
      lib/network/mixins/ClusterMixin.js
  7. +1
    -4
      lib/network/mixins/HierarchicalLayoutMixin.js
  8. +1
    -2
      lib/network/mixins/MixinLoader.js

+ 43
- 62
dist/vis.js View File

@ -5,7 +5,7 @@
* A dynamic, browser-based visualization library. * A dynamic, browser-based visualization library.
* *
* @version 3.10.1-SNAPSHOT * @version 3.10.1-SNAPSHOT
* @date 2015-02-20
* @date 2015-02-23
* *
* @license * @license
* Copyright (C) 2011-2014 Almende B.V, http://almende.com * Copyright (C) 2011-2014 Almende B.V, http://almende.com
@ -22874,7 +22874,6 @@ return /******/ (function(modules) { // webpackBootstrap
this.renderRefreshRate = 60; // hz (fps) this.renderRefreshRate = 60; // hz (fps)
this.renderTimestep = 1000 / this.renderRefreshRate; // ms -- saves calculation later on this.renderTimestep = 1000 / this.renderRefreshRate; // ms -- saves calculation later on
this.renderTime = 0; // measured time it takes to render a frame this.renderTime = 0; // measured time it takes to render a frame
this.physicsTime = 0; // measured time it takes to render a frame
this.runDoubleSpeed = false; this.runDoubleSpeed = false;
this.physicsDiscreteStepsize = 0.50; // discrete stepsize of the simulation this.physicsDiscreteStepsize = 0.50; // discrete stepsize of the simulation
@ -22996,32 +22995,6 @@ return /******/ (function(modules) { // webpackBootstrap
}, },
clustering: { // Per Node in Cluster = PNiC clustering: { // Per Node in Cluster = PNiC
enabled: false // (Boolean) | global on/off switch for clustering. enabled: false // (Boolean) | global on/off switch for clustering.
//
//initialMaxNodes: 100, // (# nodes) | if the initial amount of nodes is larger than this, we cluster until the total number is less than this threshold.
//clusterThreshold:500, // (# nodes) | during calculate forces, we check if the total number of nodes is larger than this. If it is, cluster until reduced to reduceToNodes
//reduceToNodes:300, // (# nodes) | during calculate forces, we check if the total number of nodes is larger than clusterThreshold. If it is, cluster until reduced to this
//chainThreshold: 0.4, // (% of all drawn nodes)| maximum percentage of allowed chainnodes (long strings of connected nodes) within all nodes. (lower means less chains).
//clusterEdgeThreshold: 20, // (px) | edge length threshold. if smaller, this node is clustered.
//sectorThreshold: 100, // (# nodes in cluster) | cluster size threshold. If larger, expanding in own sector.
//screenSizeThreshold: 0.2, // (% of canvas) | relative size threshold. If the width or height of a clusternode takes up this much of the screen, decluster node.
//fontSizeMultiplier: 4.0, // (px PNiC) | how much the cluster font size grows per node in cluster (in px).
//maxFontSize: 1000,
//forceAmplification: 0.1, // (multiplier PNiC) | factor of increase fo the repulsion force of a cluster (per node in cluster).
//distanceAmplification: 0.1, // (multiplier PNiC) | factor how much the repulsion distance of a cluster increases (per node in cluster).
//edgeGrowth: 20, // (px PNiC) | amount of clusterSize connected to the edge is multiplied with this and added to edgeLength.
//nodeScaling: {width: 1, // (px PNiC) | growth of the width per node in cluster.
// height: 1, // (px PNiC) | growth of the height per node in cluster.
// radius: 1}, // (px PNiC) | growth of the radius per node in cluster.
//maxNodeSizeIncrements: 600, // (# increments) | max growth of the width per node in cluster.
//activeAreaBoxSize: 80, // (px) | box area around the curser where clusters are popped open.
//clusterLevelDifference: 2, // used for normalization of the cluster levels
//clusterByZoom: true // enable clustering through zooming in and out
}, },
navigation: { navigation: {
enabled: false enabled: false
@ -23053,6 +23026,7 @@ return /******/ (function(modules) { // webpackBootstrap
minVelocity: 0.1, // px/s minVelocity: 0.1, // px/s
stabilize: true, // stabilize before displaying the network stabilize: true, // stabilize before displaying the network
stabilizationIterations: 1000, // maximum number of iteration to stabilize stabilizationIterations: 1000, // maximum number of iteration to stabilize
stabilizationStepsize: 100,
zoomExtentOnStabilize: true, zoomExtentOnStabilize: true,
locale: 'en', locale: 'en',
locales: locales, locales: locales,
@ -23151,9 +23125,7 @@ return /******/ (function(modules) { // webpackBootstrap
this.canvasTopLeft = {"x": 0,"y": 0}; // coordinates of the top left of the canvas. they will be set during _redraw. this.canvasTopLeft = {"x": 0,"y": 0}; // coordinates of the top left of the canvas. they will be set during _redraw.
this.canvasBottomRight = {"x": 0,"y": 0}; // coordinates of the bottom right of the canvas. they will be set during _redraw this.canvasBottomRight = {"x": 0,"y": 0}; // coordinates of the bottom right of the canvas. they will be set during _redraw
this.pointerPosition = {"x": 0,"y": 0}; // coordinates of the bottom right of the canvas. they will be set during _redraw this.pointerPosition = {"x": 0,"y": 0}; // coordinates of the bottom right of the canvas. they will be set during _redraw
this.areaCenter = {}; // object with x and y elements used for determining the center of the zoom action
this.scale = 1; // defining the global scale variable in the constructor this.scale = 1; // defining the global scale variable in the constructor
this.previousScale = this.scale; // this is used to check if the zoom operation is zooming in or out
// datasets or dataviews // datasets or dataviews
this.nodesData = null; // A DataSet or DataView this.nodesData = null; // A DataSet or DataView
@ -23194,10 +23166,9 @@ return /******/ (function(modules) { // webpackBootstrap
this.timer = undefined; // Scheduling function. Is definded in this.start(); this.timer = undefined; // Scheduling function. Is definded in this.start();
// load data (the disable start variable will be the same as the enabled clustering) // load data (the disable start variable will be the same as the enabled clustering)
this.setData(data,this.constants.clustering.enabled || this.constants.hierarchicalLayout.enabled);
this.setData(data, this.constants.hierarchicalLayout.enabled);
// hierarchical layout // hierarchical layout
this.initializing = false;
if (this.constants.hierarchicalLayout.enabled == true) { if (this.constants.hierarchicalLayout.enabled == true) {
this._setupHierarchicalLayout(); this._setupHierarchicalLayout();
} }
@ -23208,10 +23179,11 @@ return /******/ (function(modules) { // webpackBootstrap
} }
} }
// if clustering is disabled, the simulation will have started in the setData function
if (this.constants.clustering.enabled) {
this.startWithClustering();
if (this.constants.stabilize == false) {
this.initializing = false;
} }
this.on("stabilizationIterationsDone", function () {this.initializing = false; this.start();}.bind(this));
} }
// Extend Network with an Emitter mixin // Extend Network with an Emitter mixin
@ -23481,6 +23453,7 @@ return /******/ (function(modules) { // webpackBootstrap
this._setEdges(data && data.edges); this._setEdges(data && data.edges);
} }
this._putDataInSector(); this._putDataInSector();
if (disableStart == false) { if (disableStart == false) {
if (this.constants.hierarchicalLayout.enabled == true) { if (this.constants.hierarchicalLayout.enabled == true) {
this._resetLevels(); this._resetLevels();
@ -23491,10 +23464,15 @@ return /******/ (function(modules) { // webpackBootstrap
if (this.constants.stabilize == true) { if (this.constants.stabilize == true) {
this._stabilize(); this._stabilize();
} }
else {
this.moving = true;
this.start();
}
} }
this.start();
} }
this.initializing = false;
else {
this.initializing = false;
}
}; };
/** /**
@ -23623,7 +23601,6 @@ return /******/ (function(modules) { // webpackBootstrap
throw new Error('Option "labels" is deprecated. Use options "locale" and "locales" instead.'); throw new Error('Option "labels" is deprecated. Use options "locale" and "locales" instead.');
} }
// (Re)loading the mixins that can be enabled or disabled in the options. // (Re)loading the mixins that can be enabled or disabled in the options.
// load the force calculation functions, grouped under the physics system. // load the force calculation functions, grouped under the physics system.
this._loadPhysicsSystem(); this._loadPhysicsSystem();
@ -23642,12 +23619,15 @@ return /******/ (function(modules) { // webpackBootstrap
this._markAllEdgesAsDirty(); this._markAllEdgesAsDirty();
this.setSize(this.constants.width, this.constants.height); this.setSize(this.constants.width, this.constants.height);
this.moving = true;
if (this.constants.hierarchicalLayout.enabled == true && this.initializing == false) { if (this.constants.hierarchicalLayout.enabled == true && this.initializing == false) {
this._resetLevels(); this._resetLevels();
this._setupHierarchicalLayout(); this._setupHierarchicalLayout();
} }
this.start();
if (this.initializing !== true) {
this.moving = true;
this.start();
}
} }
}; };
@ -23672,7 +23652,6 @@ return /******/ (function(modules) { // webpackBootstrap
this.frame.style.overflow = 'hidden'; this.frame.style.overflow = 'hidden';
this.frame.tabIndex = 900; this.frame.tabIndex = 900;
////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////
this.frame.canvas = document.createElement("canvas"); this.frame.canvas = document.createElement("canvas");
@ -25076,15 +25055,29 @@ return /******/ (function(modules) { // webpackBootstrap
if (this.constants.freezeForStabilization == true) { if (this.constants.freezeForStabilization == true) {
this._freezeDefinedNodes(); this._freezeDefinedNodes();
} }
this.stabilizationSteps = 0;
// find stable position
setTimeout(this._stabilizationBatch.bind(this),0);
};
Network.prototype._stabilizationBatch = function() {
var count = 0; var count = 0;
while (this.moving && count < this.constants.stabilizationIterations) {
while (this.moving && count < this.constants.stabilizationStepsize && this.stabilizationSteps < this.constants.stabilizationIterations) {
this._physicsTick(); this._physicsTick();
this.stabilizationSteps++;
count++; count++;
} }
if (this.moving && this.stabilizationSteps < this.constants.stabilizationIterations) {
this.emit("stabilizationProgress", {steps: this.stabilizationSteps, total: this.constants.stabilizationIterations});
setTimeout(this._stabilizationBatch.bind(this),0);
}
else {
this._finalizeStabilization();
}
}
Network.prototype._finalizeStabilization = function() {
if (this.constants.zoomExtentOnStabilize == true) { if (this.constants.zoomExtentOnStabilize == true) {
this.zoomExtent({duration:0}, false, true); this.zoomExtent({duration:0}, false, true);
} }
@ -25094,7 +25087,7 @@ return /******/ (function(modules) { // webpackBootstrap
} }
this.emit("stabilizationIterationsDone"); this.emit("stabilizationIterationsDone");
};
}
/** /**
* When initializing and stabilizing, we can freeze nodes with a predefined position. This greatly speeds up stabilization * When initializing and stabilizing, we can freeze nodes with a predefined position. This greatly speeds up stabilization
@ -29621,8 +29614,7 @@ return /******/ (function(modules) { // webpackBootstrap
* @private * @private
*/ */
exports._loadClusterSystem = function () { exports._loadClusterSystem = function () {
this.clusterSession = 0;
this.hubThreshold = 5;
this.clusteredNodes = {};
this._loadMixin(ClusterMixin); this._loadMixin(ClusterMixin);
}; };
@ -31121,13 +31113,6 @@ return /******/ (function(modules) { // webpackBootstrap
var Edge = __webpack_require__(57); var Edge = __webpack_require__(57);
var util = __webpack_require__(1); var util = __webpack_require__(1);
exports.startWithClustering = function() {
this.clusteredNodes = {};
this.moving = true;
this.start();
}
/** /**
* *
* @param hubsize * @param hubsize
@ -31221,8 +31206,6 @@ return /******/ (function(modules) { // webpackBootstrap
} }
this._wrapUp(); this._wrapUp();
} }
/** /**
@ -31284,7 +31267,6 @@ return /******/ (function(modules) { // webpackBootstrap
clonedOptions.amountOfConnections = this.nodes[objId].edges.length; clonedOptions.amountOfConnections = this.nodes[objId].edges.length;
} }
else { else {
util.deepExtend(clonedOptions, this.edges[objId].options, true);
util.deepExtend(clonedOptions, this.edges[objId].properties, true); util.deepExtend(clonedOptions, this.edges[objId].properties, true);
} }
return clonedOptions; return clonedOptions;
@ -31592,8 +31574,10 @@ return /******/ (function(modules) { // webpackBootstrap
this._updateNodeIndexList(); this._updateNodeIndexList();
this._updateCalculationNodes(); this._updateCalculationNodes();
this._markAllEdgesAsDirty(); this._markAllEdgesAsDirty();
this.moving = true;
this.start();
if (this.initializing !== true) {
this.moving = true;
this.start();
}
} }
exports._connectEdge = function(edge, nodeId, from) { exports._connectEdge = function(edge, nodeId, from) {
@ -33901,11 +33885,8 @@ return /******/ (function(modules) { // webpackBootstrap
// check the distribution of the nodes per level. // check the distribution of the nodes per level.
var distribution = this._getDistribution(); var distribution = this._getDistribution();
// place the nodes on the canvas. This also stablilizes the system.
// place the nodes on the canvas. This also stablilizes the system. Redraw in started automatically after stabilize.
this._placeNodesByHierarchy(distribution); this._placeNodesByHierarchy(distribution);
// start the simulation.
this.start();
} }
} }
}; };

+ 1
- 1
dist/vis.map
File diff suppressed because it is too large
View File


+ 15
- 15
dist/vis.min.js
File diff suppressed because it is too large
View File


+ 16
- 15
examples/network/39_newClustering.html View File

@ -27,11 +27,11 @@
{id: 3, label: 'Node 3'}, {id: 3, label: 'Node 3'},
{id: 4, label: 'Node 4'}, {id: 4, label: 'Node 4'},
{id: 5, label: 'Node 5'}, {id: 5, label: 'Node 5'},
{id: 6, label: 'Node 6', cid:1},
{id: 7, label: 'Node 7', cid:1},
{id: 8, label: 'Node 8', cid:1},
{id: 9, label: 'Node 9', cid:1},
{id: 10, label: 'Node 10', cid:1}
{id: 6, label: 'Node 6', cid:1},
{id: 7, label: 'Node 7', cid:1},
{id: 8, label: 'Node 8', cid:1},
{id: 9, label: 'Node 9', cid:1},
{id: 10, label: 'Node 10', cid:1}
]; ];
// create an array with edges // create an array with edges
@ -40,11 +40,11 @@
{from: 1, to: 3}, {from: 1, to: 3},
{from: 10, to: 4}, {from: 10, to: 4},
{from: 2, to: 5}, {from: 2, to: 5},
{from: 6, to: 2},
{from: 7, to: 5},
{from: 8, to: 6},
{from: 9, to: 7},
{from: 10, to: 9}
{from: 6, to: 2},
{from: 7, to: 5},
{from: 8, to: 6},
{from: 9, to: 7},
{from: 10, to: 9}
]; ];
// create a network // create a network
@ -53,7 +53,7 @@
nodes: nodes, nodes: nodes,
edges: edges edges: edges
}; };
var options = {clustering:true};
var options = {};
var network = new vis.Network(container, data, options); var network = new vis.Network(container, data, options);
var clusterOptions = { var clusterOptions = {
@ -63,7 +63,7 @@
processClusterProperties: function (properties, childNodes, childEdges) { processClusterProperties: function (properties, childNodes, childEdges) {
return properties; return properties;
}, },
clusterNodeProperties: {id:'bla', borderWidth:8},
// clusterNodeProperties: {id:'bla', borderWidth:8},
} }
var clusterOptionsByData = { var clusterOptionsByData = {
@ -73,12 +73,13 @@
processClusterProperties: function (properties, childNodes, childEdges) { processClusterProperties: function (properties, childNodes, childEdges) {
return properties; return properties;
}, },
clusterNodeProperties: {id:'bla', borderWidth:8},
// clusterNodeProperties: {id:'bla', borderWidth:8}
} }
// network.clusterByNodeData(clusterOptionsByData) // network.clusterByNodeData(clusterOptionsByData)
network.clusterOutliers({clusterNodeProperties: {borderWidth:8}})
// network.clusterByConnection(2, clusterOptions);
// network.clusterOutliers({clusterNodeProperties: {borderWidth:8}})
network.clusterByConnection(2, clusterOptions);
// network.clusterByConnection(9, { // network.clusterByConnection(9, {
// joinCondition:function(parentOptions,childOptions) {return true;}, // joinCondition:function(parentOptions,childOptions) {return true;},
// processProperties:function (properties, childNodes, childEdges) { // processProperties:function (properties, childNodes, childEdges) {

+ 36
- 43
lib/network/Network.js View File

@ -45,7 +45,6 @@ function Network (container, data, options) {
this.renderRefreshRate = 60; // hz (fps) this.renderRefreshRate = 60; // hz (fps)
this.renderTimestep = 1000 / this.renderRefreshRate; // ms -- saves calculation later on this.renderTimestep = 1000 / this.renderRefreshRate; // ms -- saves calculation later on
this.renderTime = 0; // measured time it takes to render a frame this.renderTime = 0; // measured time it takes to render a frame
this.physicsTime = 0; // measured time it takes to render a frame
this.runDoubleSpeed = false; this.runDoubleSpeed = false;
this.physicsDiscreteStepsize = 0.50; // discrete stepsize of the simulation this.physicsDiscreteStepsize = 0.50; // discrete stepsize of the simulation
@ -167,32 +166,6 @@ function Network (container, data, options) {
}, },
clustering: { // Per Node in Cluster = PNiC clustering: { // Per Node in Cluster = PNiC
enabled: false // (Boolean) | global on/off switch for clustering. enabled: false // (Boolean) | global on/off switch for clustering.
//
//initialMaxNodes: 100, // (# nodes) | if the initial amount of nodes is larger than this, we cluster until the total number is less than this threshold.
//clusterThreshold:500, // (# nodes) | during calculate forces, we check if the total number of nodes is larger than this. If it is, cluster until reduced to reduceToNodes
//reduceToNodes:300, // (# nodes) | during calculate forces, we check if the total number of nodes is larger than clusterThreshold. If it is, cluster until reduced to this
//chainThreshold: 0.4, // (% of all drawn nodes)| maximum percentage of allowed chainnodes (long strings of connected nodes) within all nodes. (lower means less chains).
//clusterEdgeThreshold: 20, // (px) | edge length threshold. if smaller, this node is clustered.
//sectorThreshold: 100, // (# nodes in cluster) | cluster size threshold. If larger, expanding in own sector.
//screenSizeThreshold: 0.2, // (% of canvas) | relative size threshold. If the width or height of a clusternode takes up this much of the screen, decluster node.
//fontSizeMultiplier: 4.0, // (px PNiC) | how much the cluster font size grows per node in cluster (in px).
//maxFontSize: 1000,
//forceAmplification: 0.1, // (multiplier PNiC) | factor of increase fo the repulsion force of a cluster (per node in cluster).
//distanceAmplification: 0.1, // (multiplier PNiC) | factor how much the repulsion distance of a cluster increases (per node in cluster).
//edgeGrowth: 20, // (px PNiC) | amount of clusterSize connected to the edge is multiplied with this and added to edgeLength.
//nodeScaling: {width: 1, // (px PNiC) | growth of the width per node in cluster.
// height: 1, // (px PNiC) | growth of the height per node in cluster.
// radius: 1}, // (px PNiC) | growth of the radius per node in cluster.
//maxNodeSizeIncrements: 600, // (# increments) | max growth of the width per node in cluster.
//activeAreaBoxSize: 80, // (px) | box area around the curser where clusters are popped open.
//clusterLevelDifference: 2, // used for normalization of the cluster levels
//clusterByZoom: true // enable clustering through zooming in and out
}, },
navigation: { navigation: {
enabled: false enabled: false
@ -224,6 +197,7 @@ function Network (container, data, options) {
minVelocity: 0.1, // px/s minVelocity: 0.1, // px/s
stabilize: true, // stabilize before displaying the network stabilize: true, // stabilize before displaying the network
stabilizationIterations: 1000, // maximum number of iteration to stabilize stabilizationIterations: 1000, // maximum number of iteration to stabilize
stabilizationStepsize: 100,
zoomExtentOnStabilize: true, zoomExtentOnStabilize: true,
locale: 'en', locale: 'en',
locales: locales, locales: locales,
@ -322,9 +296,7 @@ function Network (container, data, options) {
this.canvasTopLeft = {"x": 0,"y": 0}; // coordinates of the top left of the canvas. they will be set during _redraw. this.canvasTopLeft = {"x": 0,"y": 0}; // coordinates of the top left of the canvas. they will be set during _redraw.
this.canvasBottomRight = {"x": 0,"y": 0}; // coordinates of the bottom right of the canvas. they will be set during _redraw this.canvasBottomRight = {"x": 0,"y": 0}; // coordinates of the bottom right of the canvas. they will be set during _redraw
this.pointerPosition = {"x": 0,"y": 0}; // coordinates of the bottom right of the canvas. they will be set during _redraw this.pointerPosition = {"x": 0,"y": 0}; // coordinates of the bottom right of the canvas. they will be set during _redraw
this.areaCenter = {}; // object with x and y elements used for determining the center of the zoom action
this.scale = 1; // defining the global scale variable in the constructor this.scale = 1; // defining the global scale variable in the constructor
this.previousScale = this.scale; // this is used to check if the zoom operation is zooming in or out
// datasets or dataviews // datasets or dataviews
this.nodesData = null; // A DataSet or DataView this.nodesData = null; // A DataSet or DataView
@ -365,10 +337,9 @@ function Network (container, data, options) {
this.timer = undefined; // Scheduling function. Is definded in this.start(); this.timer = undefined; // Scheduling function. Is definded in this.start();
// load data (the disable start variable will be the same as the enabled clustering) // load data (the disable start variable will be the same as the enabled clustering)
this.setData(data,this.constants.clustering.enabled || this.constants.hierarchicalLayout.enabled);
this.setData(data, this.constants.hierarchicalLayout.enabled);
// hierarchical layout // hierarchical layout
this.initializing = false;
if (this.constants.hierarchicalLayout.enabled == true) { if (this.constants.hierarchicalLayout.enabled == true) {
this._setupHierarchicalLayout(); this._setupHierarchicalLayout();
} }
@ -379,10 +350,11 @@ function Network (container, data, options) {
} }
} }
// if clustering is disabled, the simulation will have started in the setData function
if (this.constants.clustering.enabled) {
this.startWithClustering();
if (this.constants.stabilize == false) {
this.initializing = false;
} }
this.on("stabilizationIterationsDone", function () {this.initializing = false; this.start();}.bind(this));
} }
// Extend Network with an Emitter mixin // Extend Network with an Emitter mixin
@ -652,6 +624,7 @@ Network.prototype.setData = function(data, disableStart) {
this._setEdges(data && data.edges); this._setEdges(data && data.edges);
} }
this._putDataInSector(); this._putDataInSector();
if (disableStart == false) { if (disableStart == false) {
if (this.constants.hierarchicalLayout.enabled == true) { if (this.constants.hierarchicalLayout.enabled == true) {
this._resetLevels(); this._resetLevels();
@ -662,10 +635,15 @@ Network.prototype.setData = function(data, disableStart) {
if (this.constants.stabilize == true) { if (this.constants.stabilize == true) {
this._stabilize(); this._stabilize();
} }
else {
this.moving = true;
this.start();
}
} }
this.start();
} }
this.initializing = false;
else {
this.initializing = false;
}
}; };
/** /**
@ -794,7 +772,6 @@ Network.prototype.setOptions = function (options) {
throw new Error('Option "labels" is deprecated. Use options "locale" and "locales" instead.'); throw new Error('Option "labels" is deprecated. Use options "locale" and "locales" instead.');
} }
// (Re)loading the mixins that can be enabled or disabled in the options. // (Re)loading the mixins that can be enabled or disabled in the options.
// load the force calculation functions, grouped under the physics system. // load the force calculation functions, grouped under the physics system.
this._loadPhysicsSystem(); this._loadPhysicsSystem();
@ -813,12 +790,15 @@ Network.prototype.setOptions = function (options) {
this._markAllEdgesAsDirty(); this._markAllEdgesAsDirty();
this.setSize(this.constants.width, this.constants.height); this.setSize(this.constants.width, this.constants.height);
this.moving = true;
if (this.constants.hierarchicalLayout.enabled == true && this.initializing == false) { if (this.constants.hierarchicalLayout.enabled == true && this.initializing == false) {
this._resetLevels(); this._resetLevels();
this._setupHierarchicalLayout(); this._setupHierarchicalLayout();
} }
this.start();
if (this.initializing !== true) {
this.moving = true;
this.start();
}
} }
}; };
@ -843,7 +823,6 @@ Network.prototype._create = function () {
this.frame.style.overflow = 'hidden'; this.frame.style.overflow = 'hidden';
this.frame.tabIndex = 900; this.frame.tabIndex = 900;
////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////
this.frame.canvas = document.createElement("canvas"); this.frame.canvas = document.createElement("canvas");
@ -2247,15 +2226,29 @@ Network.prototype._stabilize = function() {
if (this.constants.freezeForStabilization == true) { if (this.constants.freezeForStabilization == true) {
this._freezeDefinedNodes(); this._freezeDefinedNodes();
} }
this.stabilizationSteps = 0;
setTimeout(this._stabilizationBatch.bind(this),0);
};
// find stable position
Network.prototype._stabilizationBatch = function() {
var count = 0; var count = 0;
while (this.moving && count < this.constants.stabilizationIterations) {
while (this.moving && count < this.constants.stabilizationStepsize && this.stabilizationSteps < this.constants.stabilizationIterations) {
this._physicsTick(); this._physicsTick();
this.stabilizationSteps++;
count++; count++;
} }
if (this.moving && this.stabilizationSteps < this.constants.stabilizationIterations) {
this.emit("stabilizationProgress", {steps: this.stabilizationSteps, total: this.constants.stabilizationIterations});
setTimeout(this._stabilizationBatch.bind(this),0);
}
else {
this._finalizeStabilization();
}
}
Network.prototype._finalizeStabilization = function() {
if (this.constants.zoomExtentOnStabilize == true) { if (this.constants.zoomExtentOnStabilize == true) {
this.zoomExtent({duration:0}, false, true); this.zoomExtent({duration:0}, false, true);
} }
@ -2265,7 +2258,7 @@ Network.prototype._stabilize = function() {
} }
this.emit("stabilizationIterationsDone"); this.emit("stabilizationIterationsDone");
};
}
/** /**
* When initializing and stabilizing, we can freeze nodes with a predefined position. This greatly speeds up stabilization * When initializing and stabilizing, we can freeze nodes with a predefined position. This greatly speeds up stabilization

+ 4
- 12
lib/network/mixins/ClusterMixin.js View File

@ -2,13 +2,6 @@ var Node = require('../Node');
var Edge = require('../Edge'); var Edge = require('../Edge');
var util = require('../../util'); var util = require('../../util');
exports.startWithClustering = function() {
this.clusteredNodes = {};
this.moving = true;
this.start();
}
/** /**
* *
* @param hubsize * @param hubsize
@ -102,8 +95,6 @@ exports.clusterOutliers = function(options, doNotUpdateCalculationNodes) {
} }
this._wrapUp(); this._wrapUp();
} }
/** /**
@ -165,7 +156,6 @@ exports._cloneOptions = function(objId, type) {
clonedOptions.amountOfConnections = this.nodes[objId].edges.length; clonedOptions.amountOfConnections = this.nodes[objId].edges.length;
} }
else { else {
util.deepExtend(clonedOptions, this.edges[objId].options, true);
util.deepExtend(clonedOptions, this.edges[objId].properties, true); util.deepExtend(clonedOptions, this.edges[objId].properties, true);
} }
return clonedOptions; return clonedOptions;
@ -473,8 +463,10 @@ exports._wrapUp = function() {
this._updateNodeIndexList(); this._updateNodeIndexList();
this._updateCalculationNodes(); this._updateCalculationNodes();
this._markAllEdgesAsDirty(); this._markAllEdgesAsDirty();
this.moving = true;
this.start();
if (this.initializing !== true) {
this.moving = true;
this.start();
}
} }
exports._connectEdge = function(edge, nodeId, from) { exports._connectEdge = function(edge, nodeId, from) {

+ 1
- 4
lib/network/mixins/HierarchicalLayoutMixin.js View File

@ -64,11 +64,8 @@ exports._setupHierarchicalLayout = function() {
// check the distribution of the nodes per level. // check the distribution of the nodes per level.
var distribution = this._getDistribution(); var distribution = this._getDistribution();
// place the nodes on the canvas. This also stablilizes the system.
// place the nodes on the canvas. This also stablilizes the system. Redraw in started automatically after stabilize.
this._placeNodesByHierarchy(distribution); this._placeNodesByHierarchy(distribution);
// start the simulation.
this.start();
} }
} }
}; };

+ 1
- 2
lib/network/mixins/MixinLoader.js View File

@ -59,8 +59,7 @@ exports._loadPhysicsSystem = function () {
* @private * @private
*/ */
exports._loadClusterSystem = function () { exports._loadClusterSystem = function () {
this.clusterSession = 0;
this.hubThreshold = 5;
this.clusteredNodes = {};
this._loadMixin(ClusterMixin); this._loadMixin(ClusterMixin);
}; };

Loading…
Cancel
Save