From 56324735f2b54f051740db82e33fc186b60df321 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Fri, 26 Jul 2013 12:46:09 +0000 Subject: [PATCH] 2013-07-26 Miguel de Dios * operation/agentes/networkmap.dinamic.php: added default zoom buttom. * images/zoom_default.svg: the default buttom. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8584 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 7 +++ pandora_console/images/zoom_default.svg | 21 +++++++++ .../operation/agentes/networkmap.dinamic.php | 43 +++++++++++++++++-- 3 files changed, 68 insertions(+), 3 deletions(-) create mode 100644 pandora_console/images/zoom_default.svg diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 62a817223d..d6bcf85b72 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2013-07-26 Miguel de Dios + + * operation/agentes/networkmap.dinamic.php: added default zoom + buttom. + + * images/zoom_default.svg: the default buttom. + 2013-07-26 Miguel de Dios * include/functions_networkmap.php, diff --git a/pandora_console/images/zoom_default.svg b/pandora_console/images/zoom_default.svg new file mode 100644 index 0000000000..2e50c1505d --- /dev/null +++ b/pandora_console/images/zoom_default.svg @@ -0,0 +1,21 @@ + + + + D + + diff --git a/pandora_console/operation/agentes/networkmap.dinamic.php b/pandora_console/operation/agentes/networkmap.dinamic.php index 0d506c8958..2efbba7b27 100755 --- a/pandora_console/operation/agentes/networkmap.dinamic.php +++ b/pandora_console/operation/agentes/networkmap.dinamic.php @@ -43,6 +43,14 @@ $graph = networkmap_generate_hash(__('Pandora FMS'), $group, $simple, html_debug_print($graph, true); networkmap_print_jsdata($graph); +$zoom_default = file($config['homedir'] . '/images/zoom_default.svg'); +?> +
+ +
+'; @@ -111,7 +119,23 @@ var svg = d3.select("#dinamic_networkmap").append("svg") .attr("height", height) .attr("pointer-events", "all") .call(zoom_obj) - .append('svg:g'); + .append('svg:g') + + +///Added default zoom buttom +d3.select("#dinamic_networkmap svg") + .append("g") + .attr("id", "zoom_control"); + +zoom_default = $("#zoom_default").clone(); +$("#zoom_default").remove(); + +$("#zoom_control").append(zoom_default); + +d3.select("#zoom_default") + .on("click", click_zoom_default) + .on("mouseover", over_zoom_default) + .on("mouseout", out_zoom_default); force .nodes(graph.nodes) @@ -167,6 +191,14 @@ node.attr("cx", function(d) { return d.x; }) .attr("cy", function(d) { return d.y; }); }); +function click_zoom_default() { + zoom([0, 0], 1); +} +function over_zoom_default() { +} +function out_zoom_default() { +} + function over(d) { $("#node_" + d.id).attr('class', 'select_node'); $.each($(".source_" + d.id), function(i, line) { @@ -222,6 +254,13 @@ function zoom(translate_param, scale_param) { scale = d3.event.scale; translate = d3.event.translate; } + else { + translate = translate_param; + scale = scale_param; + + zoom_obj.setScale(scale); + zoom_obj.setTranslate(translate); + } svg.attr("transform", "translate(" + translate + ")scale(" + scale + ")"); } @@ -276,8 +315,6 @@ function show_tooltip(d) { create_tooltip(d, x, y); - console.log(d.id); - graph.nodes[d.id].tooltip_content = data; graph.nodes[d.id].default_tooltip = 0; $("#tooltip_networkmap").html(data);