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

Finish the relationship.

Browse Source
This commit is contained in:
mdtrooper 2016-04-01 11:36:22 +02:00
parent ed3cb1b50c
commit a879803322
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,6 +82,7 @@ MapController.prototype.init_map = function() {
self.remove_resize_square(); self.remove_resize_square();
if (!self._flag_multiple_selection) { if (!self._flag_multiple_selection) {
self.last_event = "zoom"; self.last_event = "zoom";
var zoom_level = d3.event.scale; var zoom_level = d3.event.scale;
@ -97,6 +98,7 @@ MapController.prototype.init_map = function() {
} }
else { else {
self.last_event = null; self.last_event = null;
// Reset the zoom and panning actual // Reset the zoom and panning actual
@ -1481,8 +1483,6 @@ MapController.prototype.init_events = function(principalObject) {
function(d) { function(d) {
if (!self._flag_multiple_selection) { if (!self._flag_multiple_selection) {
if (self.last_event != "zoom") { if (self.last_event != "zoom") {
self.remove_selection_nodes();
self.last_event = null; self.last_event = null;
if (self._relationship_in_progress) { if (self._relationship_in_progress) {
@ -1511,6 +1511,8 @@ MapController.prototype.init_events = function(principalObject) {
self.last_event = "relationship"; self.last_event = "relationship";
} }
self.remove_selection_nodes();
} }
else { else {
self.last_event = null; self.last_event = null;
@ -1565,6 +1567,10 @@ MapController.prototype.init_events = function(principalObject) {
d3.event.sourceEvent.preventDefault(); d3.event.sourceEvent.preventDefault();
} }
if (self._relationship_in_progress) {
return;
}
if ($("#node_" + d['graph_id']).hasClass("tooltipstered")) { if ($("#node_" + d['graph_id']).hasClass("tooltipstered")) {
$("#node_" + d['graph_id']).tooltipster('destroy'); $("#node_" + d['graph_id']).tooltipster('destroy');
} }
@ -1811,11 +1817,10 @@ MapController.prototype.apply_temp_arrows = function(target_id) {
self.make_arrow(target_id, node.graph_id); self.make_arrow(target_id, node.graph_id);
break; break;
} }
}); });
self.remove_temp_arrows();
self.paint_arrows();
} }
MapController.prototype.make_arrow = function(from_id, to_id) { MapController.prototype.make_arrow = function(from_id, to_id) {
@ -1832,7 +1837,12 @@ MapController.prototype.get_status_selection_node = function(id_node) {
var status = d3.select(self._target + " #node_" + id_node) var status = d3.select(self._target + " #node_" + id_node)
.attr("data-select"); .attr("data-select");
return status.split(" "); if (status == null) {
return [];
}
else {
return status.split(" ");
}
} }
/** /**

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

@ -438,8 +438,11 @@ NetworkmapController.prototype.arrow_by_pieces = function (target, arrow_data, w
NetworkmapController.prototype.make_arrow = function(from_id, to_id) { NetworkmapController.prototype.make_arrow = function(from_id, to_id) {
var edge = {}; var edge = {};
edge['from'] = from_id;
edge['to'] = to_id;
edge['graph_id'] = from_id + "" + to_id;
console.log(from_id, to_id); edges.push(edge);
} }
/** /**