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

New networkmaps in progress... (Fixed some errors and added new images to map)

This commit is contained in:
Arturo Gonzalez 2016-10-11 15:01:55 +02:00
parent 7dc8feb07c
commit 53b0934c3e
4 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
pandora_console/images/icono_delete_networkmaps.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 869 B

BIN
pandora_console/images/icono_refresh_networkmaps.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 999 B

2
pandora_console/include/functions_pandora_networkmap.php
View File

@ -1241,7 +1241,7 @@ function show_networkmap($id = 0, $user_readonly = false, $nodes_and_relations =
echo '<div id="hide_labels" style="position: absolute; right: 10px; top: 10px;">
<a title="' . __('Hide Labels') . '" href="javascript: hide_labels();">
<img id="image_hide_show_labels" src="images/delete.png" />
<img id="image_hide_show_labels" src="images/icono_delete_networkmaps.png" />
</a>
</div>';

44
pandora_console/include/javascript/functions_pandora_networkmap.js
View File

@ -23,8 +23,14 @@ function draw_minimap() {
context_minimap.beginPath();
//Paint the item
center_orig_x = (value.x + value.image_width / 4) * relation_min_nodes + minimap_w / relation_minimap_w;
center_orig_y = (value.y + value.image_height / 4) * relation_min_nodes + minimap_h / relation_minimap_h;
if (graph.nodes.length > 100) {
center_orig_x = (value.x + value.image_width / 4) * relation_min_nodes + minimap_w / relation_minimap_w;
center_orig_y = (value.y + value.image_height / 4) * relation_min_nodes + minimap_h / relation_minimap_h;
}
else {
center_orig_x = (value.x + value.image_width / 2) * relation_min_nodes;
center_orig_y = (value.y + value.image_height / 2) * relation_min_nodes;
}
context_minimap.arc(center_orig_x,
center_orig_y, 2, 0, Math.PI * 2, false);
@ -38,15 +44,27 @@ function draw_minimap() {
context_minimap.fill();
});
//Draw the rect of viewport
context_minimap.beginPath();
context_minimap.strokeStyle = "#3f3f3f";
context_minimap.strokeRect(
(-translation[0] / scale) * relation_min_nodes + minimap_w / relation_minimap_w,
(-translation[1] / scale) * relation_min_nodes + minimap_h / relation_minimap_h,
width_svg * relation_min_nodes / scale,
height_svg * relation_min_nodes / scale);
if (graph.nodes.length > 100) {
//Draw the rect of viewport
context_minimap.beginPath();
context_minimap.strokeStyle = "#3f3f3f";
context_minimap.strokeRect(
(-translation[0] / scale) * relation_min_nodes + minimap_w / relation_minimap_w,
(-translation[1] / scale) * relation_min_nodes + minimap_h / relation_minimap_h,
width_svg * relation_min_nodes / scale,
height_svg * relation_min_nodes / scale);
}
else {
//Draw the rect of viewport
context_minimap.beginPath();
context_minimap.strokeStyle = "#f00";
context_minimap.strokeRect(
(-translation[0] / scale) * relation_min_nodes,
(-translation[1] / scale) * relation_min_nodes,
width_svg * relation_min_nodes / scale,
height_svg * relation_min_nodes / scale);
}
context_minimap.beginPath();
context_minimap.strokeStyle = "#82B92E";
context_minimap.strokeRect(
@ -895,7 +913,7 @@ function hide_labels_function() {
//Change the image arrow
$("#hide_labels > a").attr("title", "Show Labels");
$("#image_hide_show_labels").attr("src", "images/refresh.png");
$("#image_hide_show_labels").attr("src", "images/icono_refresh_networkmaps.png");
d3.selectAll(".node_text").style("display", "none");
}
@ -905,7 +923,7 @@ function show_labels_function() {
console.log("PINTA");
//Change the image arrow
$("#hide_labels > a").attr("title", "Hide Labels");
$("#image_hide_show_labels").attr("src", "images/delete.png");
$("#image_hide_show_labels").attr("src", "images/icono_delete_networkmaps.png");
d3.selectAll(".node_text").style("display", "");
}