diff --git a/pandora_console/images/icono_delete_networkmaps.png b/pandora_console/images/icono_delete_networkmaps.png new file mode 100644 index 0000000000..30fd5f8b13 Binary files /dev/null and b/pandora_console/images/icono_delete_networkmaps.png differ diff --git a/pandora_console/images/icono_refresh_networkmaps.png b/pandora_console/images/icono_refresh_networkmaps.png new file mode 100644 index 0000000000..3a749dde59 Binary files /dev/null and b/pandora_console/images/icono_refresh_networkmaps.png differ diff --git a/pandora_console/include/functions_pandora_networkmap.php b/pandora_console/include/functions_pandora_networkmap.php index 9d33bf2a09..0d26031172 100644 --- a/pandora_console/include/functions_pandora_networkmap.php +++ b/pandora_console/include/functions_pandora_networkmap.php @@ -1241,7 +1241,7 @@ function show_networkmap($id = 0, $user_readonly = false, $nodes_and_relations = echo '
'; diff --git a/pandora_console/include/javascript/functions_pandora_networkmap.js b/pandora_console/include/javascript/functions_pandora_networkmap.js index f73bd08543..3ccbe8000a 100644 --- a/pandora_console/include/javascript/functions_pandora_networkmap.js +++ b/pandora_console/include/javascript/functions_pandora_networkmap.js @@ -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", ""); }