GUI -- Continued porting topology behavior over to the new codebase. WIP.
- added FnService.windowSize() function.
- added MastService and mastHeight() function.
- implemented SvgUtilService.createDragBehavior().
Change-Id: I5dae35244ab8220e1b95ddfd55b180e6adcb7a00
diff --git a/web/gui/src/main/webapp/app/view/topo/topoForce.js b/web/gui/src/main/webapp/app/view/topo/topoForce.js
index 6c3d501..196188c 100644
--- a/web/gui/src/main/webapp/app/view/topo/topoForce.js
+++ b/web/gui/src/main/webapp/app/view/topo/topoForce.js
@@ -96,8 +96,9 @@
// forceG is the SVG group to display the force layout in
// w, h are the initial dimensions of the SVG
// opts are, well, optional :)
- function initForce (forceG, w, h, opts) {
- // TODO: create the force layout and initialize
+ function initForce(forceG, w, h, opts) {
+ $log.debug('initForce().. WxH = ' + w + 'x' + h);
+
settings = angular.extend({}, defaultSettings, opts);
linkG = forceG.append('g').attr('id', 'topo-links');
@@ -109,7 +110,7 @@
node = nodeG.selectAll('.node');
force = d3.layout.force()
- .size(w, h)
+ .size([w, h])
.nodes(network.nodes)
.links(network.links)
.gravity(settings.gravity)
@@ -124,8 +125,9 @@
}
function resize(w, h) {
- force.size(w, h);
+ force.size([w, h]);
// Review -- do we need to nudge the layout ?
+
}
return {