jrtechs
/
jrtechs-vis
mirror of https://github.com/jrtechs/vis.git
1
0
Fork 0
Code Issues 0 Releases 82 Wiki Activity
Browse Source

cleaned up a little

codeClimate
Alex de Mulder 8 years ago
parent
4d8a2598f0
commit
9c2dbe5c99
2 changed files with 134 additions and 66 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +86
    -37
      dist/vis.js
  2. +48
    -29
      lib/network/modules/LayoutEngine.js

+ 86
- 37
dist/vis.js View File

@ -39650,7 +39650,7 @@ return /******/ (function(modules) { // webpackBootstrap
this._placeNodesByHierarchy(distribution);
// Todo: condense the whitespace.
this._condenseHierarchy();
this._condenseHierarchy(distribution);
// shift to center so gravity does not have to do much
this._shiftToCenter();
@ -39664,7 +39664,56 @@ return /******/ (function(modules) { // webpackBootstrap
*/
}, {
key: '_condenseHierarchy',
value: function _condenseHierarchy() {}
value: function _condenseHierarchy(distribution) {
var maxRatio = 2;
//let checkLength = (parentId, childId) => {
// let dx = this.body.nodes[parentId].x - this.body.nodes[childId].x;
// let dy = this.body.nodes[parentId].y - this.body.nodes[childId].y;
// return Math.sqrt(Math.pow(dx,2) + Math.pow(dy,2));
//}
//let checkLengths = (parentId, childIdArray) => {
// let average = 0;
// for (let i = 0; i < childIdArray.length; i++) {
// average += checkLength(parentId, childIdArray[i]);
// }
// return average / childIdArray.length;
//}
//let levels = Object.keys(distribution);
//
//for (let i = 0; i < levels.length; i++) {
// // sort nodes in level by position:
// let nodesArray = Object.keys(distribution[levels[i]]);
// nodesArray = this._indexArrayToNodes(nodesArray);
// this._sortNodeArray(nodesArray);
//
// for (let j = 0; j < nodesArray.length; j++) {
// let node = nodesArray[j];
// if (this.hierarchicalParents[node.id] === undefined) {
// let diff = 0;
// if (j == 0 && nodesArray.length > 1) {
// diff = nodesArray[j+1].x - this.nodeSpacing - node.x;
// }
// else if (j == nodesArray.length - 1 && nodesArray.length > 1) {
// diff = nodesArray[j-1].x + this.nodeSpacing - node.x;
// }
// else if (nodesArray.length > 3) {
// diff = 0.5*(nodesArray[j-1].x + nodesArray[j+1].x) - node.x
// }
//
// node.x += diff;
//
// let parentId = this.hierarchicalChildren[node.id].parents[0];
// if (this.hierarchicalChildren[node.id].parents.length == 1 && this.hierarchicalParents[parentId].children.length == 1) {
// //this.body.nodes[parentId].x += diff;
// }
// }
// }
// //return
//
//}
}
/**
* This function places the nodes on the canvas based on the hierarchial distribution.
@ -39675,28 +39724,35 @@ return /******/ (function(modules) { // webpackBootstrap
}, {
key: '_placeNodesByHierarchy',
value: function _placeNodesByHierarchy(distribution) {
var nodeId = undefined,
node = undefined;
this.positionedNodes = {};
// start placing all the level 0 nodes first. Then recursively position their branches.
for (var level in distribution) {
if (distribution.hasOwnProperty(level)) {
// sort nodes in level by position:
var nodeArray = Object.keys(distribution[level]);
nodeArray = this._indexArrayToNodes(nodeArray);
this._sortNodeArray(nodeArray);
for (var i = 0; i < nodeArray.length; i++) {
nodeId = nodeArray[i];
node = distribution[level][nodeId];
if (this.positionedNodes[nodeId] === undefined) {
var node = nodeArray[i];
if (this.positionedNodes[node.id] === undefined) {
this._setPositionForHierarchy(node, this.nodeSpacing * i);
this.positionedNodes[nodeId] = true;
this._placeBranchNodes(nodeId, level);
this.positionedNodes[node.id] = true;
this._placeBranchNodes(node.id, level);
}
}
}
}
}
}, {
key: '_indexArrayToNodes',
value: function _indexArrayToNodes(idArray) {
var array = [];
for (var i = 0; i < idArray.length; i++) {
array.push(this.body.nodes[idArray[i]]);
}
return array;
}
/**
* This function get the distribution of levels based on hubsize
@ -40068,29 +40124,20 @@ return /******/ (function(modules) { // webpackBootstrap
}
}
};
var findParent = function findParent(_x, _x2) {
var _again = true;
_function: while (_again) {
var parents = _x,
child = _x2;
_again = false;
if (_this6.hierarchicalChildren[child] !== undefined) {
for (var i = 0; i < _this6.hierarchicalChildren[child].parents.length; i++) {
var _parent2 = _this6.hierarchicalChildren[child].parents[i];
if (parents[_parent2] !== undefined) {
return { foundParent: _parent2, withChild: child };
}
_x = parents;
_x2 = _parent2;
_again = true;
i = _parent2 = undefined;
continue _function;
var findParent = function findParent(parents, child) {
if (_this6.hierarchicalChildren[child] !== undefined) {
for (var i = 0; i < _this6.hierarchicalChildren[child].parents.length; i++) {
var _parent2 = _this6.hierarchicalChildren[child].parents[i];
if (parents[_parent2] !== undefined) {
return { foundParent: _parent2, withChild: child };
}
var branch = findParent(parents, _parent2);
if (branch.foundParent !== null) {
return branch;
}
}
return { foundParent: null, withChild: child };
}
return { foundParent: null, withChild: child };
};
iterateParents(parents, childA);
@ -40137,14 +40184,16 @@ return /******/ (function(modules) { // webpackBootstrap
}, {
key: '_sortNodeArray',
value: function _sortNodeArray(nodeArray) {
if (this.options.hierarchical.direction === 'UD' || this.options.hierarchical.direction === 'DU') {
nodeArray.sort(function (a, b) {
return a.x - b.x;
});
} else {
nodeArray.sort(function (a, b) {
return a.y - b.y;
});
if (nodeArray.length > 1) {
if (this.options.hierarchical.direction === 'UD' || this.options.hierarchical.direction === 'DU') {
nodeArray.sort(function (a, b) {
return a.x - b.x;
});
} else {
nodeArray.sort(function (a, b) {
return a.y - b.y;
});
}
}
}
}]);

+ 48
- 29
lib/network/modules/LayoutEngine.js View File

@ -1,4 +1,4 @@
'use strict'
'use strict';
let util = require('../../util');
import NetworkUtil from '../NetworkUtil';
@ -335,7 +335,7 @@ class LayoutEngine {
this._placeNodesByHierarchy(distribution);
// Todo: condense the whitespace.
this._condenseHierarchy();
this._condenseHierarchy(distribution);
// shift to center so gravity does not have to do much
this._shiftToCenter();
@ -347,8 +347,7 @@ class LayoutEngine {
* TODO: implement. Clear whitespace after positioning.
* @private
*/
_condenseHierarchy() {
_condenseHierarchy(distribution) {
}
@ -359,28 +358,39 @@ class LayoutEngine {
* @private
*/
_placeNodesByHierarchy(distribution) {
let nodeId, node;
this.positionedNodes = {};
// start placing all the level 0 nodes first. Then recursively position their branches.
for (let level in distribution) {
if (distribution.hasOwnProperty(level)) {
// sort nodes in level by position:
let nodeArray = Object.keys(distribution[level]);
this._sortNodeArray(nodeArray)
nodeArray = this._indexArrayToNodes(nodeArray);
this._sortNodeArray(nodeArray);
for (let i = 0; i < nodeArray.length; i++) {
nodeId = nodeArray[i];
node = distribution[level][nodeId];
if (this.positionedNodes[nodeId] === undefined) {
this._setPositionForHierarchy(node, this.nodeSpacing * i)
this.positionedNodes[nodeId] = true;
this._placeBranchNodes(nodeId, level);
let node = nodeArray[i];
if (this.positionedNodes[node.id] === undefined) {
this._setPositionForHierarchy(node, this.nodeSpacing * i);
this.positionedNodes[node.id] = true;
this._placeBranchNodes(node.id, level);
}
}
}
}
}
/**
* Receives an array with node indices and returns an array with the actual node references. Used for sorting based on
* node properties.
* @param idArray
*/
_indexArrayToNodes(idArray) {
let array = [];
for (let i = 0; i < idArray.length; i++) {
array.push(this.body.nodes[idArray[i]])
}
return array;
}
/**
* This function get the distribution of levels based on hubsize
@ -454,7 +464,7 @@ class LayoutEngine {
// set level
this.hierarchicalLevels[nodeB.id] = this.hierarchicalLevels[nodeA.id] + 1;
}
}
};
while (hubSize > 0) {
// determine hubs
@ -483,7 +493,7 @@ class LayoutEngine {
// TODO: this should come from options.
let customCallback = function(nodeA, nodeB, edge) {
}
};
let levelByDirection = (nodeA, nodeB, edge) => {
let levelA = this.hierarchicalLevels[nodeA.id];
@ -497,7 +507,7 @@ class LayoutEngine {
);
this.hierarchicalLevels[nodeB.id] = this.hierarchicalLevels[nodeA.id] + diff;
}
};
this._crawlNetwork(levelByDirection);
this._setMinLevelToZero();
@ -521,8 +531,8 @@ class LayoutEngine {
else {
this.hierarchicalLevels[nodeB.id] = this.hierarchicalLevels[nodeA.id] - 1;
}
}
this._crawlNetwork(levelByDirection)
};
this._crawlNetwork(levelByDirection);
this._setMinLevelToZero();
}
@ -569,7 +579,7 @@ class LayoutEngine {
}
this.hierarchicalChildren[childNodeId].parents.push(parentNodeId);
}
}
};
this._crawlNetwork(fillInRelations);
}
@ -597,7 +607,7 @@ class LayoutEngine {
}
}
}
}
};
// we can crawl from a specific node or over all nodes.
@ -720,7 +730,7 @@ class LayoutEngine {
* @private
*/
_findCommonParent(childA,childB) {
let parents = {}
let parents = {};
let iterateParents = (parents,child) => {
if (this.hierarchicalChildren[child] !== undefined) {
for (let i = 0; i < this.hierarchicalChildren[child].parents.length; i++) {
@ -729,7 +739,7 @@ class LayoutEngine {
iterateParents(parents, parent)
}
}
}
};
let findParent = (parents, child) => {
if (this.hierarchicalChildren[child] !== undefined) {
for (let i = 0; i < this.hierarchicalChildren[child].parents.length; i++) {
@ -737,14 +747,17 @@ class LayoutEngine {
if (parents[parent] !== undefined) {
return {foundParent:parent, withChild:child};
}
return findParent(parents, parent);
let branch = findParent(parents, parent);
if (branch.foundParent !== null) {
return branch;
}
}
}
return {foundParent:null, withChild:child};
}
};
iterateParents(parents, childA);
return findParent(parents, childB)
return findParent(parents, childB);
}
/**
@ -783,11 +796,17 @@ class LayoutEngine {
* @private
*/
_sortNodeArray(nodeArray) {
if (this.options.hierarchical.direction === 'UD' || this.options.hierarchical.direction === 'DU') {
nodeArray.sort(function (a,b) {return a.x - b.x;})
}
else {
nodeArray.sort(function (a,b) {return a.y - b.y;})
if (nodeArray.length > 1) {
if (this.options.hierarchical.direction === 'UD' || this.options.hierarchical.direction === 'DU') {
nodeArray.sort(function (a, b) {
return a.x - b.x;
})
}
else {
nodeArray.sort(function (a, b) {
return a.y - b.y;
})
}
}
}

Write Preview
Loading…
Cancel
Save