mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-29 15:21:52 +01:00
Code Issues Projects Releases Wiki Activity

Topo2: Fixed incorrect link highlighting and port locations

Browse Source 
JIRA Tasks; ONOS-6276

Change-Id: Id9affd2cdc1bfa335654111655a413abad63ffc7
This commit is contained in:
Steven Burrows 2017-04-12 10:45:08 -07:00 committed by Simon Hunt
parent f381876a1c
commit a31c5b09ef
2 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
web/gui/src/main/webapp/app/view/topo2/topo2Layout.js
View File

@ -169,14 +169,11 @@
t2zs.panAndZoom([x, y], scale, 1000); t2zs.panAndZoom([x, y], scale, 1000);
}, },
setLinkPosition: function (link) {
link.setPosition.bind(link)();
},
tick: function () { tick: function () {
this.link
.attr("x1", function (d) { return d.get('source').x; })
.attr("y1", function (d) { return d.get('source').y; })
.attr("x2", function (d) { return d.get('target').x; })
.attr("y2", function (d) { return d.get('target').y; });
this.node this.node
.attr({ .attr({
transform: function (d) { transform: function (d) {
@ -185,6 +182,13 @@
return sus.translate(dx, dy); return sus.translate(dx, dy);
} }
}); });
this.link
.each(this.setLinkPosition)
.attr("x1", function (d) { return d.get('position').x1; })
.attr("y1", function (d) { return d.get('position').y1; })
.attr("x2", function (d) { return d.get('position').x2; })
.attr("y2", function (d) { return d.get('position').y2; });
}, },
start: function () { start: function () {

22
web/gui/src/main/webapp/app/view/topo2/topo2Link.js
View File

@ -211,6 +211,28 @@
this.set('enhanced', false); this.set('enhanced', false);
d3.select('.topo2-portLabels').selectAll('.portLabel').remove(); d3.select('.topo2-portLabels').selectAll('.portLabel').remove();
}, },
setPosition: function () {
this.set({
position: {
x1: this.get('source').x,
y1: this.get('source').y,
x2: this.get('target').x,
y2: this.get('target').y
}
});
if (this.get('enhanced')) {
this.updatePortPosition();
}
},
updatePortPosition: function () {
var sourcePos = this.locatePortLabel(1),
targetPos = this.locatePortLabel();
d3.select('#topo2-port-src')
.attr('transform', sus.translate(sourcePos.x, sourcePos.y));
d3.select('#topo2-port-tgt')
.attr('transform', sus.translate(targetPos.x, targetPos.y));
},
getSelected: function () { getSelected: function () {
return this.collection.filter(function (m) { return this.collection.filter(function (m) {
return m.get('selected'); return m.get('selected');