tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 00:04:37 +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 11:05:31 +01:00
parent c75929d840
commit ab1d7f99fc
2 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pandora_console/include/class/Map.class.php
View File

@ -259,6 +259,22 @@ $this->nodes = json_decode('[
{ {
"graph_id": 403, "graph_id": 403,
"type": 2 "type": 2
},
{
"graph_id": 404,
"type": 2
},
{
"graph_id": 405,
"type": 2
},
{
"graph_id": 406,
"type": 2
},
{
"graph_id": 407,
"type": 2
} }
]', true); ]', true);
@ -268,16 +284,28 @@ $this->edges = json_decode(
{"to":"216","from":"214","graph_id":401}, {"to":"216","from":"214","graph_id":401},
{"to":"217","from":"214","graph_id":402}, {"to":"217","from":"214","graph_id":402},
{"to":"218","from":"214","graph_id":403} {"to":"218","from":"214","graph_id":403}
]', true); ]', true);
$this->edges = json_decode( $this->edges = json_decode(
'[ '[
{"to":"218","from":"214","graph_id":400}, {"to":"219","from":"214","graph_id":404},
{"to":"217","from":"214","graph_id":401}, {"to":"220","from":"214","graph_id":405},
{"to":"216","from":"214","graph_id":402}, {"to":"221","from":"214","graph_id":406},
{"to":"215","from":"214","graph_id":403} {"to":"222","from":"214","graph_id":407}
]', true); ]', true);
$this->edges = json_decode(
'[
{"to":"215","from":"214","graph_id":400},
{"to":"216","from":"214","graph_id":401},
{"to":"217","from":"214","graph_id":402},
{"to":"218","from":"214","graph_id":403},
{"to":"219","from":"214","graph_id":404},
{"to":"220","from":"214","graph_id":405},
{"to":"221","from":"214","graph_id":406},
{"to":"222","from":"214","graph_id":407}
]', true);
//~ $this->edges = json_decode('[{"to":"165","from":"166","graph_id":208}]', true); //~ $this->edges = json_decode('[{"to":"165","from":"166","graph_id":208}]', true);

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

@ -424,6 +424,12 @@ function arrow_by_pieces(target, id_arrow, id_node_to, id_node_from, wait) {
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 {
transform.translate[0] = c_elem1[0];
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());
/*---------------------------------------------*/ /*---------------------------------------------*/