tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

New maps in progress... (Fixed fake arrows and non necessary tooltips)

Browse Source
This commit is contained in:
Arturo Gonzalez 2016-04-18 13:40:44 +02:00
parent 3cae98989c
commit 2831607723
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1547,7 +1547,9 @@ MapController.prototype.events_for_nodes = function(id_node) {
if (d3.event.defaultPrevented) return; if (d3.event.defaultPrevented) return;
self.tooltip_map_create(self, this); if ((d['type'] == ITEM_TYPE_AGENT_NETWORKMAP) || (d['type'] == ITEM_TYPE_MODULE_NETWORKMAP)) {
self.tooltip_map_create(self, this);
}
}) })
.on("contextmenu", d3.contextMenu(node_menu, function(node) { .on("contextmenu", d3.contextMenu(node_menu, function(node) {
self._last_event = "contextmenu"; self._last_event = "contextmenu";

23
pandora_console/include/javascript/map/NetworkmapController.js
View File

@ -70,6 +70,7 @@ NetworkmapController.prototype.init_map = function() {
} }
}); });
} }
if (filter['show_modules']) { if (filter['show_modules']) {
if (filter['show_module_group']) { if (filter['show_module_group']) {
var arrow_GM = self.get_arrow_GM(edge['to'], edge['from']); var arrow_GM = self.get_arrow_GM(edge['to'], edge['from']);
@ -90,7 +91,9 @@ NetworkmapController.prototype.init_map = function() {
var arrow_AM = self.get_arrow_AM(edge['to'], edge['from']); var arrow_AM = self.get_arrow_AM(edge['to'], edge['from']);
if (arrow_AM !== null) { if (arrow_AM !== null) {
if (!self.exists_arrow(clean_arrows, arrow_AM)) { if (!self.exists_arrow(clean_arrows, arrow_AM)) {
clean_arrows.push(arrow_AM); if (!self.fake_arrow_AM(arrow_AM)) {
clean_arrows.push(arrow_AM);
}
} }
} }
} }
@ -134,6 +137,22 @@ NetworkmapController.prototype.init_map = function() {
MapController.prototype.init_map.call(this); MapController.prototype.init_map.call(this);
}; };
/**
* Function fake_arrow_AM
* Return bool
* This function returns if the AM arrow is a fake arrow
*/
NetworkmapController.prototype.fake_arrow_AM = function(arrow_AM) {
var agent_to = parseInt(arrow_AM['to']['id_agent']);
var agent_from = parseInt(arrow_AM['from']['id_agent']);
if (agent_to == agent_from) {
return false;
}
else {
return true;
}
}
/** /**
* Function filter_only_agents * Function filter_only_agents
* Return void * Return void
@ -2274,7 +2293,7 @@ NetworkmapController.prototype.editNode = function(target) {
$("#edit_node_dialog_" + node_id).append(data); $("#edit_node_dialog_" + node_id).append(data);
$("#edit_node_dialog_" + node_id).dialog({ $("#edit_node_dialog_" + node_id).dialog({
autoOpen: false, autoOpen: false,
closeOnEscape: true closeOnEscape: true
}); });
$("#edit_node_dialog_" + node_id).dialog("open"); $("#edit_node_dialog_" + node_id).dialog("open");