diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js index 7b93785caa..31adf44604 100755 --- a/pandora_console/godmode/reporting/visual_console_builder.editor.js +++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js @@ -54,6 +54,8 @@ function visual_map_main() { //Fixed to wait the load of images. $(window).load(function() { draw_lines(lines, 'background', true); + + draw_user_lines("", 0, 0, 0 , 0, 0, true); } ); @@ -384,7 +386,7 @@ function create_button_palette_callback() { } } -function draw_user_lines(color, thickness, start_x, start_y , end_x, end_y) { +function draw_user_lines(color, thickness, start_x, start_y , end_x, end_y, only_defined_lines) { obj_js_user_lines.clear(); @@ -401,9 +403,16 @@ function draw_user_lines(color, thickness, start_x, start_y , end_x, end_y) { } - obj_js_user_lines.setStroke(thickness); - obj_js_user_lines.setColor(color); - obj_js_user_lines.drawLine(start_x, start_y, end_x, end_y); + + if (typeof(only_defined_lines) == "undefined") { + only_defined_lines = false; + } + + if (only_defined_lines) { + obj_js_user_lines.setStroke(thickness); + obj_js_user_lines.setColor(color); + obj_js_user_lines.drawLine(start_x, start_y, end_x, end_y); + } obj_js_user_lines.paint(); } diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.php b/pandora_console/godmode/reporting/visual_console_builder.editor.php old mode 100644 new mode 100755 index dea56b88d8..f3129d14d7 --- a/pandora_console/godmode/reporting/visual_console_builder.editor.php +++ b/pandora_console/godmode/reporting/visual_console_builder.editor.php @@ -85,8 +85,16 @@ foreach ($layoutDatas as $layoutData) { if ($delete_pending_module == 1 || $disabled_module == 1) continue; + switch ($layoutData['type']) { + case LINE_ITEM: + visual_map_print_user_lines("write", $layoutData); + break; + default: + visual_map_print_item("write", $layoutData); + break; + } + - visual_map_print_item("write", $layoutData); html_print_input_hidden('status_' . $layoutData['id'], $layoutData['status_calculated']); diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php index afe423d3f6..4d8a103050 100755 --- a/pandora_console/include/functions_visual_map.php +++ b/pandora_console/include/functions_visual_map.php @@ -928,7 +928,8 @@ function visual_map_print_item($mode = "read", $layoutData, //Add the line between elements. if ($layoutData['parent_item'] != 0) { - $parent = db_get_row_filter('tlayout_data', array('id' => $layoutData['parent_item'])); + $parent = db_get_row_filter('tlayout_data', + array('id' => $layoutData['parent_item'])); echo ''; +} + /** * Prints visual map * @@ -1741,8 +1760,16 @@ function visual_map_print_visual_map ($id_layout, $show_links = true, continue; } - visual_map_print_item("read", $layout_data, - $proportion, $show_links); + switch ($layout_data['type']) { + case LINE_ITEM: + visual_map_print_user_lines("read", $layout_data, + $proportion); + break; + default: + visual_map_print_item("read", $layout_data, + $proportion, $show_links); + break; + } } // End main div @@ -1759,9 +1786,12 @@ function visual_map_print_visual_map ($id_layout, $show_links = true, var lines = Array(); + var user_lines = Array(); + //Fixed to wait the load of images. $(window).load(function() { draw_lines(lines, 'background'); + draw_user_lines_read(); } ); /* ]]> */ diff --git a/pandora_console/include/javascript/pandora_visual_console.js b/pandora_console/include/javascript/pandora_visual_console.js index 45d0b434ed..aa79c4c46f 100755 --- a/pandora_console/include/javascript/pandora_visual_console.js +++ b/pandora_console/include/javascript/pandora_visual_console.js @@ -123,3 +123,25 @@ function refresh_lines (lines, id_div, editor) { delete_lines (id_div); draw_lines (lines, id_div, editor); } + + +function draw_user_lines_read() { + var obj_js_user_lines = new jsGraphics("background"); + + obj_js_user_lines.clear(); + + // Draw the previous lines + for (iterator = 0; iterator < user_lines.length; iterator++) { + console.log(user_lines[iterator]); + obj_js_user_lines.setStroke(parseInt(user_lines[iterator]['line_width'])); + obj_js_user_lines.setColor(user_lines[iterator]['line_color']); + obj_js_user_lines.drawLine( + parseInt(user_lines[iterator]['start_x']), + parseInt(user_lines[iterator]['start_y']), + parseInt(user_lines[iterator]['end_x']), + parseInt(user_lines[iterator]['end_y'])); + + } + + obj_js_user_lines.paint(); +} \ No newline at end of file