From 1f928690b3ee7269e6b31be194704ae957bd1882 Mon Sep 17 00:00:00 2001 From: Piotr Pekala Date: Wed, 20 Mar 2019 05:52:28 -0700 Subject: [PATCH] Missing icons added --- src/app/cartography/widgets/link.ts | 33 +- .../resources/images/filter-capture.svg | 428 +++++++++++ src/assets/resources/images/filter.svg | 708 ++++++++++++++++++ src/assets/resources/images/inspect.svg | 312 ++++++++ 4 files changed, 1476 insertions(+), 5 deletions(-) create mode 100644 src/assets/resources/images/filter-capture.svg create mode 100644 src/assets/resources/images/filter.svg create mode 100644 src/assets/resources/images/inspect.svg diff --git a/src/app/cartography/widgets/link.ts b/src/app/cartography/widgets/link.ts index 59bf2305..1944e5c6 100644 --- a/src/app/cartography/widgets/link.ts +++ b/src/app/cartography/widgets/link.ts @@ -33,17 +33,40 @@ export class LinkWidget implements Widget { }); link_body.select('.capture-icon').remove(); - link_body - .filter(l => { return l.capturing }) + .filter(l => { return l.capturing && !(l.filters.bpf || l.filters.corrupt || l.filters.delay || l.filters.frequency_drop || l.filters.packet_loss)}) .append('g') .attr('class', 'capture-icon') .attr('transform', link => { - return `translate (${(link.source.x + link.target.x)/2}, ${(link.source.y + link.target.y)/2})` + return `translate (${(link.source.x + link.target.x)/2}, ${(link.source.y + link.target.y)/2}) scale(0.5)` }) .attr('viewBox', '0 0 20 20') - .append('path') - .attr('d', "M18.125,15.804l-4.038-4.037c0.675-1.079,1.012-2.308,1.01-3.534C15.089,4.62,12.199,1.75,8.584,1.75C4.815,1.75,1.982,4.726,2,8.286c0.021,3.577,2.908,6.549,6.578,6.549c1.241,0,2.417-0.347,3.44-0.985l4.032,4.026c0.167,0.166,0.43,0.166,0.596,0l1.479-1.478C18.292,16.234,18.292,15.968,18.125,15.804 M8.578,13.99c-3.198,0-5.716-2.593-5.733-5.71c-0.017-3.084,2.438-5.686,5.74-5.686c3.197,0,5.625,2.493,5.64,5.624C14.242,11.548,11.621,13.99,8.578,13.99 M16.349,16.981l-3.637-3.635c0.131-0.11,0.721-0.695,0.876-0.884l3.642,3.639L16.349,16.981z"); + .append('image') + .attr("xlink:href", "assets/resources/images/inspect.svg"); + + link_body.select('.filter-capture-icon').remove(); + link_body + .filter(l => { return l.capturing && (l.filters.bpf || l.filters.corrupt || l.filters.delay || l.filters.frequency_drop || l.filters.packet_loss)}) + .append('g') + .attr('class', 'filter-capture-icon') + .attr('transform', link => { + return `translate (${(link.source.x + link.target.x)/2}, ${(link.source.y + link.target.y)/2}) scale(0.5)` + }) + .attr('viewBox', '0 0 20 20') + .append('image') + .attr("xlink:href", "assets/resources/images/filter-capture.svg"); + + link_body.select('.filter-icon').remove(); + link_body + .filter(l => { return !l.capturing && (l.filters.bpf || l.filters.corrupt || l.filters.delay || l.filters.frequency_drop || l.filters.packet_loss)}) + .append('g') + .attr('class', 'filter-icon') + .attr('transform', link => { + return `translate (${(link.source.x + link.target.x)/2}, ${(link.source.y + link.target.y)/2}) scale(0.5)` + }) + .attr('viewBox', '0 0 20 20') + .append('image') + .attr("xlink:href", "assets/resources/images/filter.svg"); const serial_link_widget = new SerialLinkWidget(); serial_link_widget.draw(link_body_merge); diff --git a/src/assets/resources/images/filter-capture.svg b/src/assets/resources/images/filter-capture.svg new file mode 100644 index 00000000..aa95a12c --- /dev/null +++ b/src/assets/resources/images/filter-capture.svg @@ -0,0 +1,428 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/resources/images/filter.svg b/src/assets/resources/images/filter.svg new file mode 100644 index 00000000..a67a6f9c --- /dev/null +++ b/src/assets/resources/images/filter.svg @@ -0,0 +1,708 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/resources/images/inspect.svg b/src/assets/resources/images/inspect.svg new file mode 100644 index 00000000..f2573ffc --- /dev/null +++ b/src/assets/resources/images/inspect.svg @@ -0,0 +1,312 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + + + + + + + + + + + + + + + + + + + + + + + + +