tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 08:45:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Some changes that we need.

Browse Source
This commit is contained in:
mdtrooper 2016-02-22 13:02:06 +01:00
parent 646a90211e
commit e7b664dd63
2 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pandora_console/include/class/Networkmap.class.php
View File

@ -67,6 +67,7 @@ class Networkmap extends Map {
$nodes = array(); $nodes = array();
$edges = array(); $edges = array();
$last_graph_id = 0;
foreach ($nodes_and_edges as $node_or_edge) { foreach ($nodes_and_edges as $node_or_edge) {
$node_or_edge = trim($node_or_edge); $node_or_edge = trim($node_or_edge);
@ -104,10 +105,15 @@ class Networkmap extends Map {
$type = ITEM_TYPE_AGENT_NETWORKMAP; $type = ITEM_TYPE_AGENT_NETWORKMAP;
} }
$nodes[$graphviz_id] = array('id' => $id, 'type' => $type); $nodes[] = array('graph_id' => $graphviz_id,
'id' => $id, 'type' => $type);
$last_graph_id = $graphviz_id;
} }
} }
foreach ($positions as $line) { foreach ($positions as $line) {
//clean line a long spaces for one space caracter //clean line a long spaces for one space caracter
$line = preg_replace('/[ ]+/', ' ', $line); $line = preg_replace('/[ ]+/', ' ', $line);
@ -116,20 +122,29 @@ class Networkmap extends Map {
$items = explode(' ', $line); $items = explode(' ', $line);
$graphviz_id = $items[1]; $graphviz_id = $items[1];
$nodes[$graphviz_id]['x'] = $items[2] * 100; //200 is for show more big // We need a binary tree...in some future time.
$nodes[$graphviz_id]['y'] = $items[3] * 100;
foreach ($nodes as $i => $node) {
if ($node['graph_id'] == $graphviz_id) {
$nodes[$i]['x'] = $items[2] * 100; //200 is for show more big
$nodes[$i]['y'] = $items[3] * 100;
}
}
} }
} }
foreach ($nodes as $graphviz_id => $node) { foreach ($edges as $i => $edge) {
$this->nodes[$graphviz_id] = $node; $graph_id = $last_graph_id++;
$this->nodes[] = array(
'graph_id' => $graph_id,
'type' => ITEM_TYPE_EDGE_NETWORKMAP);
$edge[$i]['graph_id'] = $graph_id;
} }
foreach ($edges as $edge) { $this->nodes = $nodes;
$this->nodes[] = array('type' => ITEM_TYPE_EDGE_NETWORKMAP); $this->edges = $edges;
$edge['id_item'] = key(end($this->nodes));
$this->edges[] = $edge;
}
} }
protected function temp_parseParameters_generateDot() { protected function temp_parseParameters_generateDot() {

10
pandora_console/include/javascript/map/MapController.js
View File

@ -37,7 +37,8 @@ MapController.prototype.init_map = function() {
var viewport = svg var viewport = svg
.call(d3.behavior.zoom().scaleExtent([1/100, 100]).on("zoom", zoom)) .call(d3.behavior.zoom().scaleExtent([1/100, 100]).on("zoom", zoom))
.append("g"); .append("g")
.attr("class", "viewport");
function zoom() { function zoom() {
viewport viewport
@ -45,7 +46,7 @@ MapController.prototype.init_map = function() {
} }
this.paint_nodes(viewport); this.paint_nodes(viewport);
//~
//~ viewport.append("g").append("circle") //~ viewport.append("g").append("circle")
//~ .attr("id", "node_10") //~ .attr("id", "node_10")
//~ .attr("class", "node") //~ .attr("class", "node")
@ -148,12 +149,15 @@ Return void
This function manages mouse clicks and run events in consecuence This function manages mouse clicks and run events in consecuence
*/ */
MapController.prototype.click_event = function(event) { MapController.prototype.click_event = function(event) {
console.log(1111);
var self = event.data.map; var self = event.data.map;
event.preventDefault(); event.preventDefault();
event.stopPropagation(); event.stopPropagation();
switch (event.which) { switch (event.which) {
case 1: case 1:
console.log(2222);
if ($(event.currentTarget).hasClass("node")) { if ($(event.currentTarget).hasClass("node")) {
console.log(3333);
self.tooltip_map_create(self, event); self.tooltip_map_create(self, event);
} }
else { else {
@ -189,7 +193,7 @@ MapController.prototype.tooltip_map_create = function(self, event, close) {
offsetX: nodeR, offsetX: nodeR,
theme: 'tooltipster-noir', theme: 'tooltipster-noir',
multiple: true, multiple: true,
content: $('<span>I\'M A FUCKING TOOLTIP!!</span>') content: $('<span class="mierdaca">I\'M A FUCKING TOOLTIP!!</span>')
}); });
this._tooltipsID.push(node_id); this._tooltipsID.push(node_id);