From ffb261ce64bbfbfee8be417ad9e465349fef1905 Mon Sep 17 00:00:00 2001 From: ziajka Date: Thu, 25 Oct 2018 11:35:29 +0200 Subject: [PATCH] clean --- .../datasources/datasource.spec.ts | 2 +- .../cartography/widgets/interface-status.ts | 39 +++++++++---------- src/app/cartography/widgets/links.ts | 2 +- 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/src/app/cartography/datasources/datasource.spec.ts b/src/app/cartography/datasources/datasource.spec.ts index f60958bb..c323fe5e 100644 --- a/src/app/cartography/datasources/datasource.spec.ts +++ b/src/app/cartography/datasources/datasource.spec.ts @@ -9,7 +9,7 @@ class TestDataSource extends DataSource { protected findIndex(item: Item) { return this.data.findIndex((i: Item) => i.id === item.id); } -}; +} describe('TestDataSource', () => { diff --git a/src/app/cartography/widgets/interface-status.ts b/src/app/cartography/widgets/interface-status.ts index f4fab995..eabf45e8 100644 --- a/src/app/cartography/widgets/interface-status.ts +++ b/src/app/cartography/widgets/interface-status.ts @@ -19,56 +19,55 @@ export class InterfaceStatusWidget implements Widget { let statuses = []; - if (link_path.node().getTotalLength() > 2 * 45 + 10) { statuses = [ - new LinkStatus(start_point.x, start_point.y, l.source.status), - new LinkStatus(end_point.x, end_point.y, l.target.status) + new LinkStatus(start_point.x, start_point.y, l.source.status), + new LinkStatus(end_point.x, end_point.y, l.target.status) ]; } const status_started = link_group .selectAll('circle.status_started') - .data(statuses.filter((link_status: LinkStatus) => link_status.status === 'started')); + .data(statuses.filter((link_status: LinkStatus) => link_status.status === 'started')); const status_started_enter = status_started .enter() - .append('circle'); + .append('circle'); status_started .merge(status_started_enter) - .attr('class', 'status_started') - .attr('cx', (ls: LinkStatus) => ls.x) - .attr('cy', (ls: LinkStatus) => ls.y) - .attr('r', 6) - .attr('fill', '#2ecc71'); + .attr('class', 'status_started') + .attr('cx', (ls: LinkStatus) => ls.x) + .attr('cy', (ls: LinkStatus) => ls.y) + .attr('r', 6) + .attr('fill', '#2ecc71'); status_started .exit() - .remove(); + .remove(); const status_stopped = link_group .selectAll('rect.status_stopped') - .data(statuses.filter((link_status: LinkStatus) => link_status.status === 'stopped')); + .data(statuses.filter((link_status: LinkStatus) => link_status.status === 'stopped')); const status_stopped_enter = status_stopped .enter() - .append('rect'); + .append('rect'); const STOPPED_STATUS_RECT_WIDTH = 10; status_stopped .merge(status_stopped_enter) - .attr('class', 'status_stopped') - .attr('x', (ls: LinkStatus) => ls.x - STOPPED_STATUS_RECT_WIDTH / 2.) - .attr('y', (ls: LinkStatus) => ls.y - STOPPED_STATUS_RECT_WIDTH / 2.) - .attr('width', STOPPED_STATUS_RECT_WIDTH) - .attr('height', STOPPED_STATUS_RECT_WIDTH) - .attr('fill', 'red'); + .attr('class', 'status_stopped') + .attr('x', (ls: LinkStatus) => ls.x - STOPPED_STATUS_RECT_WIDTH / 2.) + .attr('y', (ls: LinkStatus) => ls.y - STOPPED_STATUS_RECT_WIDTH / 2.) + .attr('width', STOPPED_STATUS_RECT_WIDTH) + .attr('height', STOPPED_STATUS_RECT_WIDTH) + .attr('fill', 'red'); status_stopped .exit() - .remove(); + .remove(); }); } } diff --git a/src/app/cartography/widgets/links.ts b/src/app/cartography/widgets/links.ts index 662d59fb..bcc12890 100644 --- a/src/app/cartography/widgets/links.ts +++ b/src/app/cartography/widgets/links.ts @@ -14,7 +14,7 @@ export class LinksWidget implements Widget { } public getLinkWidget() { - return this.linkWidget + return this.linkWidget; } public redrawLink(view: SVGSelection, link: Link) {