ONOS-2328 GUI -- Enhanced Topology View to show multiple links individually between devices (1 - 4). 5 or more is a thick line.
Change-Id: Ie096086454fd8d1d5d40f09396681f9cba8597a1
diff --git a/web/gui/src/main/webapp/app/view/topo/topoD3.js b/web/gui/src/main/webapp/app/view/topo/topoD3.js
index 09883b1..4dcf3f0 100644
--- a/web/gui/src/main/webapp/app/view/topo/topoD3.js
+++ b/web/gui/src/main/webapp/app/view/topo/topoD3.js
@@ -367,17 +367,10 @@
.classed('linkLabel', true)
.attr('id', function (d) { return d.id; });
- // FIXME: x and y position calculated here, use link.position obj
entering.each(function (d) {
var el = d3.select(this),
rect,
- text,
- parms = {
- x1: d.ldata.source.x,
- y1: d.ldata.source.y,
- x2: d.ldata.target.x,
- y2: d.ldata.target.y
- };
+ text;
if (d.ldata.type() === 'hostLink') {
el.classed('hostLinkLabel', true);
@@ -390,7 +383,7 @@
rect.attr(rectAroundText(el));
text.attr('dy', linkLabelOffset);
- el.attr('transform', transformLabel(parms));
+ el.attr('transform', transformLabel(d.ldata.position));
});
// Remove any labels that are no longer required.
@@ -411,7 +404,6 @@
return box;
}
- // FIXME: x and y position calculated here
function transformLabel(p) {
var dx = p.x2 - p.x1,
dy = p.y2 - p.y1,