From 37fe7a6601d69aca58556e9b8df95d7cb3ea8f36 Mon Sep 17 00:00:00 2001
From: mdtrooper <tres.14159@gmail.com>
Date: Tue, 17 May 2016 15:05:50 +0200
Subject: [PATCH] Some fixes in the arrows with interfaces.

---
 .../include/javascript/map/MapController.js      | 16 ++++++++++++----
 .../javascript/map/NetworkmapController.js       | 16 +++++++++++-----
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/pandora_console/include/javascript/map/MapController.js b/pandora_console/include/javascript/map/MapController.js
index af260de07d..951fde8be6 100644
--- a/pandora_console/include/javascript/map/MapController.js
+++ b/pandora_console/include/javascript/map/MapController.js
@@ -3284,8 +3284,16 @@ function get_size_element(element) {
 * This function returns the element radius
 */
 function get_radius_element(element) {
-	var size = get_size_element(element);
-	
-	return Math.sqrt(
-		Math.pow(size[0] / 2, 2) + Math.pow(size[1] / 2, 2));
+	// Hack for the circle items
+	if (!d3.select(element + " .layout_size_node circle").empty()) {
+		return parseFloat(
+			d3.select(element + " .layout_size_node circle").attr("r"));
+	}
+	else {
+		//~ var size = get_size_element(element);
+		var size = get_size_element(element + " .layout_size_node");
+		
+		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 d061f220b7..f66e756772 100644
--- a/pandora_console/include/javascript/map/NetworkmapController.js
+++ b/pandora_console/include/javascript/map/NetworkmapController.js
@@ -904,9 +904,15 @@ NetworkmapController.prototype.paint_node = function(g_node, node) {
 		.attr("data-status", node['status'])
 		.attr("data-status_color", node['color']);
 	
+	var d3_node_icon = d3_node.append("g")
+		.attr("class", "icon")
+		.attr("class", "layout_size_node");
+	var d3_node_title_layout = d3_node.append("g")
+		.attr("class", "title");
+	
 	switch (node['shape']) {
 		case 'square':
-			d3_node.append("rect")
+			d3_node_icon.append("rect")
 				.attr("height", node['height'])
 				.attr("width", node['width'])
 				.attr("x", 0)
@@ -915,7 +921,7 @@ NetworkmapController.prototype.paint_node = function(g_node, node) {
 				.style("stroke-width", 1);
 			break;
 		case 'circle':
-			d3_node.append("circle")
+			d3_node_icon.append("circle")
 				.attr("r", node['width'] / 2)
 				.attr("transform", "translate(" +
 					node['width'] / 2 + " " +
@@ -924,7 +930,7 @@ NetworkmapController.prototype.paint_node = function(g_node, node) {
 				.style("stroke-width", 1);
 			break;
 		case 'rhombus':
-			d3_node.append("rect")
+			d3_node_icon.append("rect")
 				.attr("transform",
 					"rotate(45 " + (node['width'] / 2) + " " + (node['height'] / 2) + " )")
 				.attr("height", node['height'])
@@ -937,7 +943,7 @@ NetworkmapController.prototype.paint_node = function(g_node, node) {
 	}
 	
 	// Title
-	var d3_node_title = d3_node.append("text");
+	var d3_node_title = d3_node_title_layout.append("text");
 	
 	d3_node_title
 		.text(node['title'])
@@ -962,7 +968,7 @@ NetworkmapController.prototype.paint_node = function(g_node, node) {
 	d3_node
 		.style("fill", node['color']);
 	
-	d3_node
+	d3_node_icon
 		.append("image")
 		.attr("xlink:href", node['image'])
 		.attr("x", NODE_IMAGE_PADDING)