GUI - Fixed ONOS-300. Unpin now clears memento.
- increased size of device icons to 36 (from 30). - cleaned up config.icons data, and removed unused code and .png files. Change-Id: I7f3718db164363b75b395fc1af40493304642949
Showing
15 changed files
with
39 additions
and
32 deletions
899 Bytes
web/gui/src/main/webapp/img/host.png
deleted
100644 → 0
800 Bytes
web/gui/src/main/webapp/img/node.png
deleted
100644 → 0
665 Bytes
991 Bytes
1.14 KB
848 Bytes
web/gui/src/main/webapp/img/ui.png
deleted
100644 → 0
4.49 KB
| ... | @@ -77,22 +77,21 @@ | ... | @@ -77,22 +77,21 @@ |
| 77 | linkOutWidth: 10 | 77 | linkOutWidth: 10 |
| 78 | }, | 78 | }, |
| 79 | icons: { | 79 | icons: { |
| 80 | - w: 30, | ||
| 81 | - h: 30, | ||
| 82 | - xoff: -16, | ||
| 83 | - yoff: -14, | ||
| 84 | - | ||
| 85 | device: { | 80 | device: { |
| 86 | - dim: 30, | 81 | + dim: 36, |
| 87 | - rx: 4 | 82 | + rx: 4, |
| 83 | + xoff: -20, | ||
| 84 | + yoff: -18 | ||
| 85 | + }, | ||
| 86 | + host: { | ||
| 87 | + defaultRadius: 9, | ||
| 88 | + radius: { | ||
| 89 | + endstation: 14, | ||
| 90 | + bgpSpeaker: 14, | ||
| 91 | + router: 14 | ||
| 92 | + } | ||
| 88 | } | 93 | } |
| 89 | }, | 94 | }, |
| 90 | - iconUrl: { | ||
| 91 | - device: 'img/device.png', | ||
| 92 | - host: 'img/host.png', | ||
| 93 | - pkt: 'img/pkt.png', | ||
| 94 | - opt: 'img/opt.png' | ||
| 95 | - }, | ||
| 96 | force: { | 95 | force: { |
| 97 | note_for_links: 'link.type is used to differentiate', | 96 | note_for_links: 'link.type is used to differentiate', |
| 98 | linkDistance: { | 97 | linkDistance: { |
| ... | @@ -335,6 +334,7 @@ | ... | @@ -335,6 +334,7 @@ |
| 335 | 334 | ||
| 336 | function unpin() { | 335 | function unpin() { |
| 337 | if (hovered) { | 336 | if (hovered) { |
| 337 | + sendUpdateMeta(hovered); | ||
| 338 | hovered.fixed = false; | 338 | hovered.fixed = false; |
| 339 | hovered.el.classed('fixed', false); | 339 | hovered.el.classed('fixed', false); |
| 340 | network.force.resume(); | 340 | network.force.resume(); |
| ... | @@ -684,7 +684,7 @@ | ... | @@ -684,7 +684,7 @@ |
| 684 | if (d) { | 684 | if (d) { |
| 685 | $.extend(d, device); | 685 | $.extend(d, device); |
| 686 | if (positionNode(d, true)) { | 686 | if (positionNode(d, true)) { |
| 687 | - sendUpdateMeta(d); | 687 | + sendUpdateMeta(d, true); |
| 688 | } | 688 | } |
| 689 | updateNodes(); | 689 | updateNodes(); |
| 690 | } else { | 690 | } else { |
| ... | @@ -1596,7 +1596,8 @@ | ... | @@ -1596,7 +1596,8 @@ |
| 1596 | node = d.el, | 1596 | node = d.el, |
| 1597 | box, | 1597 | box, |
| 1598 | dx, | 1598 | dx, |
| 1599 | - dy; | 1599 | + dy, |
| 1600 | + cfg = config.icons.device; | ||
| 1600 | 1601 | ||
| 1601 | node.select('text') | 1602 | node.select('text') |
| 1602 | .text(label) | 1603 | .text(label) |
| ... | @@ -1606,12 +1607,12 @@ | ... | @@ -1606,12 +1607,12 @@ |
| 1606 | 1607 | ||
| 1607 | if (noLabel) { | 1608 | if (noLabel) { |
| 1608 | box = emptyBox(); | 1609 | box = emptyBox(); |
| 1609 | - dx = -config.icons.device.dim/2; | 1610 | + dx = -cfg.dim/2; |
| 1610 | - dy = -config.icons.device.dim/2; | 1611 | + dy = -cfg.dim/2; |
| 1611 | } else { | 1612 | } else { |
| 1612 | box = adjustRectToFitText(node); | 1613 | box = adjustRectToFitText(node); |
| 1613 | - dx = box.x + config.icons.xoff; | 1614 | + dx = box.x + cfg.xoff; |
| 1614 | - dy = box.y + config.icons.yoff; | 1615 | + dy = box.y + cfg.yoff; |
| 1615 | } | 1616 | } |
| 1616 | 1617 | ||
| 1617 | node.select('rect') | 1618 | node.select('rect') |
| ... | @@ -1709,18 +1710,12 @@ | ... | @@ -1709,18 +1710,12 @@ |
| 1709 | addDeviceIcon(node, box, noLabel, iconGlyphUrl(d)); | 1710 | addDeviceIcon(node, box, noLabel, iconGlyphUrl(d)); |
| 1710 | }); | 1711 | }); |
| 1711 | 1712 | ||
| 1712 | - // TODO: better place for this configuration state | ||
| 1713 | - var defaultHostRadius = 9, | ||
| 1714 | - hostRadius = { | ||
| 1715 | - bgpSpeaker: 14, | ||
| 1716 | - router: 14, | ||
| 1717 | - endstation: 14 | ||
| 1718 | - }; | ||
| 1719 | 1713 | ||
| 1720 | // augment host nodes... | 1714 | // augment host nodes... |
| 1721 | entering.filter('.host').each(function (d) { | 1715 | entering.filter('.host').each(function (d) { |
| 1722 | var node = d3.select(this), | 1716 | var node = d3.select(this), |
| 1723 | - r = hostRadius[d.type] || defaultHostRadius, | 1717 | + cfg = config.icons.host, |
| 1718 | + r = cfg.radius[d.type] || cfg.defaultRadius, | ||
| 1724 | textDy = r + 10, | 1719 | textDy = r + 10, |
| 1725 | iid = iconGlyphUrl(d); | 1720 | iid = iconGlyphUrl(d); |
| 1726 | 1721 | ||
| ... | @@ -1790,8 +1785,8 @@ | ... | @@ -1790,8 +1785,8 @@ |
| 1790 | dy = -cfg.dim/2; | 1785 | dy = -cfg.dim/2; |
| 1791 | } else { | 1786 | } else { |
| 1792 | box = adjustRectToFitText(node); | 1787 | box = adjustRectToFitText(node); |
| 1793 | - dx = box.x + config.icons.xoff; | 1788 | + dx = box.x + cfg.xoff; |
| 1794 | - dy = box.y + config.icons.yoff; | 1789 | + dy = box.y + cfg.yoff; |
| 1795 | } | 1790 | } |
| 1796 | 1791 | ||
| 1797 | g = node.append('g') | 1792 | g = node.append('g') |
| ... | @@ -2314,14 +2309,19 @@ | ... | @@ -2314,14 +2309,19 @@ |
| 2314 | gly.defBadges(defs); | 2309 | gly.defBadges(defs); |
| 2315 | } | 2310 | } |
| 2316 | 2311 | ||
| 2317 | - function sendUpdateMeta(d) { | 2312 | + function sendUpdateMeta(d, store) { |
| 2318 | - var ll = geoMapProjection.invert([d.x, d.y]), | 2313 | + var metaUi = {}, |
| 2314 | + ll; | ||
| 2315 | + | ||
| 2316 | + if (store) { | ||
| 2317 | + ll = geoMapProjection.invert([d.x, d.y]); | ||
| 2319 | metaUi = { | 2318 | metaUi = { |
| 2320 | x: d.x, | 2319 | x: d.x, |
| 2321 | y: d.y, | 2320 | y: d.y, |
| 2322 | lng: ll[0], | 2321 | lng: ll[0], |
| 2323 | lat: ll[1] | 2322 | lat: ll[1] |
| 2324 | }; | 2323 | }; |
| 2324 | + } | ||
| 2325 | d.metaUi = metaUi; | 2325 | d.metaUi = metaUi; |
| 2326 | sendMessage('updateMeta', { | 2326 | sendMessage('updateMeta', { |
| 2327 | id: d.id, | 2327 | id: d.id, |
| ... | @@ -2388,7 +2388,7 @@ | ... | @@ -2388,7 +2388,7 @@ |
| 2388 | d.fixed = true; | 2388 | d.fixed = true; |
| 2389 | d3.select(self).classed('fixed', true); | 2389 | d3.select(self).classed('fixed', true); |
| 2390 | if (config.useLiveData) { | 2390 | if (config.useLiveData) { |
| 2391 | - sendUpdateMeta(d); | 2391 | + sendUpdateMeta(d, true); |
| 2392 | } else { | 2392 | } else { |
| 2393 | console.log('Moving node ' + d.id + ' to [' + d.x + ',' + d.y + ']'); | 2393 | console.log('Moving node ' + d.id + ' to [' + d.x + ',' + d.y + ']'); |
| 2394 | } | 2394 | } | ... | ... |
-
Please register or login to post a comment