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

- Fixed #1324: Labels now scale again.

webworkersNetwork
Alex de Mulder 9 years ago
parent
759cff058b
commit
ce4fec4da3
5 changed files with 83 additions and 87 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -0
      HISTORY.md
  2. +3
    -0
      dist/vis.js
  3. +1
    -0
      lib/network/modules/components/Edge.js
  4. +2
    -0
      lib/network/modules/components/Node.js
  5. +76
    -87
      test/networkTest.html

+ 1
- 0
HISTORY.md View File

@ -13,6 +13,7 @@ http://visjs.org
- Fixed #1343: Connected edges are now deselected too when deselecting a node. - Fixed #1343: Connected edges are now deselected too when deselecting a node.
- Fixed #1398: Support nodes start with the correct positions. - Fixed #1398: Support nodes start with the correct positions.
- Fixed #1324: Labels now scale again.
### Timeline ### Timeline

+ 3
- 0
dist/vis.js View File

@ -28672,6 +28672,8 @@ return /******/ (function(modules) { // webpackBootstrap
this.options.size = this.baseSize; this.options.size = this.baseSize;
this.options.font.size = this.baseFontSize; this.options.font.size = this.baseFontSize;
} }
this.updateLabelModule();
} }
/** /**
@ -31410,6 +31412,7 @@ return /******/ (function(modules) { // webpackBootstrap
} }
this._setInteractionWidths(); this._setInteractionWidths();
this.updateLabelModule();
} }
}, { }, {
key: '_setInteractionWidths', key: '_setInteractionWidths',

+ 1
- 0
lib/network/modules/components/Edge.js View File

@ -344,6 +344,7 @@ class Edge {
} }
this._setInteractionWidths(); this._setInteractionWidths();
this.updateLabelModule();
} }
_setInteractionWidths() { _setInteractionWidths() {

+ 2
- 0
lib/network/modules/components/Node.js View File

@ -381,6 +381,8 @@ class Node {
this.options.size = this.baseSize; this.options.size = this.baseSize;
this.options.font.size = this.baseFontSize; this.options.font.size = this.baseFontSize;
} }
this.updateLabelModule();
} }

+ 76
- 87
test/networkTest.html View File

@ -5,102 +5,91 @@
<link type="text/css" rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/vis/4.9.0/vis.min.css"> <link type="text/css" rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/vis/4.9.0/vis.min.css">
<style> <style>
#network {
width: 100%;
height: 400px;
#mynetwork {
width: 1400px;
height: 800px;
border: 1px solid gray; border: 1px solid gray;
} }
</style> </style>
<script type="text/javascript">
function addChild(Parent){
var newNodes = 5;
var angle = 2* Math.PI / newNodes;
var r = 150;
var shift = Math.random() * Math.PI;
for(i=0; i< newNodes; i++) {
var xnew = network.getPositions(Parent)[Parent].x + Math.cos(angle * i + shift) * r;
var ynew = network.getPositions(Parent)[Parent].y + Math.sin(angle * i + shift) * r;
var newId = guid();
try {
nodes.add(
{id: newId,
label: "New Node",
x: xnew,
y: ynew })
</head>
<body onload="draw();">
<script src="https://rawgit.com/Tooa/6e17f2d7b8e34ef94719/raw/a10096a6b88c992c57d032b1ed3079d7cc4b1f51/data.js"></script>
<div id="mynetwork"></div>
<script>
for (var i = 0; i < nodes.length; i++) {
nodes[i].mass = Math.ceil(2000* nodes[i].value);
}
var nodesDataset = new vis.DataSet(nodes);
var edgesDataset = new vis.DataSet(edges);
function redrawAll() {
var container = document.getElementById('mynetwork');
var options = {
nodes: {
borderWidth:4,
color: {
border: '#406897',
background: '#6AAFFF'
},
scaling: {
min: 10,
max: 200,
label: {
min: 50,
max: 100,
drawThreshold: 10,
maxVisible: 60
}
},
font: {
size: 20,
color:'#000000'
},
shapeProperties: {
useBorderWithImage: true
},
},
edges: {
scaling: {
min: 2,
max: 50
},
color: { inherit: 'from' },
smooth: {
type: 'continuous'
} }
catch (err) {}
var edgeId = guid();
try {
edges.add(
{id: edgeId,
from: Parent,
to: newId})
},
physics: {
"barnesHut": {
"gravitationalConstant": -19050,
"centralGravity": 1.3,
"springLength": 170,
"springConstant": 0.035,
"damping": 0.23
},
"minVelocity": 0.75,
stabilization: {
enabled: false,
iterations: 2000,
updateInterval: 25
} }
catch (err) {}
}
},
configure:'physics',
interaction: {
tooltipDelay: 200,
hideEdgesOnDrag: true
},
layout:{improvedLayout:false}
}; };
network = new vis.Network(container, {nodes: nodesDataset, edges: edgesDataset}, options);
function guid() {
function s4() {
return Math.floor((1 + Math.random()) * 0x10000).toString(16).substring(1);
}
return s4() + s4() + '-' + s4() + '-' + s4() + '-' +
s4() + '-' + s4() + s4() + s4();
};
var nodes, edges, network;
}
redrawAll();
function draw() {
nodes = new vis.DataSet([
{"id": "1",
"label": "Start"}]);
edges = new vis.DataSet([]);
var container = document.getElementById('network');
var data = {
nodes: nodes,
edges: edges
};
var options = {
"edges": {arrows:'to', "smooth": {"type": 'dynamic'}},
"physics": {
"forceAtlas2Based": {
"gravitationalConstant": -514,
"springLength": 150,
"springConstant": 0.1,
"damping": 0.9},
"maxVelocity": 15,
"minVelocity": 1,
"timestep": 0.9,
"solver": "forceAtlas2Based"}};
network = new vis.Network(container, data, options);
network.fit();
network.on("click", function (params) {
if(params.nodes[0]!=null){addChild(params.nodes[0])}});
}
</script>
</head>
<body onload="draw();">
<div id="network"></div>
</script>
</body> </body>
</html> </html>

Write Preview
Loading…
Cancel
Save