This commit is contained in:
crusader 2018-09-12 21:55:43 +09:00
parent b87c3a68d2
commit a59d2c3b13
2 changed files with 87 additions and 65 deletions

View File

@ -221,20 +221,44 @@ export class HomePageComponent implements OnInit, OnDestroy {
// d3.select(this.discoveryTargetRef.nativeElement).selectAll('.node-container').call(d3.drag().on('start', started));
// d3.drag()
// .on('dragstart', (node: Node, i: number) => {
// __this.simulation.stop();
// })
// .on('drag', (node: Node, i: number) => {
// node.fx += d3.event.dx;
// node.fy += d3.event.dy;
// node.x += d3.event.dx;
// node.y += d3.event.dy;
// })
// .on('dragend', (node: Node, i: number) => {
// __this.simulation.stop();
// })
// ;
// d3.select(this.discoveryTargetRef.nativeElement).selectAll('.node-container').call(
// d3.drag()
// .on('start', (node: Node, i: number) => {
// __this.simulation.stop();
// })
// .on('drag', (node: Node, i: number) => {
// node.fx += d3.event.dx;
// node.fy += d3.event.dy;
// node.x += d3.event.dx;
// node.y += d3.event.dy;
// })
// .on('end', (node: Node, i: number) => {
// __this.simulation.stop();
// })
// );
d3.select(this.discoveryTargetRef.nativeElement).selectAll('.node-container').call(
d3.drag()
.on('start', function () {
d3.event.sourceEvent.stopPropagation();
if (!d3.event.active) {
__this.simulation.alphaTarget(0.3).restart();
}
d3.event.on('drag', dragged).on('end', ended);
function dragged() {
d3.select(this).attr('cx', d3.event.x).attr('cy', d3.event.y);
}
function ended() {
if (!d3.event.active) {
__this.simulation.alphaTarget(0);
}
}
})
);
}

View File

