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

Working in the new elements for the visualmap. Ticket #1478

This commit is contained in:
mdtrooper 2014-11-24 17:52:28 +01:00
parent 97cda8f535
commit daf984967c
4 changed files with 77 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pandora_console/godmode/reporting/visual_console_builder.editor.js
View File

@ -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();
}

10
pandora_console/godmode/reporting/visual_console_builder.editor.php Normal file → Executable file
View File

@ -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']);

36
pandora_console/include/functions_visual_map.php
View File

@ -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 '<script type="text/javascript">';
echo '$(document).ready (function() {
@ -1631,6 +1632,24 @@ function visual_map_get_status_element($layoutData) {
return $status;
}
function visual_map_print_user_lines($mode = "read", $layout_data, $proportion = 1) {
$line = array();
$line["id"] = $layout_data['id'];
$line["start_x"] = $layout_data['pos_x'] * $proportion;
$line["start_y"] = $layout_data['pos_y'] * $proportion;
$line["end_x"] = $layout_data['width'] * $proportion;
$line["end_y"] = $layout_data['height'] * $proportion;
$line["line_width"] = $layout_data['border_width'] * $proportion;
$line["line_color"] = $layout_data['border_color'];
echo '<script type="text/javascript">';
echo '$(document).ready (function() {
user_lines.push(' . json_encode($line) . ');
});';
echo '</script>';
}
/**
* 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();
}
);
/* ]]> */

22
pandora_console/include/javascript/pandora_visual_console.js
View File

@ -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();
}