summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLV-426 <lv-426@taproot.org.il>2014-11-19 16:05:57 +0200
committerAlon Levy <alon@pobox.com>2014-11-19 23:24:28 +0200
commit685fce09c47520facaa5ce8b893b671ae7607107 (patch)
tree2be597e7b3a0f758293446363a501db2e2c20386
parentfd3897dbb6d926dbbbce08d2a6c98fa7e0641868 (diff)
init_force_layout() - adapt Link with __src,__dst property aliaseswip/addNode-refactoring.rebased
-rw-r--r--src/model/core.js2
-rw-r--r--src/rz_core.js24
2 files changed, 18 insertions, 8 deletions
diff --git a/src/model/core.js b/src/model/core.js
index 54aeb359..5dfd14fc 100644
--- a/src/model/core.js
+++ b/src/model/core.js
@@ -164,6 +164,8 @@ define([], function() {
return {
init : init,
+ Node: Node, // allow model adaptation
+ Link: Link, // allow model adaptation
random_node_name : random_node_name,
crete_node_from_spec : crete_node_from_spec,
crete_link_from_spec : crete_link_from_spec,
diff --git a/src/rz_core.js b/src/rz_core.js
index 3d225a3a..6482d95f 100644
--- a/src/rz_core.js
+++ b/src/rz_core.js
@@ -101,21 +101,29 @@ var initDrawingArea = function () {
.on("drag", dragged)
.on("dragend", dragended);
+function init_force_layout(){
+ var el = document.body;
var w = $(el).innerWidth(),
h = $(el).innerHeight();
force = d3.layout.force()
- .distance(120)
- .gravity(0.12)
- .charge(-1800)
- .size([w, h])
- .on("tick", tick)
- .start();
+ .distance(120)
+ .gravity(0.12)
+ .charge(-1800)
+ .size([w, h])
+ .on("tick", tick)
+ .start();
- graph.update = update;
- $('#canvas_d3').dblclick(canvas_handler_dblclick);
+ // adapte Link to force_layoutL create __src,__dst aliases
+ model_core.Link.prototype.source = function(){
+ return this.__src;
+ }
+ model_core.Link.prototype.target = function(){
+ return this.__dst;
+ }
}
+init_force_layout();
initDrawingArea();
/**