From 536c11e5b514fd47cdfdd5faeaecbf4807a42e78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=B2=20Santilio?= <n.santilio97@gmail.com>
Date: Mon, 21 Dec 2020 18:56:55 +0100
Subject: [PATCH] update v0.4.6

---
 addons/easy_charts/BarChart/BarChart.gd       |   2 +-
 addons/easy_charts/PieChart/PieChart.tscn     |   9 +-
 addons/easy_charts/PieChart/pie_chart.gd      |   8 +-
 addons/easy_charts/RadarChart/RadarChart.tscn |  10 +-
 addons/easy_charts/RadarChart/radar_chart.gd  | 288 ++++++++++++++++++
 .../easy_charts/ScatterChart/ScatterChart.gd  |   2 +-
 addons/easy_charts/plugin.cfg                 |   2 +-
 7 files changed, 304 insertions(+), 17 deletions(-)
 create mode 100644 addons/easy_charts/RadarChart/radar_chart.gd

diff --git a/addons/easy_charts/BarChart/BarChart.gd b/addons/easy_charts/BarChart/BarChart.gd
index ffd0da4..80ac306 100644
--- a/addons/easy_charts/BarChart/BarChart.gd
+++ b/addons/easy_charts/BarChart/BarChart.gd
@@ -129,7 +129,7 @@ func _get_property_list():
 				},
 				{
 						"hint": PROPERTY_HINT_ENUM,
-						"hint_string": PoolStringArray(TemplatesNames.keys()).join(","),
+						"hint_string": PoolStringArray(Utilities.templatess.keys()).join(","),
 						"usage": PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_SCRIPT_VARIABLE,
 						"name": "Chart_Style/template",
 						"type": TYPE_INT
diff --git a/addons/easy_charts/PieChart/PieChart.tscn b/addons/easy_charts/PieChart/PieChart.tscn
index 1cf4ac8..348a2c7 100644
--- a/addons/easy_charts/PieChart/PieChart.tscn
+++ b/addons/easy_charts/PieChart/PieChart.tscn
@@ -53,10 +53,9 @@ __meta__ = {
 [node name="PointData" parent="." instance=ExtResource( 2 )]
 
 [node name="PointData" parent="PointData" index="0"]
-visible = false
-margin_left = -449.181
-margin_top = -266.881
-margin_right = -449.318
-margin_bottom = -266.082
+margin_left = -63.9924
+margin_top = -129.716
+margin_right = -64.0923
+margin_bottom = -128.916
 
 [editable path="PointData"]
diff --git a/addons/easy_charts/PieChart/pie_chart.gd b/addons/easy_charts/PieChart/pie_chart.gd
index fc233c5..efe2ed1 100644
--- a/addons/easy_charts/PieChart/pie_chart.gd
+++ b/addons/easy_charts/PieChart/pie_chart.gd
@@ -68,7 +68,7 @@ func _get_property_list():
 		},
 		{
 			"hint": PROPERTY_HINT_ENUM,
-			"hint_string": PoolStringArray(TemplatesNames.keys()).join(","),
+			"hint_string": PoolStringArray(Utilities.templates.keys()).join(","),
 			"usage": PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_SCRIPT_VARIABLE,
 			"name": "Chart_Style/template",
 			"type": TYPE_INT
@@ -91,7 +91,7 @@ func _ready():
 	pass
 
 func plot_placeholder() -> void:
-	datas = [
+	data = [
 		["United States",46],
 		["Great Britain",27],
 		["China",26],
@@ -106,7 +106,7 @@ func plot_placeholder() -> void:
 		Color.green,
 		Color.blue
 	]
-	plot_from_array(datas)
+	plot_from_array(data)
 
 func structure_datas(database: Array, are_values_columns: bool, x_values_index: int):
 	# @x_values_index can be either a column or a row relative to x values
@@ -213,7 +213,7 @@ var mouse_on_slice : bool = false
 func _input(event):
 	if event is InputEventMouseMotion:
 		for area_idx in range(areas.size()):
-			if Geometry.is_point_in_polygon(event.global_position, areas[area_idx]):
+			if Geometry.is_point_in_polygon(event.global_position - rect_position, areas[area_idx]):
 				mouse_on_slice = true
 				mouse_on_area = area_idx
 				show_slice_data(slices[area_idx])
diff --git a/addons/easy_charts/RadarChart/RadarChart.tscn b/addons/easy_charts/RadarChart/RadarChart.tscn
index f8388db..f9aee6b 100644
--- a/addons/easy_charts/RadarChart/RadarChart.tscn
+++ b/addons/easy_charts/RadarChart/RadarChart.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=4 format=2]
 
 [ext_resource path="res://addons/easy_charts/Utilities/Point/PointData.tscn" type="PackedScene" id=1]
-[ext_resource path="res://addons/easy_charts/RadarChart/RadarChart.gd" type="Script" id=2]
+[ext_resource path="res://addons/easy_charts/RadarChart/radar_chart.gd" type="Script" id=2]
 
 [sub_resource type="Theme" id=1]
 
@@ -77,10 +77,10 @@ __meta__ = {
 
 [node name="PointData" parent="PointData" index="0"]
 visible = false
-margin_left = 64.178
-margin_top = -142.43
-margin_right = 64.041
-margin_bottom = -141.631
+margin_left = -448.644
+margin_top = 721.085
+margin_right = -448.781
+margin_bottom = 721.884
 theme = SubResource( 1 )
 
 [editable path="PointData"]
diff --git a/addons/easy_charts/RadarChart/radar_chart.gd b/addons/easy_charts/RadarChart/radar_chart.gd
new file mode 100644
index 0000000..6f7bd29
--- /dev/null
+++ b/addons/easy_charts/RadarChart/radar_chart.gd
@@ -0,0 +1,288 @@
+tool
+extends Chart
+class_name RadarChart
+
+"""
+[RadarChart] - General purpose node for Radar Charts
+A radar chart is a graphical method of displaying multivariate data in the form 
+of a two-dimensional chart of three or more quantitative variables represented on axes 
+starting from the same point. The relative position and angle of the axes is typically 
+uninformative, but various heuristics, such as algorithms that plot data as the maximal 
+total area, can be applied to sort the variables (axes) into relative positions that reveal 
+distinct correlations, trade-offs, and a multitude of other comparative measures.
+
+/ source : Wikipedia /
+"""
+
+func _get_property_list():
+		return [
+				# Chart Properties
+				{
+						"hint": PROPERTY_HINT_NONE,
+						"usage": PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_SCRIPT_VARIABLE,
+						"name": "Chart_Properties/are_values_columns",
+						"type": TYPE_BOOL
+				},
+				{
+						"hint": PROPERTY_HINT_RANGE,
+						"hint_string": "-1,100,1",
+						"usage": PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_SCRIPT_VARIABLE,
+						"name": "Chart_Properties/labels_index",
+						"type": TYPE_INT
+				},
+				{
+						"hint": PROPERTY_HINT_RANGE,
+						"hint_string": "-1,100,1",
+						"usage": PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_SCRIPT_VARIABLE,
+						"name": "Chart_Properties/function_names_index",
+						"type": TYPE_INT
+				},
+				{
+						"hint": PROPERTY_HINT_NONE,
+						"usage": PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_SCRIPT_VARIABLE,
+						"name": "Chart_Properties/use_height_as_radius",
+						"type": TYPE_BOOL
+				},
+				{
+						"hint": PROPERTY_HINT_RANGE,
+						"hint_string": "0,2000",
+						"usage": PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_SCRIPT_VARIABLE,
+						"name": "Chart_Properties/radius",
+						"type": TYPE_REAL
+				},
+				
+				# Chart Display
+				{
+						"hint": PROPERTY_HINT_RANGE,
+						"hint_string": "0.1,100",
+						"usage": PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_SCRIPT_VARIABLE,
+						"name": "Chart_Display/full_scale",
+						"type": TYPE_REAL
+				},
+				
+				# Chart Style
+				{ 
+						"hint": 24, 
+						"hint_string": "%d/%d:%s"%[TYPE_INT, PROPERTY_HINT_ENUM,
+						PoolStringArray(PointShapes.keys()).join(",")],
+						"name": "Chart_Style/points_shape", 
+						"type": TYPE_ARRAY, 
+						"usage": PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_SCRIPT_VARIABLE
+				},
+				{
+						"hint": PROPERTY_HINT_NONE,
+						"usage": PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_SCRIPT_VARIABLE,
+						"name": "Chart_Style/function_colors",
+						"type": TYPE_COLOR_ARRAY
+				},
+				{
+						"hint": PROPERTY_HINT_NONE,
+						"usage": PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_SCRIPT_VARIABLE,
+						"name": "Chart_Style/outline_color",
+						"type": TYPE_COLOR
+				},
+				{
+						"hint": PROPERTY_HINT_NONE,
+						"usage": PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_SCRIPT_VARIABLE,
+						"name": "Chart_Style/grid_color",
+						"type": TYPE_COLOR
+				},
+				{
+						"class_name": "Font",
+						"hint": PROPERTY_HINT_RESOURCE_TYPE,
+						"hint_string": "Font",
+						"usage": PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_SCRIPT_VARIABLE,
+						"name": "Chart_Style/font",
+						"type": TYPE_OBJECT
+				},
+				{
+						"class_name": "Font",
+						"hint": PROPERTY_HINT_RESOURCE_TYPE,
+						"hint_string": "Font",
+						"usage": PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_SCRIPT_VARIABLE,
+						"name": "Chart_Style/bold_font",
+						"type": TYPE_OBJECT
+				},
+				{
+						"hint": PROPERTY_HINT_NONE,
+						"usage": PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_SCRIPT_VARIABLE,
+						"name": "Chart_Style/font_color",
+						"type": TYPE_COLOR
+				},
+				{
+						"hint": PROPERTY_HINT_ENUM,
+						"hint_string": PoolStringArray(Utilities.templates.keys()).join(","),
+						"usage": PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_SCRIPT_VARIABLE,
+						"name": "Chart_Style/template",
+						"type": TYPE_INT
+				},
+				{
+						"hint": PROPERTY_HINT_RANGE,
+						"hint_string": "0,360",
+						"usage": PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_SCRIPT_VARIABLE,
+						"name": "Chart_Modifiers/rotation",
+						"type": TYPE_REAL
+				},
+		]
+
+func structure_datas(database : Array, are_values_columns : bool, labels_index : int):
+	# @x_values_index can be either a column or a row relative to x values
+	# @y_values can be either a column or a row relative to y values
+	self.labels_index = labels_index
+	self.are_values_columns = are_values_columns
+	match are_values_columns:
+		true:
+			for row in database.size():
+				var t_row : Array = []
+				for column in database[row].size():
+					if row == labels_index:
+						if column == function_names_index:
+							pass
+						else:
+							x_labels.append(database[row][column])
+					else:
+						if column == function_names_index:
+							y_labels.append(database[row][column])
+						else:
+							if typeof(database[row][column]) == TYPE_INT or typeof(database[row][column]) == TYPE_REAL:
+								t_row.append(database[row][column] as float)
+							else:
+								t_row.append(database[row][column].replace(",", ".") as float)
+				if not t_row.empty():
+					x_datas.append(t_row)
+		false:
+			for row in database.size():
+				if row == function_names_index:
+					y_labels = database[row] as PoolStringArray
+				
+				var x_temp_datas : PoolRealArray = []
+				for column in database[row].size():
+					if column == labels_index:
+						x_labels.append(database[row][column] as String)
+					else:
+						x_temp_datas.append(database[row][column] as float)
+					x_datas.append(x_temp_datas)
+	
+	
+	if labels_index == -1 :
+			for data in x_datas[0].size():
+					x_labels.append("Element %s" % data)
+	
+	if function_names_index == -1 :
+			for data in x_datas.size():
+					y_labels.append("Function %s" % data)
+
+func build_chart():
+	SIZE = get_size()
+	origin = OFFSET + SIZE/2
+
+var radar_polygon : Array
+
+func calculate_pass() : 
+	var ordered_max : Array
+	for data in x_datas :
+		var ordered_data : Array = data.duplicate()
+		ordered_data.sort()
+		ordered_max.append(ordered_data.pop_back())
+	ordered_max.sort()
+	var max_value : float = ordered_max.pop_back()
+	var dist = full_scale * pow(10.0,str(max_value).length()-2)
+	var multi = 0
+	var value = dist * multi
+	x_chors.append(value as String)
+	while value < max_value:
+		multi+=1
+		value = dist * multi
+		x_chors.append(value as String)
+
+func calculate_coordinates():
+	for chor in x_chors.size():
+		var inner_polyline : PoolVector2Array
+		var scalar_factor : float = (x_chors[chor] as float/x_chors.back() as float)
+		for function in functions:
+			var angle : float =  ((2 * PI * function) / functions) - PI /2 + deg2rad(rotation)
+			var x_coordinate : float = (radius if (not use_height_as_radius and radius<SIZE.y/2) else SIZE.y/2) * scalar_factor * cos(angle) + origin.x
+			var y_coordinate : float = (radius if (not use_height_as_radius and radius<SIZE.y/2) else SIZE.y/2) * scalar_factor * sin(angle) + origin.y
+			inner_polyline.append(Vector2(x_coordinate, y_coordinate))
+		inner_polyline.append(inner_polyline[0])
+		radar_polygon.append(inner_polyline)
+	
+	for datas in x_datas:
+		var function_positions : PoolVector2Array
+		var function_values : Array
+		for data in datas.size():
+			var scalar_factor : float = datas[data] /( x_chors.back() as float)
+			var angle : float =  ((2 * PI * data) / datas.size()) - PI/2 + deg2rad(rotation)
+			var x_coordinate : float = (radius if (not use_height_as_radius and radius<SIZE.y/2) else SIZE.y/2) * scalar_factor * cos(angle) + origin.x
+			var y_coordinate : float = (radius if (not use_height_as_radius and radius<SIZE.y/2) else SIZE.y/2) * scalar_factor * sin(angle) + origin.y
+			function_positions.append(Vector2(x_coordinate,y_coordinate))
+			function_values.append([x_labels[data], datas[data]])
+		function_positions.append(function_positions[0])
+		point_positions.append(function_positions)
+		point_values.append(function_values)
+
+func _draw():
+		if Engine.editor_hint:
+				return
+		
+		clear_points()
+		draw_grid()
+		
+		for function in point_positions.size():
+				var function_color : Color = function_colors[function]
+				draw_polygon(point_positions[function], [Color(function_color.r, function_color.g, function_color.b, 0.2)],[],null,null,true)
+				draw_polyline(point_positions[function], function_color, 2,true)
+		
+		for _function in point_values.size():
+				var PointContainer : Control = Control.new()
+				Points.add_child(PointContainer)
+				
+				for function_point in point_values[_function].size():
+						var point : Point = point_node.instance()
+						point.connect("_point_pressed",self,"point_pressed")
+						point.connect("_mouse_entered",self,"show_data")
+						point.connect("_mouse_exited",self,"hide_data")
+						
+						point.create_point(points_shape[_function], function_colors[_function], 
+						Color.white, point_positions[_function][function_point], 
+						point.format_value(point_values[_function][function_point], false, false),
+						y_labels[_function])
+#			str("Function %s"%_function))
+						
+						PointContainer.add_child(point)
+
+func draw_grid():
+		for polyline in radar_polygon:
+				draw_polyline(polyline, grid_color, 1, true)
+				var text : String = x_chors[radar_polygon.find(polyline)] as String
+				draw_string(font, polyline[0] - Vector2(font.get_string_size(text).x/2,-5), text, font_color)
+		
+		if not radar_polygon.empty():
+				draw_polyline(radar_polygon[radar_polygon.size()-1], outline_color, 1, true)
+		
+		for label in x_labels.size():
+				var point_array : PoolVector2Array = radar_polygon[radar_polygon.size()-1]
+				draw_line(origin, point_array[label], grid_color, 1, true)
+				
+				if point_array[label].x != origin.x:
+						draw_string(font, point_array[label] - (Vector2(font.get_string_size(x_labels[label]).x+10,(5 if point_array[label].y <= origin.y else -10)) if point_array[label].x <= origin.x else - Vector2(10,(-5 if point_array[label].y <= origin.y else 10))), x_labels[label], font_color)
+				else:
+						draw_string(font, point_array[label] - (Vector2(font.get_string_size(x_labels[label]).x/2, 10) if point_array[label].y < origin.x else - Vector2(font.get_string_size(x_labels[label]).x/2, 5)), x_labels[label], font_color)
+
+func create_legend():
+		pass
+#	legend.clear()
+#	for function in functions:
+#		var function_legend = FunctionLegend.instance()
+#		var f_name : String = x_labels[function]
+#		var legend_font : Font
+#		if font != null:
+#			legend_font = font
+#		if bold_font != null:
+#			legend_font = bold_font
+#		function_legend.create_legend(f_name,function_colors[function],bold_font,font_color)
+#		legend.append(function_legend)
+
+func count_functions():
+		if x_labels.size():
+				functions = x_labels.size()
diff --git a/addons/easy_charts/ScatterChart/ScatterChart.gd b/addons/easy_charts/ScatterChart/ScatterChart.gd
index 8c4f781..edbb97f 100644
--- a/addons/easy_charts/ScatterChart/ScatterChart.gd
+++ b/addons/easy_charts/ScatterChart/ScatterChart.gd
@@ -112,7 +112,7 @@ func _get_property_list():
 				},
 				{
 						"hint": PROPERTY_HINT_ENUM,
-						"hint_string": PoolStringArray(TemplatesNames.keys()).join(","),
+						"hint_string": PoolStringArray(Utilities.templates.keys()).join(","),
 						"usage": PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_SCRIPT_VARIABLE,
 						"name": "Chart_Style/template",
 						"type": TYPE_INT
diff --git a/addons/easy_charts/plugin.cfg b/addons/easy_charts/plugin.cfg
index b020ed9..3aa7d38 100644
--- a/addons/easy_charts/plugin.cfg
+++ b/addons/easy_charts/plugin.cfg
@@ -3,5 +3,5 @@
 name="EasyCharts"
 description=""
 author="Nicolò \"fenix\" Santilio"
-version="0.4.5"
+version="0.4.6"
 script="plugin.gd"