tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 08:14:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

New maps in progress... (Fixing arrow position)

Browse Source
This commit is contained in:
Arturo Gonzalez 2016-03-07 09:47:35 +01:00
parent 843d398c0b
commit b3e015740e
1 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -385,7 +385,8 @@ function arrow_by_pieces(target, id_arrow, id_node_to, id_node_from, wait) {
//~ console.log("centro", c_elem2, c_elem1); //~ console.log("centro", c_elem2, c_elem1);
var distance = get_distance_between_point(c_elem1, c_elem2); var distance = get_distance_between_point(c_elem1, c_elem2);
//~ console.log("distance", distance); //~ console.log("distance", distance);
var radius_to = parseInt(d3.select("#" + id_node_to).select("circle").attr("r"));
var radius_from = parseInt(d3.select("#" + id_node_from).select("circle").attr("r"));
var transform = d3.transform(); var transform = d3.transform();
/*---------------------------------------------*/ /*---------------------------------------------*/
@ -396,14 +397,32 @@ function arrow_by_pieces(target, id_arrow, id_node_to, id_node_from, wait) {
var arrow_body_height = (arrow_body_b['height'] + arrow_body_b['y']); var arrow_body_height = (arrow_body_b['height'] + arrow_body_b['y']);
var arrow_body_width = (arrow_body_b['width'] + arrow_body_b['x']); var arrow_body_width = (arrow_body_b['width'] + arrow_body_b['x']);
console.log("arrow_body_b", arrow_body_b); console.log("c_elem1 (FROM)", c_elem1);
console.log("c_elem2 (TO)", c_elem2);
transform.translate[0] = c_elem1[0]; if (c_elem1[0] < c_elem2[0]) {
transform.translate[1] = c_elem1[1]; transform.translate[0] = c_elem1[0] + radius_from;
transform.translate[1] = c_elem1[1] - (arrow_body_height/2);
transform.rotate = get_angle_of_line(c_elem1, c_elem2) + transform.rotate = get_angle_of_line(c_elem1, c_elem2) +
" 0 " + (arrow_body_height / 2); " 0 " + (arrow_body_height / 2);
}
else if (c_elem1[0] > c_elem2[0]) {
transform.translate[0] = c_elem1[0] - radius_from;
transform.translate[1] = c_elem1[1] - (arrow_body_height/2);
transform.rotate = get_angle_of_line(c_elem1, c_elem2) +
" 0 " + (arrow_body_height / 2);
}
else if (c_elem1[1] < c_elem2[1]) {
transform.translate[0] = c_elem1[0] + radius_from;
transform.translate[1] = c_elem1[1] - (arrow_body_height/2);
transform.rotate = get_angle_of_line(c_elem1, c_elem2) +
" 0 " + (arrow_body_height / 2);
}
else if (c_elem1[1] > c_elem2[1]) {
transform.translate[0] = c_elem1[0] - radius_from;
transform.translate[1] = c_elem1[1] - (arrow_body_height/2);
transform.rotate = get_angle_of_line(c_elem1, c_elem2) +
" 0 " + (arrow_body_height / 2);
}
arrow_layout.attr("transform", transform.toString()); arrow_layout.attr("transform", transform.toString());
/*---------------------------------------------*/ /*---------------------------------------------*/
@ -414,7 +433,7 @@ function arrow_by_pieces(target, id_arrow, id_node_to, id_node_from, wait) {
var arrow_head_height = (arrow_head_b['height'] + arrow_head_b['y']); 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 arrow_head_width = (arrow_head_b['width'] + arrow_head_b['x']);
var body_width = distance - arrow_head_width; var body_width = distance - arrow_head_width - radius_to - radius_from;
transform = d3.transform(); transform = d3.transform();
transform.scale[0] = body_width / arrow_body_width; transform.scale[0] = body_width / arrow_body_width;