ExternalVendorCode/gns3-web-ui
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-web-ui.git synced 2024-12-20 13:33:06 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

InterfaceStatus updated

Browse Source
This commit is contained in:
piotrpekala7 2020-07-31 14:55:28 +02:00
parent 7ee47d2e86
commit 01ea42e930
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/cartography/models/map/map-link.ts
View File

@ -20,6 +20,7 @@ export class MapLink implements Indexed {
target: MapNode; // this is not from server target: MapNode; // this is not from server
isSelected = false; // this is not from server isSelected = false; // this is not from server
isMultiplied = false; // this is not from server
x: number; // this is not from server x: number; // this is not from server
y: number; // this is not from server y: number; // this is not from server
} }

18
src/app/cartography/widgets/interface-status.ts
View File

@ -20,6 +20,22 @@ export class InterfaceStatusWidget implements Widget {
public draw(view: SVGSelection) { public draw(view: SVGSelection) {
const self = this; const self = this;
let mapLinks: MapLink[] = [];
view.each(function(this: SVGGElement, l: MapLink) {
mapLinks.push(l);
});
mapLinks.forEach(mapLink => {
mapLinks.forEach(n => {
if (n.nodes[0].linkId !== mapLink.nodes[0].linkId){
if ((mapLink.nodes[0].nodeId === n.nodes[0].nodeId && mapLink.nodes[1].nodeId === n.nodes[1].nodeId) ||
(mapLink.nodes[0].nodeId === n.nodes[1].nodeId && mapLink.nodes[1].nodeId === n.nodes[0].nodeId) ||
(mapLink.nodes[1].nodeId === n.nodes[0].nodeId && mapLink.nodes[0].nodeId === n.nodes[1].nodeId)) {
mapLink.isMultiplied = true;
}
}
});
});
view.each(function(this: SVGGElement, l: MapLink) { view.each(function(this: SVGGElement, l: MapLink) {
const link_group = select<SVGGElement, MapLink>(this); const link_group = select<SVGGElement, MapLink>(this);
@ -62,7 +78,7 @@ export class InterfaceStatusWidget implements Widget {
link_group link_group
.selectAll<SVGTextElement, LinkStatus>('text.status_suspended_label').remove(); .selectAll<SVGTextElement, LinkStatus>('text.status_suspended_label').remove();
if (self.mapSettingsService.integrateLinkLabelsToLinks) { if (self.mapSettingsService.integrateLinkLabelsToLinks && !l.isMultiplied) {
const status_started = link_group const status_started = link_group
.selectAll<SVGRectElement, LinkStatus>('rect.status_started') .selectAll<SVGRectElement, LinkStatus>('rect.status_started')
.data(statuses.filter((link_status: LinkStatus) => link_status.status === 'started')); .data(statuses.filter((link_status: LinkStatus) => link_status.status === 'started'));