tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed the arrow code.

This commit is contained in:
mdtrooper 2016-03-04 17:04:19 +01:00
parent 5714d3b60b
commit 843d398c0b
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/images/maps/body_arrow.svg
View File

@ -20,4 +20,10 @@ xmlns:xlink="http://www.w3.org/1999/xlink">
stroke-width: 20;" />
</symbol>
</defs>
<!--
<g class="body" transform="translate(100,0)">
<use xmlns:xlink="http://www.w3.org/1999/xlink"
xlink:href="#body_arrow" />
</g>
-->
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 478 B

After

Width:  |  Height:  |  Size: 619 B

15
pandora_console/include/javascript/map/MapController.js
View File

@ -393,13 +393,15 @@ function arrow_by_pieces(target, id_arrow, id_node_to, id_node_from, wait) {
/*---------------------------------------------*/
var arrow_body = arrow_layout.select(".body");
var arrow_body_b = arrow_body.node().getBBox();
var arrow_body_height = (arrow_body_b['height'] + arrow_body_b['y']);
var arrow_body_width = (arrow_body_b['width'] + arrow_body_b['x']);
console.log("arrow_body_b", arrow_body_b);
transform.translate[0] = c_elem1[0];
transform.translate[1] = c_elem1[1];
transform.rotate = get_angle_of_line(c_elem1, c_elem2) +
" 0 " + (arrow_body_b['height'] / 2);
" 0 " + (arrow_body_height / 2);
arrow_layout.attr("transform", transform.toString());
@ -407,14 +409,15 @@ function arrow_by_pieces(target, id_arrow, id_node_to, id_node_from, wait) {
/*---------------------------------------------*/
/*-------- Resize the body arrow width --------*/
/*---------------------------------------------*/
var arrow_body_b = arrow_body.node().getBBox();
var arrow_head = arrow_layout.select(".head");
var arrow_head_b = arrow_head.node().getBBox();
var arrow_head_height = (arrow_head_b['height'] + arrow_head_b['y']);
var arrow_head_width = (arrow_head_b['width'] + arrow_head_b['x']);
var body_width = distance - arrow_head_b['width'];
var body_width = distance - arrow_head_width;
transform = d3.transform();
transform.scale[0] = body_width / arrow_body_b['width'];
transform.scale[0] = body_width / arrow_body_width;
arrow_body.attr("transform", transform.toString());
@ -426,8 +429,8 @@ function arrow_by_pieces(target, id_arrow, id_node_to, id_node_from, wait) {
var arrow_body_t = d3.transform(arrow_body.attr("transform"));
var scale = arrow_body_t.scale[0];
var x = 0 + arrow_body_b['width'] * scale;
var y = 0 + (arrow_body_b['height'] / 2 - arrow_head_b['height'] / 2);
var x = 0 + arrow_body_width * scale;
var y = 0 + (arrow_body_height / 2 - arrow_head_height / 2);
transform.translate[0] = x;
transform.translate[1] = y;