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

Fixd lines in visual console (view section). Ticket#2741

This commit is contained in:
Arturo Gonzalez Diaz 2015-09-21 13:42:21 +02:00
parent 3df4b3d9f5
commit 609c0791b7
2 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/godmode/reporting/visual_console_builder.editor.php
View File

@ -104,7 +104,7 @@ foreach ($layoutDatas as $layoutData) {
switch ($layoutData['type']) {
case LINE_ITEM:
visual_map_print_user_line_handles($layoutData);
visual_map_print_user_lines("write", $layoutData);
visual_map_print_user_lines($layoutData);
break;
default:
visual_map_print_item("write", $layoutData);

38
pandora_console/include/functions_visual_map.php
View File

@ -1708,9 +1708,18 @@ function visual_map_get_status_element($layoutData) {
return $status;
}
function visual_map_print_user_lines($mode = "read", $layout_data, $proportion = null) {
if (!empty($proportion)) {
function visual_map_print_user_lines($layout_data, $proportion = null) {
if (empty($proportion)) {
$line = array();
$line["id"] = $layout_data['id'];
$line["start_x"] = $layout_data['pos_x'];
$line["start_y"] = $layout_data['pos_y'];
$line["end_x"] = $layout_data['width'];
$line["end_y"] = $layout_data['height'];
$line["line_width"] = $layout_data['border_width'];
$line["line_color"] = $layout_data['border_color'];
}
else {
$proportion_width = $proportion['proportion_width'];
$proportion_height = $proportion['proportion_height'];
@ -1718,17 +1727,17 @@ function visual_map_print_user_lines($mode = "read", $layout_data, $proportion =
if ($proportion_width > $proportion_height) {
$proportion_line = $proportion_width;
}
$line = array();
$line["id"] = $layout_data['id'];
$line["start_x"] = $layout_data['pos_x'] * $proportion_width;
$line["start_y"] = $layout_data['pos_y'] * $proportion_height;
$line["end_x"] = $layout_data['width'] * $proportion_width;
$line["end_y"] = $layout_data['height'] * $proportion_height;
$line["line_width"] = $layout_data['border_width'] * $proportion_line;
$line["line_color"] = $layout_data['border_color'];
}
$line = array();
$line["id"] = $layout_data['id'];
$line["start_x"] = $layout_data['pos_x'] * $proportion_width;
$line["start_y"] = $layout_data['pos_y'] * $proportion_height;
$line["end_x"] = $layout_data['width'] * $proportion_width;
$line["end_y"] = $layout_data['height'] * $proportion_height;
$line["line_width"] = $layout_data['border_width'] * $proportion_line;
$line["line_color"] = $layout_data['border_color'];
echo '<script type="text/javascript">';
echo '$(document).ready (function() {
user_lines.push(' . json_encode($line) . ');
@ -1889,8 +1898,7 @@ function visual_map_print_visual_map ($id_layout, $show_links = true,
switch ($layout_data['type']) {
case LINE_ITEM:
visual_map_print_user_lines("read", $layout_data,
$proportion);
visual_map_print_user_lines($layout_data, $proportion);
break;
default:
visual_map_print_item("read", $layout_data,