@ -1,51 +1,49 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 66 56" style="enable-background:new 0 0 66 56;" xml:space="preserve">
<style type="text/css">
.st0{fill:none;stroke:#FFFFFF;stroke-width:2;stroke-miterlimit:10;}
.st1{fill:#D1A41A;}
.st2{fill:#FFDC76;}
</style>
<path class="st0" d="M47.3,32.4c-0.6-0.6-1.7-0.9-2.6-0.9c-0.6-0.7-3.7-4-4.3-4.6c1.3-0.9,2.4-2.1,3.3-3.5h1.7V23h-1.5
c0.1-0.2,0.2-0.3,0.3-0.5h1.2v-0.4h-1c0.8-1.7,1.2-3.6,1.2-5.7l0,0c0-0.6-0.2-3-0.5-3.7c-0.9,0.3-2.5,1.4-2.9,2.6
c-1.8-0.3-3.7-0.2-5.5,0.1c-0.3-1.2-1.7-2.1-2.8-2.6c-0.5,0.8-0.7,2.6-0.6,3.9l0,0c0,1.2,0.2,2.2,0.5,3.2c-3.8,0.9-7.9,3.4-10.2,5.8
c-1.1-1.5-1.5-2.7-1.6-3.6c-0.2-1.1,0.1-2.2,0.8-3c1.1-1.3,2.6-1.4,4.1-1.2c0,0.2,0,0.5,0.1,0.6c0.4,0.6,2.6,0.8,3.9,0.2
c-1-1.4-2.9-2-3.5-1.8c-0.2,0.1-0.3,0.3-0.4,0.4c-0.5-0.1-1.1-0.2-1.5-0.2c-1.4,0-2.4,0.5-3.2,1.5c-0.8,1-1.1,2.1-0.9,3.4
c0.2,1.2,0.8,2.5,1.8,3.9c-0.2,0.2-0.3,0.4-0.5,0.5c-2.5,2.8-4.3,5.7-4.3,6.2v0.3h3.3l-0.1-0.3c-0.2-1,0.2-2.2,0.9-3.1
c0.5-0.6,1.3-1.2,2.5-1.5c1.1,1.1,2.5,2.2,4,3.3h2.4V31c0-0.3-0.1-0.5-0.4-0.7c-0.4-0.2-1-0.3-1.5-0.1c-0.5-0.6-0.8-1.3-0.9-2.3
c5.3,0.5,10.3,2.6,15.9,5.5h3.1v-0.2C47.7,33.1,47.6,32.7,47.3,32.4L47.3,32.4z M22,29.3c-0.8,0.9-1.2,2.2-1.1,3.2h-2.1
c0.4-0.9,2.1-3.5,4.5-6.1c0.3,0.4,0.7,0.8,1.1,1.3C23.3,28.1,22.5,28.8,22,29.3z"/>
<g>
<path class="st1" d="M23.5,26.3c0.4,0.4,0.7,0.8,1.1,1.2c-1.2,0.4-2,1-2.5,1.6c-0.8,0.9-1.2,2.2-1.1,3.2h-2
C19.4,31.5,21.1,28.9,23.5,26.3 M47.2,32.9h-2.5c-5.7-3-10.7-5.1-16.1-5.5c0-0.7,0.1-1.6,0.4-2.5l-0.5-0.1c-0.3,1-0.4,1.8-0.4,2.6
c-0.6,0-1.1-0.1-1.7-0.1c-0.5,0-0.9,0-1.3,0.1c-0.5-0.5-1-1-1.3-1.5c2.5-2.6,6.5-4.9,10-5.7c1,3.3,3.1,5.6,5.7,7.1
c0.2-0.1,0.4-0.2,0.6-0.3l4.5,4.9l0.2,0c1.2-0.1,1.9,0.6,2.1,0.8C47.1,32.7,47.2,32.8,47.2,32.9"/>
<path class="st2" d="M45,16.7c0.1,4.5-2.2,8-5.4,9.9c-5.4-2.7-6.5-9.6-5.5-13.2c0.3,1.4,0.7,2.3,1.7,2.7c2.2-0.6,5.2-0.7,7.5-0.1
c0.9-0.7,1.3-1.7,1.5-2.6C45,14.4,45,16.7,45,16.7"/>
<path d="M37.7,17.3c0.2,0,0.3,0.1,0.4,0.2c0.2,0.4,0.2,1.1,0,1.9h-1.5v0.3H38c-0.2,0.5-0.4,1.1-0.6,1.5l-0.1,0.1l1.9,1.2l-1.1,0.7
l0.2,0.3l1.2-0.8l1.3,0.8l0.2-0.3l-1.2-0.7c0,0,1.8-1.1,1.9-1.2l0,0l0,0c-0.4-0.6-0.5-1.1-0.4-1.6h0.1l1.4,0l0-0.3h-1.4
c0.3-0.6,0.6-1.2,2-1.2v-0.3c-1.2,0-2,0.5-2.3,1.5h-2.6c0.2-0.8,0.2-1.6-0.1-2.1c-0.2-0.3-0.4-0.4-0.7-0.4c-1.1,0-1.5,1.1-1.5,1.2
l0.3,0.1C36.5,18.2,36.8,17.3,37.7,17.3L37.7,17.3z M39.5,22.4l-1.4-0.9l2.7,0L39.5,22.4L39.5,22.4z M41,19.8
c-0.1,0.4-0.1,0.9,0.2,1.4h-3.3c0.2-0.4,0.4-0.9,0.5-1.4H41z"/>
<path d="M36.5,18.2L36.5,18.2L36.5,18.2L36.5,18.2"/>
<path d="M47.3,32.2c-0.6-0.6-1.6-0.9-2.6-0.9c-0.6-0.7-3.7-3.9-4.3-4.6c1.3-0.9,2.4-2.1,3.3-3.5h1.7v-0.4h-1.5
c0.1-0.2,0.2-0.3,0.3-0.5h1.2v-0.4h-1c0.8-1.7,1.2-3.6,1.2-5.7l0,0c0-0.6-0.2-3-0.5-3.7c-0.9,0.3-2.5,1.4-2.9,2.5
c-1.8-0.3-3.7-0.2-5.5,0.1c-0.3-1.2-1.7-2.1-2.8-2.6c-0.5,0.8-0.7,2.6-0.6,3.9l0,0c0,1.2,0.2,2.2,0.5,3.2
c-3.8,0.9-7.9,3.4-10.2,5.8c-1.1-1.5-1.5-2.7-1.6-3.6c-0.2-1.1,0.1-2.2,0.8-3c1.1-1.3,2.6-1.4,4.1-1.1c0,0.2,0,0.5,0.1,0.6
c0.4,0.6,2.6,0.8,3.9,0.2c-1-1.4-2.9-2-3.5-1.8c-0.2,0.1-0.3,0.2-0.4,0.4c-0.5-0.1-1.1-0.2-1.5-0.2c-1.4,0-2.4,0.5-3.2,1.5
c-0.8,1-1.1,2.1-0.9,3.4c0.2,1.2,0.8,2.5,1.8,3.9c-0.2,0.2-0.3,0.4-0.5,0.5c-2.5,2.8-4.3,5.7-4.3,6.2v0.3h3.3l-0.1-0.3
c-0.2-1,0.2-2.2,0.9-3.1c0.5-0.6,1.3-1.2,2.5-1.5c1.1,1.1,2.5,2.2,4,3.3h2.4V31c0-0.3-0.1-0.5-0.4-0.7c-0.4-0.2-1-0.3-1.5-0.1
c-0.5-0.6-0.8-1.3-0.9-2.3c5.2,0.5,10.3,2.6,15.9,5.5h3.1l0-0.2C47.8,32.9,47.6,32.5,47.3,32.2L47.3,32.2z M34.1,13.3
c0.3,1.4,0.7,2.3,1.7,2.7c0.9-0.3,1.9-0.4,3-0.5l0.9,1.9l0.6-1.9c1.1,0,2.1,0.2,3,0.4c0.9-0.7,1.3-1.7,1.5-2.6
c0.2,1.1,0.2,3.3,0.2,3.3c0,0.8-0.1,1.7-0.2,2.4l-1,0.4l0.9,0.1c-0.1,0.3-0.2,0.6-0.2,0.9l-0.9,0.2l0.7,0.2
c-0.1,0.3-0.2,0.6-0.4,0.9h-1.4v0.4h1.2c-0.1,0.2-0.2,0.3-0.3,0.5h-0.9v0.4h0.7c-0.9,1.4-2.2,2.5-3.6,3.4c-1.6-0.8-2.9-2-3.8-3.4
h0.5v-0.4h-0.8c-0.1-0.2-0.2-0.3-0.3-0.5h1.1v-0.4h-1.3c-0.2-0.4-0.4-0.9-0.6-1.3l0.6-0.2l-0.8-0.3c-0.1-0.3-0.2-0.5-0.2-0.8
l1.2-0.1L34,18.5C33.7,16.6,33.7,14.7,34.1,13.3L34.1,13.3z M22.1,29.1c-0.8,0.9-1.2,2.2-1.1,3.2h-2c0.4-0.9,2.1-3.5,4.5-6.1
c0.3,0.4,0.7,0.8,1.1,1.2C23.4,27.9,22.6,28.5,22.1,29.1z M44.7,32.9c-5.7-3-10.7-5.1-16.1-5.5c0-0.7,0.1-1.6,0.4-2.5l-0.5-0.1
c-0.3,1-0.4,1.8-0.4,2.6c-0.6,0-1.1-0.1-1.7-0.1c-0.5,0-0.9,0-1.3,0.1c-0.5-0.5-1-1-1.3-1.5c0.7-0.7,1.5-1.4,2.3-2l1.2,0.8
l-0.4-1.4c0.4-0.2,0.7-0.5,1.1-0.7l1.8,0.9L29,22.1c0.2-0.1,0.5-0.3,0.7-0.4l2.5,1.7L31.4,21c0.8-0.3,1.7-0.6,2.5-0.8
c0.2,0.6,0.4,1.2,0.7,1.8h-1.1v0.4h1.3c0.1,0.2,0.2,0.3,0.3,0.5h-1.6v0.4h1.8c1.1,1.7,2.6,3,4.3,4c0.2-0.1,0.4-0.2,0.6-0.3l0.4,0.5
l-0.7,1.2l1.3-0.6l0.7,0.8l-1.3,1l1.7-0.4l2.3,2.5l0.2,0c1.2-0.1,1.9,0.6,2.1,0.8c0.1,0.2,0.2,0.3,0.3,0.4H44.7L44.7,32.9z"/>
</g>
</svg>
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 66 56" style="enable-background:new 0 0 66 56;" xml:space="preserve">
<style type="text/css">
.st0{fill:none;stroke:#FFFFFF;stroke-width:2;stroke-miterlimit:10;}
.st1{fill:#D1A41A;}
.st2{fill:#FFDC76;}
</style>
<path class="st0" d="M47.3,32.4c-0.6-0.6-1.7-0.9-2.6-0.9c-0.6-0.7-3.7-4-4.3-4.6c1.3-0.9,2.4-2.1,3.3-3.5h1.7V23h-1.5
c0.1-0.2,0.2-0.3,0.3-0.5h1.2v-0.4h-1c0.8-1.7,1.2-3.6,1.2-5.7l0,0c0-0.6-0.2-3-0.5-3.7c-0.9,0.3-2.5,1.4-2.9,2.6
c-1.8-0.3-3.7-0.2-5.5,0.1c-0.3-1.2-1.7-2.1-2.8-2.6c-0.5,0.8-0.7,2.6-0.6,3.9l0,0c0,1.2,0.2,2.2,0.5,3.2c-3.8,0.9-7.9,3.4-10.2,5.8
c-1.1-1.5-1.5-2.7-1.6-3.6c-0.2-1.1,0.1-2.2,0.8-3c1.1-1.3,2.6-1.4,4.1-1.2c0,0.2,0,0.5,0.1,0.6c0.4,0.6,2.6,0.8,3.9,0.2
c-1-1.4-2.9-2-3.5-1.8c-0.2,0.1-0.3,0.3-0.4,0.4c-0.5-0.1-1.1-0.2-1.5-0.2c-1.4,0-2.4,0.5-3.2,1.5c-0.8,1-1.1,2.1-0.9,3.4
c0.2,1.2,0.8,2.5,1.8,3.9c-0.2,0.2-0.3,0.4-0.5,0.5c-2.5,2.8-4.3,5.7-4.3,6.2v0.3h3.3l-0.1-0.3c-0.2-1,0.2-2.2,0.9-3.1
c0.5-0.6,1.3-1.2,2.5-1.5c1.1,1.1,2.5,2.2,4,3.3h2.4V31c0-0.3-0.1-0.5-0.4-0.7c-0.4-0.2-1-0.3-1.5-0.1c-0.5-0.6-0.8-1.3-0.9-2.3
c5.3,0.5,10.3,2.6,15.9,5.5h3.1v-0.2C47.7,33.1,47.6,32.7,47.3,32.4L47.3,32.4z M22,29.3c-0.8,0.9-1.2,2.2-1.1,3.2h-2.1
c0.4-0.9,2.1-3.5,4.5-6.1c0.3,0.4,0.7,0.8,1.1,1.3C23.3,28.1,22.5,28.8,22,29.3z"/>
<path class="st1" d="M23.4,26c0.4,0.4,1,1.1,1.4,1.5c-1.2,0.4-2.2,1-2.7,1.6c-0.8,0.9-1.2,2.2-1.1,3.2h-2C19.2,31.4,21,28.7,23.4,26
M47.2,32.9h-2.5c-5.7-3-10.7-5.1-16.1-5.5c0-0.7,0.1-1.6,0.4-2.5l-0.5-0.1c-0.3,1-0.4,1.8-0.4,2.6c-0.6,0-1.1-0.1-1.7-0.1
c-0.5,0-0.9,0-1.3,0.1c-0.5-0.5-1-1-1.3-1.5c2.5-2.6,6.6-5.1,10.1-5.9c1,3.3,3.2,5.7,5.8,7.2c0.2-0.1,0.3-0.3,0.5-0.4l4.4,5.1h0.2
c1.2-0.1,1.9,0.6,2.1,0.8C47.1,32.7,47.2,32.8,47.2,32.9"/>
<path class="st2" d="M45.2,16.4c0.1,4.7-2.3,8.3-5.6,10.2c-5.6-2.8-6.8-9-5.5-13.7c0.6,1.4,0.6,2.4,1.6,2.8c2.3-0.6,5.4-0.7,7.8-0.1
c0.9-0.7,1.2-1.8,1.4-2.7C45.1,14,45.2,16.4,45.2,16.4"/>
<path d="M37.7,17.3c0.2,0,0.3,0.1,0.4,0.2c0.2,0.4,0.2,1.1,0,1.9h-1.5v0.3H38c-0.2,0.5-0.4,1.1-0.6,1.5l-0.1,0.1l1.9,1.2l-1.1,0.7
l0.2,0.3l1.2-0.8l1.3,0.8l0.2-0.3l-1.2-0.7c0,0,1.8-1.1,1.9-1.2l0,0l0,0c-0.4-0.6-0.5-1.1-0.4-1.6h0.1h1.4v-0.3h-1.4
c0.3-0.6,0.6-1.2,2-1.2v-0.3c-1.2,0-2,0.5-2.3,1.5h-2.6c0.2-0.8,0.2-1.6-0.1-2.1c-0.2-0.3-0.4-0.4-0.7-0.4c-1.1,0-1.5,1.1-1.5,1.2
l0.3,0.1C36.5,18.2,36.8,17.3,37.7,17.3L37.7,17.3z M39.5,22.4l-1.4-0.9h2.7L39.5,22.4L39.5,22.4z M41,19.8
c-0.1,0.4-0.1,0.9,0.2,1.4h-3.3c0.2-0.4,0.4-0.9,0.5-1.4H41z"/>
<path d="M36.5,18.2L36.5,18.2L36.5,18.2L36.5,18.2"/>
<path d="M47.3,32.2c-0.6-0.6-1.6-0.9-2.6-0.9c-0.6-0.7-3.7-3.9-4.3-4.6c1.3-0.9,2.4-2.1,3.3-3.5h1.7v-0.4h-1.5
c0.1-0.2,0.2-0.3,0.3-0.5h1.2v-0.4h-1c0.8-1.7,1.2-3.6,1.2-5.7l0,0c0-0.6-0.2-3-0.5-3.7c-0.9,0.3-2.5,1.4-2.9,2.5
c-1.8-0.3-3.7-0.2-5.5,0.1c-0.3-1.2-1.7-2.1-2.8-2.6c-0.5,0.8-0.7,2.6-0.6,3.9l0,0c0,1.2,0.2,2.2,0.5,3.2c-3.8,0.9-7.9,3.4-10.2,5.8
c-1.1-1.5-1.5-2.7-1.6-3.6c-0.2-1.1,0.1-2.2,0.8-3c1.1-1.3,2.6-1.4,4.1-1.1c0,0.2,0,0.5,0.1,0.6c0.4,0.6,2.6,0.8,3.9,0.2
c-1-1.4-2.9-2-3.5-1.8c-0.2,0.1-0.3,0.2-0.4,0.4c-0.5-0.1-1.1-0.2-1.5-0.2c-1.4,0-2.4,0.5-3.2,1.5c-0.8,1-1.1,2.1-0.9,3.4
c0.2,1.2,0.8,2.5,1.8,3.9c-0.2,0.2-0.3,0.4-0.5,0.5c-2.5,2.8-4.3,5.7-4.3,6.2v0.3h3.3l-0.1-0.3c-0.2-1,0.2-2.2,0.9-3.1
c0.5-0.6,1.3-1.2,2.5-1.5c1.1,1.1,2.5,2.2,4,3.3h2.4V31c0-0.3-0.1-0.5-0.4-0.7c-0.4-0.2-1-0.3-1.5-0.1c-0.5-0.6-0.8-1.3-0.9-2.3
c5.2,0.5,10.3,2.6,15.9,5.5h3.1v-0.2C47.8,32.9,47.6,32.5,47.3,32.2L47.3,32.2z M34.1,13.3c0.3,1.4,0.7,2.3,1.7,2.7
c0.9-0.3,1.9-0.4,3-0.5l0.9,1.9l0.6-1.9c1.1,0,2.1,0.2,3,0.4c0.9-0.7,1.3-1.7,1.5-2.6c0.2,1.1,0.2,3.3,0.2,3.3
c0,0.8-0.1,1.7-0.2,2.4l-1,0.4l0.9,0.1c-0.1,0.3-0.2,0.6-0.2,0.9l-0.9,0.2l0.7,0.2c-0.1,0.3-0.2,0.6-0.4,0.9h-1.4v0.4h1.2
c-0.1,0.2-0.2,0.3-0.3,0.5h-0.9V23h0.7c-0.9,1.4-2.2,2.5-3.6,3.4c-1.6-0.8-2.9-2-3.8-3.4h0.5v-0.4h-0.8c-0.1-0.2-0.2-0.3-0.3-0.5
h1.1v-0.4H35c-0.2-0.4-0.4-0.9-0.6-1.3l0.6-0.2l-0.8-0.3c-0.1-0.3-0.2-0.5-0.2-0.8l1.2-0.1L34,18.5C33.7,16.6,33.7,14.7,34.1,13.3
L34.1,13.3z M22.1,29.1c-0.8,0.9-1.2,2.2-1.1,3.2h-2c0.4-0.9,2.1-3.5,4.5-6.1c0.3,0.4,0.7,0.8,1.1,1.2
C23.4,27.9,22.6,28.5,22.1,29.1z M44.7,32.9c-5.7-3-10.7-5.1-16.1-5.5c0-0.7,0.1-1.6,0.4-2.5l-0.5-0.1c-0.3,1-0.4,1.8-0.4,2.6
c-0.6,0-1.1-0.1-1.7-0.1c-0.5,0-0.9,0-1.3,0.1c-0.5-0.5-1-1-1.3-1.5c0.7-0.7,1.5-1.4,2.3-2l1.2,0.8l-0.4-1.4
c0.4-0.2,0.7-0.5,1.1-0.7l1.8,0.9L29,22.1c0.2-0.1,0.5-0.3,0.7-0.4l2.5,1.7L31.4,21c0.8-0.3,1.7-0.6,2.5-0.8
c0.2,0.6,0.4,1.2,0.7,1.8h-1.1v0.4h1.3c0.1,0.2,0.2,0.3,0.3,0.5h-1.6v0.4h1.8c1.1,1.7,2.6,3,4.3,4c0.2-0.1,0.4-0.2,0.6-0.3l0.4,0.5
l-0.7,1.2l1.3-0.6l0.7,0.8l-1.3,1l1.7-0.4l2.3,2.5h0.2c1.2-0.1,1.9,0.6,2.1,0.8C46.5,32.8,44.7,32.9,44.7,32.9z"/>
</svg>

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB