From c20f8ff4651ab35f96e1811f9bac3c0d659a7bba Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Wed, 23 Mar 2016 11:35:21 +0100 Subject: [PATCH] Working in the drag and drop of arrows. --- pandora_console/include/javascript/map/MapController.js | 5 +---- .../include/javascript/map/NetworkmapController.js | 9 ++------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/pandora_console/include/javascript/map/MapController.js b/pandora_console/include/javascript/map/MapController.js index 35fb98a347..f16400ce83 100644 --- a/pandora_console/include/javascript/map/MapController.js +++ b/pandora_console/include/javascript/map/MapController.js @@ -819,7 +819,7 @@ MapController.prototype.move_arrow = function (id_from_any_point_arrow) { var id_node_to = "node_" + d3.select(this).attr("data-to"); var id_node_from = "node_" + d3.select(this).attr("data-from"); - self.arrow_by_pieces(self._target + " svg", id_arrow, id_node_to, id_node_from, 0); + self.arrow_by_pieces(self._target + " svg", d, 0); }); } @@ -1670,8 +1670,6 @@ MapController.prototype.nodeData = function(data_id, type, id_map, data_graph_id MapController.prototype.arrow_by_pieces = function(target, arrow_data, wait) { var self = this; - console.log("MapController.arrow_by_pieces", target, arrow_data, wait); - if (typeof(wait) === "undefined") wait = 1; @@ -1928,4 +1926,3 @@ function get_radius_element(element) { return Math.sqrt( Math.pow(size[0] / 2, 2) + Math.pow(size[1] / 2, 2)); } - diff --git a/pandora_console/include/javascript/map/NetworkmapController.js b/pandora_console/include/javascript/map/NetworkmapController.js index 85d6de5d48..346f2295e7 100644 --- a/pandora_console/include/javascript/map/NetworkmapController.js +++ b/pandora_console/include/javascript/map/NetworkmapController.js @@ -387,11 +387,7 @@ NetworkmapController.prototype.paint_arrows = function() { * This function creates the arrow */ function create_arrow(arrow_layouts) { - arrow_layouts.each(function(d) { - - console.log("create_arrow", d); - self.arrow_by_pieces(self._target + " svg", d); }); } @@ -401,10 +397,9 @@ NetworkmapController.prototype.paint_arrows = function() { NetworkmapController.prototype.arrow_by_pieces = function (target, arrow_data, wait) { var self = this; - console.log("NetworkmapController.arrow_by_pieces", arrow_data); - - if (typeof(wait) === "undefined") + if (typeof(wait) === "undefined") { wait = 1; + } switch (arrow_data['type']) { case 'AA':