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

Fixed z_dash(zoom) in networkmap 

Former-commit-id: 2d19cd9234717cd5066d2ddd7094d367262ed1c4
This commit is contained in:
Daniel Maya 2019-03-11 16:57:54 +01:00
parent 5f7680f4ee
commit ccb41f1b68
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pandora_console/include/class/NetworkMap.class.php
View File

@ -309,11 +309,20 @@ class NetworkMap
////////////////////////////////////////////////////////////////////
var url_background_grid = "'.ui_get_full_url('images/background_grid.png').'";
var networkmap_id = '.$this->idMap.";\n";
if (!empty($networkmap['filter'])) {
if (empty($networkmap['filter']['x_offs'])) {
$output .= "var x_offs =null;\n";
} else {
$output .= 'var x_offs ='.$networkmap['filter']['x_offs'].";\n";
}
if (!empty($map_dash_details)) {
$output .= 'var x_offs = '.$map_dash_details['x_offs'].";\n";
$output .= 'var y_offs = '.$map_dash_details['y_offs'].";\n";
$output .= 'var z_dash = '.$map_dash_details['z_dash'].";\n";
if (empty($networkmap['filter']['y_offs'])) {
$output .= "var y_offs =null;\n";
} else {
$output .= 'var y_offs ='.$networkmap['filter']['y_offs'].";\n";
}
$output .= 'var z_dash = '.$networkmap['filter']['z_dash'].";\n";
} else {
$output .= "var x_offs = null;\n";
$output .= "var y_offs = null;\n";

8
pandora_console/operation/agentes/pandora_networkmap.php
View File

@ -244,8 +244,8 @@ if ($new_networkmap || $save_networkmap) {
$node_radius = (int) get_parameter('node_radius', 40);
$description = get_parameter('description', '');
$offset_x = get_parameter('pos_x');
$offset_y = get_parameter('pos_y');
$offset_x = get_parameter('pos_x', 0);
$offset_y = get_parameter('pos_y', 0);
$scale_z = get_parameter('scale_z', 0.5);
$node_sep = get_parameter('node_sep', '0.25');
@ -421,8 +421,8 @@ else if ($update_networkmap || $copy_networkmap || $delete) {
$source = (string) get_parameter('source', 'group');
$offset_x = get_parameter('pos_x');
$offset_y = get_parameter('pos_y');
$offset_x = get_parameter('pos_x', 0);
$offset_y = get_parameter('pos_y', 0);
$scale_z = get_parameter('scale_z', 0.5);
$values = [];