+
+
-
+
+
# Easy Charts
A library of Charts plotted in Control, 2D and 3D nodes to visualize general purpose datasets.
-
Author: *"Nicolo (fenix) Santilio"*
-Version: *0.5.0*
+Version: *0.5.3*
Wiki: *[wip](https://github.com/fenix-hub/godot-engine.easy-charts/wiki)*
Godot Version: *3.2stable*
-
## What is this?
*Easy Charts* is a collection of Control, 2D and 3D nodes to plot charts.
This plugin was born from the personal necessity to plot some charts and tables for my university degree project.
@@ -21,53 +20,42 @@ Charts are really useful when it comes to visually represent values in a powerfu
If you need to plot a chart with some values in it and just take a screenshot, or use it in your Godot Engine's game or project, you've come to the right place.
[*Startup Company*](https://store.steampowered.com/app/606800/Startup_Company/)
-
[*Microsoft Workplace Analytics*](https://www.microsoft.com/microsoft-365/partners/workplaceanalytics)
-
-
## How does it work?
There is a [WIKI](https://github.com/fenix-hub/godot-engine.easy-charts/wiki) with some tutorials, even if it is a work in progress.
I'll make some videos as soon as possible.
-
# Available Charts and when to use them
This library offers a set of charts for each main Godot Node:
- **Control Nodes:** "Control Charts" are fast Charts that can be plotted in a Control space, such as UIs or Control user interactable areas. They offer basic Control properties, such as Margins, size inheritance and control. No animations, no real time changes, just charts.
- **2D Nodes:** "2D Charts" are a set of Charts which can be Used in 2D spaces. They offer additional tools, such as animations and real time changes in editor. They can be used to implement more aesthetic charts in 2D contexts.
-- **[wip] 3D Nodes:** "3D Charts" are a set of Charts which can be Used in both 2D and 3D spaces. They offer the possibility to plot 3D datasets, which are common in machine learning contexts or just data analysis. A Camera Control will also be available, which can be used to move around the chart.
-
-*Available Charts*:
+- **[wip] 3D Nodes:** "3D Charts" are a set of Charts which can be Used in both 2D and 3D spaces. They offer the possibility to plot 3D datasets, which are common in machine learning contexts or just data analysis. A Camera Control will also be available, which can be used to move around the chart.
+### Available Charts
- LineChart [Control, 2D, wip 3D]
-- BarChart [Control, 2D, wipr 3D]
+- ColumnChart [Control, 2D, wipr 3D]
- ScatterChart [wip Control, wip 2D, 3D]
- Piechart [Control]
- RadarChart [Control]
-
-*Work in progress*:
+### WIP Charts
- Area Chart
- Donut Chart
-- Radar Chart
- Bubble Chart
- Parliament Chart
-
### Some Examples
+
-
##### Some references for charts and plots
[Flourish](https://app.flourish.studio/projects)
[Chart.js](https://www.chartjs.org/samples/latest/)
[Google Charts](https://developers.google.com/chart)
-
-
# Disclaimer
This addon was built for a **personal use** intention. It was released as an open source plugin in the hope that it could be useful to the Godot Engine Community.
As a "work in progress" project, there is *no warranty* for any eventual issue and bug that may broke your project.
I don't assume any responsibility for possible corruptions of your project. It is always advisable to keep a copy of your project and check any changes you make in your Github repository.
-
-----------------
> This text file was created via [TextEditor Integration](https://github.com/fenix-hub/godot-engine.text-editor) inside Godot Engine's Editor.
> This text file was pushed via [GitHub Integration](https://github.com/fenix-hub/godot-engine.github-integretion) inside Godot Engine's Editor.
diff --git a/addons/easy_charts/BarChart2D/LineChart2D.tscn.depren b/addons/easy_charts/BarChart2D/LineChart2D.tscn.depren
deleted file mode 100644
index aa35599..0000000
--- a/addons/easy_charts/BarChart2D/LineChart2D.tscn.depren
+++ /dev/null
@@ -1,108 +0,0 @@
-[gd_scene load_steps=4 format=2]
-
-[ext_resource path="res://addons/easy_charts/LineChart2D/LineChart2D.gd" type="Script" id=1]
-[ext_resource path="res://addons/easy_charts/Utilities/Point/PointData.gd" type="Script" id=3]
-
-
-
-
-[sub_resource type="StyleBoxFlat" id=1]
-content_margin_left = 8.0
-content_margin_right = 8.0
-content_margin_top = 5.0
-content_margin_bottom = 5.0
-bg_color = Color( 1, 1, 1, 0 )
-border_width_left = 2
-border_width_top = 2
-border_width_right = 2
-border_width_bottom = 2
-border_color = Color( 1, 1, 1, 1 )
-corner_radius_top_left = 5
-corner_radius_top_right = 5
-corner_radius_bottom_right = 5
-corner_radius_bottom_left = 5
-corner_detail = 20
-
-[node name="LineChart2D" type="Node2D"]
-script = ExtResource( 1 )
-drawing_duration = 0.3
-font_color = Color( 0.137255, 0.137255, 0.137255, 1 )
-
-[node name="Grid" type="Node2D" parent="."]
-
-[node name="VLine" type="Line2D" parent="Grid"]
-points = PoolVector2Array( 0, 0, 0, 0 )
-width = 1.0
-default_color = Color( 0.792157, 0.792157, 0.792157, 1 )
-
-[node name="HLine" type="Line2D" parent="Grid"]
-points = PoolVector2Array( 0, 0, 0, 0 )
-width = 1.0
-default_color = Color( 0.792157, 0.792157, 0.792157, 1 )
-
-[node name="Outlines" type="Line2D" parent="."]
-points = PoolVector2Array( 0, 0, 2, 0, 2, 2, 0, 2, 0, 0 )
-width = 2.0
-default_color = Color( 0.117647, 0.117647, 0.117647, 1 )
-
-[node name="Functions" type="Node2D" parent="."]
-
-[node name="Function" type="Line2D" parent="Functions"]
-points = PoolVector2Array( 0, 0, 0, 0 )
-width = 2.0
-default_color = Color( 0.117647, 0.117647, 0.117647, 1 )
-
-[node name="FunctionsTween" type="Tween" parent="."]
-
-[node name="OutlinesTween" type="Tween" parent="."]
-
-[node name="GridTween" type="Tween" parent="."]
-
-[node name="UI" type="CanvasLayer" parent="."]
-
-[node name="PointData" type="PanelContainer" parent="UI"]
-margin_right = 67.0
-margin_bottom = 38.0
-mouse_filter = 2
-custom_styles/panel = SubResource( 1 )
-script = ExtResource( 3 )
-__meta__ = {
-"_edit_use_anchors_": false
-}
-
-[node name="PointData" type="VBoxContainer" parent="UI/PointData"]
-margin_left = 8.0
-margin_top = 5.0
-margin_right = 59.0
-margin_bottom = 36.0
-custom_constants/separation = 3
-alignment = 1
-__meta__ = {
-"_edit_use_anchors_": false
-}
-
-[node name="Function" type="Label" parent="UI/PointData/PointData"]
-margin_right = 51.0
-margin_bottom = 14.0
-align = 1
-valign = 1
-
-[node name="Value" type="HBoxContainer" parent="UI/PointData/PointData"]
-margin_top = 17.0
-margin_right = 51.0
-margin_bottom = 31.0
-
-[node name="x" type="Label" parent="UI/PointData/PointData/Value"]
-margin_right = 39.0
-margin_bottom = 14.0
-custom_colors/font_color = Color( 1, 1, 1, 1 )
-text = "Value:"
-valign = 1
-
-[node name="y" type="Label" parent="UI/PointData/PointData/Value"]
-margin_left = 43.0
-margin_right = 51.0
-margin_bottom = 14.0
-custom_colors/font_color = Color( 1, 1, 1, 1 )
-text = "0"
-valign = 1
diff --git a/addons/easy_charts/BarChart/BarChart.tscn b/addons/easy_charts/ColumnChart/ColumnChart.tscn
similarity index 92%
rename from addons/easy_charts/BarChart/BarChart.tscn
rename to addons/easy_charts/ColumnChart/ColumnChart.tscn
index 06f25e9..05c57bb 100644
--- a/addons/easy_charts/BarChart/BarChart.tscn
+++ b/addons/easy_charts/ColumnChart/ColumnChart.tscn
@@ -1,11 +1,11 @@
[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/BarChart/bar_chart.gd" type="Script" id=2]
+[ext_resource path="res://addons/easy_charts/ColumnChart/column_chart.gd" type="Script" id=2]
[sub_resource type="Theme" id=1]
-[node name="BarChart" type="Control"]
+[node name="ColumnChart" type="Control"]
anchor_right = 1.0
anchor_bottom = 1.0
rect_min_size = Vector2( 70, 50 )
@@ -82,10 +82,10 @@ __meta__ = {
[node name="PointData" parent="." instance=ExtResource( 1 )]
[node name="PointData" parent="PointData" index="0"]
-margin_left = -32.6676
-margin_top = -84.4238
-margin_right = -32.8033
-margin_bottom = -83.6237
+margin_left = -593.381
+margin_top = -80.9071
+margin_right = -593.517
+margin_bottom = -80.107
theme = SubResource( 1 )
[editable path="PointData"]
diff --git a/addons/easy_charts/BarChart/bar_chart.gd b/addons/easy_charts/ColumnChart/column_chart.gd
similarity index 76%
rename from addons/easy_charts/BarChart/bar_chart.gd
rename to addons/easy_charts/ColumnChart/column_chart.gd
index 8b00363..9fe5a6e 100644
--- a/addons/easy_charts/BarChart/bar_chart.gd
+++ b/addons/easy_charts/ColumnChart/column_chart.gd
@@ -1,9 +1,9 @@
tool
extends Chart
-class_name BarChart
+class_name ColumnChart
"""
-[BarChart] - General purpose node for Bar Charts
+[ColumnChart] - General purpose node for Column Charts
A bar chart or bar graph is a chart or graph that presents categorical data with
rectangular bars with heights or lengths proportional to the values that they represent.
@@ -25,7 +25,7 @@ func _get_property_list():
{
"hint": PROPERTY_HINT_NONE,
"usage": PROPERTY_USAGE_CATEGORY,
- "name": "BarChart",
+ "name": "ColumnChart",
"type": TYPE_STRING
},
{
@@ -160,14 +160,14 @@ func build_chart():
SIZE = get_size()
origin = Vector2(OFFSET.x,SIZE.y-OFFSET.y)
-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
- self.are_values_columns = are_values_columns
+func structure_datas(database : Array):
+ # @labels_index can be either a column or a row relative to x values
+ are_values_columns = (invert_chart != are_values_columns)
if are_values_columns:
for row in database.size():
var t_vals: Array
for column in database[row].size():
- if column == x_values_index:
+ if column == labels_index:
var x_data = database[row][column]
if x_data.is_valid_float() or x_data.is_valid_integer():
x_datas.append(x_data as float)
@@ -187,7 +187,7 @@ func structure_datas(database : Array, are_values_columns : bool, x_values_index
x_label = str(x_datas.pop_front())
else:
for row in database.size():
- if row == x_values_index:
+ if row == labels_index:
x_datas = (database[row])
x_label = x_datas.pop_front() as String
else:
@@ -246,19 +246,16 @@ func structure_datas(database : Array, are_values_columns : bool, x_values_index
func calculate_pass():
- if invert_chart:
- x_chors = y_labels as PoolStringArray
+ if show_x_values_as_labels:
+ x_chors = x_datas as PoolStringArray
else:
- if show_x_values_as_labels:
- x_chors = x_datas as PoolStringArray
- else:
- x_chors = x_labels
+ x_chors = x_labels
# calculate distance in pixel between 2 consecutive values/datas
if not are_values_columns:
- x_pass = (SIZE.x - OFFSET.x*2 - (column_width) * ( y_datas.size() if not invert_chart else y_datas[0].size()+1 ) - column_gap - column_width/2) / ((x_chors.size()-1) if x_chors.size()!=1 else 1)
+ x_pass = (SIZE.x - OFFSET.x*2 - (column_width) * ( y_datas.size()) - column_gap - column_width/2) / ((x_chors.size()-1) if x_chors.size()!=1 else 1)
else:
- x_pass = (SIZE.x - OFFSET.x*2 - (column_width) * ( y_datas.size() if invert_chart else y_datas[0].size()+1 ) - column_gap - column_width/2) / (x_chors.size()-1)
+ x_pass = (SIZE.x - OFFSET.x*2 - (column_width) * ( y_datas[0].size()+1 ) - column_gap - column_width/2) / (x_chors.size()-1)
y_pass = (origin.y - ChartName.get_rect().size.y*2) / (y_chors.size() - 1)
func calculate_coordinates():
@@ -266,25 +263,15 @@ func calculate_coordinates():
y_coordinates.clear()
point_values.clear()
point_positions.clear()
-
- if invert_chart:
- for column in y_datas[0].size():
- var single_coordinates : Array
- for row in y_datas:
- if origin_at_zero:
- single_coordinates.append((row[column]*y_pass)/v_dist)
- else:
- single_coordinates.append((row[column] - y_margin_min)*y_pass/v_dist)
- y_coordinates.append(single_coordinates)
- else:
- for cluster in y_datas:
- var single_coordinates : Array
- for value in cluster.size():
- if origin_at_zero:
- single_coordinates.append((cluster[value]*y_pass)/v_dist)
- else:
- single_coordinates.append((cluster[value] - y_margin_min)*y_pass/v_dist)
- y_coordinates.append(single_coordinates)
+
+ for cluster in y_datas:
+ var single_coordinates : Array
+ for value in cluster.size():
+ if origin_at_zero:
+ single_coordinates.append((cluster[value]*y_pass)/v_dist)
+ else:
+ single_coordinates.append((cluster[value] - y_margin_min)*y_pass/v_dist)
+ y_coordinates.append(single_coordinates)
if show_x_values_as_labels:
for x in x_datas.size():
@@ -292,10 +279,7 @@ func calculate_coordinates():
else:
for x in x_datas.size():
if origin_at_zero:
- if not invert_chart:
- x_coordinates.append(x_pass*x)
- else:
- x_coordinates.append(x*x_pass/h_dist)
+ x_coordinates.append(x_pass*x)
else:
x_coordinates.append((x_datas[x] - x_margin_min)*x_pass/h_dist)
@@ -303,24 +287,14 @@ func calculate_coordinates():
point_values.append([])
point_positions.append([])
- if invert_chart:
- for function in y_coordinates.size():
- for function_value in y_coordinates[function].size():
- if are_values_columns:
- point_values[function].append([x_datas[function_value],y_datas[function_value][function]])
- point_positions[function].append(Vector2(OFFSET.x/2 + column_width/2 + (column_width + column_gap)*function + x_coordinates[function_value]+origin.x,origin.y-y_coordinates[function][function_value]))
- else:
- point_positions[function].append(Vector2(OFFSET.x/2 + column_width/2 + (column_width + column_gap)*function + x_coordinates[function_value]+origin.x,origin.y-y_coordinates[function][function_value]))
- point_values[function].append([x_datas[function_value],y_datas[function_value][function]])
- else:
- for cluster in y_coordinates.size():
- for y in y_coordinates[cluster].size():
- if are_values_columns:
- point_positions[y].append(Vector2(OFFSET.x/2 + column_width/2 + (column_width + column_gap)*y + x_coordinates[cluster] + origin.x, origin.y-y_coordinates[cluster][y]))
- point_values[y].append([x_datas[cluster],y_datas[cluster][y]])
- else:
- point_values[cluster].append([x_datas[y],y_datas[cluster][y]])
- point_positions[cluster].append(Vector2(OFFSET.x/2 + column_width/2 + (column_width + column_gap)*cluster + x_coordinates[y]+origin.x,origin.y-y_coordinates[cluster][y]))
+ for cluster in y_coordinates.size():
+ for y in y_coordinates[cluster].size():
+ if are_values_columns:
+ point_positions[y].append(Vector2(OFFSET.x/2 + column_width/2 + (column_width + column_gap)*y + x_coordinates[cluster] + origin.x, origin.y-y_coordinates[cluster][y]))
+ point_values[y].append([x_datas[cluster],y_datas[cluster][y]])
+ else:
+ point_values[cluster].append([x_datas[y],y_datas[cluster][y]])
+ point_positions[cluster].append(Vector2(OFFSET.x/2 + column_width/2 + (column_width + column_gap)*cluster + x_coordinates[y]+origin.x,origin.y-y_coordinates[cluster][y]))
func _draw():
clear_points()
@@ -342,10 +316,10 @@ func _draw():
point.connect("_mouse_entered",self,"show_data")
point.connect("_mouse_exited",self,"hide_data")
- point.create_point(points_shape[_function], function_colors[function_point if invert_chart else _function],
+ point.create_point(points_shape[_function], function_colors[_function],
Color.white, point_positions[_function][function_point] + Vector2(0,7),
point.format_value(point_values[_function][function_point], false, false),
- y_labels[function_point if invert_chart else _function] as String)
+ y_labels[_function] as String)
PointContainer.add_child(point)
point.rect_size.y = origin.y - point_positions[_function][function_point].y
draw_line( Vector2(point_positions[_function][function_point].x, origin.y),
@@ -362,9 +336,9 @@ func draw_grid():
draw_line(point-Vector2(0,5),point,v_lines_color,1,true)
var calculated_gap : float
if not are_values_columns:
- calculated_gap = ( y_datas.size() if not invert_chart else y_datas[0].size()+1 )
+ calculated_gap = ( y_datas.size() )
else:
- calculated_gap = ( y_datas.size() if invert_chart else y_datas[0].size()+1 )
+ calculated_gap = ( y_datas[0].size()+1 )
draw_string(
font,
point + Vector2(-const_width/2*x_chors[p].length() + (column_width + column_gap) * functions, font_size),
diff --git a/addons/easy_charts/BarChart2D/BarChart2D.gd b/addons/easy_charts/ColumnChart2D/ColumnChart2D.gd
similarity index 84%
rename from addons/easy_charts/BarChart2D/BarChart2D.gd
rename to addons/easy_charts/ColumnChart2D/ColumnChart2D.gd
index 3093a8a..c835080 100644
--- a/addons/easy_charts/BarChart2D/BarChart2D.gd
+++ b/addons/easy_charts/ColumnChart2D/ColumnChart2D.gd
@@ -1,9 +1,9 @@
tool
extends Chart2D
-class_name BarChart2D
+class_name ColumnChart2D
"""
-[BarChart2D] - General purpose node for Bar Charts
+[ColumnChart2D] - General purpose node for Bar Charts
A bar chart or bar graph is a chart or graph that presents categorical data with
rectangular bars with heights or lengths proportional to the values that they represent.
@@ -17,105 +17,6 @@ values of more than one measured variable.
/ source : Wikipedia /
"""
-var OutlinesTween : Tween
-var FunctionsTween
-var Functions : Node2D
-var GridTween : Tween
-var PointData : PointData
-var Outlines : Line2D
-var Grid : Node2D
-
-var point_node : PackedScene = preload("../Utilities/Point/Point.tscn")
-var FunctionLegend : PackedScene = preload("../Utilities/Legend/FunctionLegend.tscn")
-
-var font_size : float = 16
-var const_height : float = font_size/2*font_size/20
-var const_width : float = font_size/2
-
-var OFFSET : Vector2 = Vector2(0,0)
-
-#-------------------------------------------------------------------------#
-var origin : Vector2
-
-# actual distance between x and y values
-var x_pass : float
-var y_pass : float
-
-# vertical distance between y consecutive points used for intervals
-var v_dist : float
-var h_dist : float
-
-# quantization, representing the interval in which values will be displayed
-
-# define values on x an y axis
-var x_chors : Array
-var y_chors : Array
-
-# actual coordinates of points (in pixel)
-var x_coordinates : Array
-var y_coordinates : Array
-
-# datas contained in file
-var datas : Array
-
-# amount of functions to represent
-var functions : int = 0
-
-var x_label : String
-
-# database values
-var x_datas : Array
-var y_datas : Array
-
-# labels displayed on chart
-var x_labels : Array
-var y_labels : Array
-
-var x_margin_min : int = 0
-var y_margin_min : int = 0
-
-# actual values of point, from the database
-var point_values : Array
-
-# actual position of points in pixel
-var point_positions : Array
-
-var legend : Array setget set_legend,get_legend
-
-# ---------------------
-export (Vector2) var SIZE : Vector2 = Vector2() setget _set_size
-export (String, FILE, "*.txt, *.csv") var source : String = ""
-export (String) var delimiter : String = ";"
-export (bool) var origin_at_zero : bool = true
-
-export (bool) var are_values_columns : bool = false
-export (int,0,100) var x_values_index : int = 0
-export(bool) var show_x_values_as_labels : bool = true
-
-export (float,1,20,0.5) var column_width : float = 10
-export (float,0,10,0.5) var column_gap : float = 2
-
-export (float,0.1,10.0) var x_decim : float = 5.0
-export (float,0.1,10.0) var y_decim : float = 5.0
-export (PointShapes) var point_shape : int = 0
-export (PoolColorArray) var function_colors = [Color("#1e1e1e")]
-export (Color) var v_lines_color : Color = Color("#cacaca")
-export (Color) var h_lines_color : Color = Color("#cacaca")
-
-export (bool) var boxed : bool = true
-export (Color) var box_color : Color = Color("#1e1e1e")
-export (Font) var font : Font
-export (Font) var bold_font : Font
-export (Color) var font_color : Color = Color("#1e1e1e")
-export (TemplatesNames) var template : int = Chart.TemplatesNames.Default setget apply_template
-export (float,0.1,1) var drawing_duration : float = 0.5
-export (bool) var invert_chart : bool = false
-
-var templates : Dictionary = {}
-
-signal chart_plotted(chart)
-signal point_pressed(point)
-
func _point_plotted():
pass
diff --git a/addons/easy_charts/BarChart2D/BarChart2D.tscn b/addons/easy_charts/ColumnChart2D/ColumnChart2D.tscn
similarity index 95%
rename from addons/easy_charts/BarChart2D/BarChart2D.tscn
rename to addons/easy_charts/ColumnChart2D/ColumnChart2D.tscn
index 273481e..616e09a 100644
--- a/addons/easy_charts/BarChart2D/BarChart2D.tscn
+++ b/addons/easy_charts/ColumnChart2D/ColumnChart2D.tscn
@@ -1,8 +1,10 @@
[gd_scene load_steps=3 format=2]
-[ext_resource path="res://addons/easy_charts/BarChart2D/BarChart2D.gd" type="Script" id=1]
+[ext_resource path="res://addons/easy_charts/ColumnChart2D/ColumnChart2D.gd" type="Script" id=1]
[ext_resource path="res://addons/easy_charts/Utilities/Point/PointData.tscn" type="PackedScene" id=2]
+
+
[node name="BarChart2D" type="Node2D"]
script = ExtResource( 1 )
__meta__ = {
diff --git a/addons/easy_charts/LineChart/line_chart.gd b/addons/easy_charts/LineChart/line_chart.gd
index e379471..8b398f1 100644
--- a/addons/easy_charts/LineChart/line_chart.gd
+++ b/addons/easy_charts/LineChart/line_chart.gd
@@ -154,14 +154,14 @@ func _get_property_list():
]
-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
- self.are_values_columns = are_values_columns
+func structure_datas(database: Array):
+ # @labels_index can be either a column or a row relative to x values
+ are_values_columns = (invert_chart != are_values_columns)
if are_values_columns:
for row in database.size():
var t_vals: Array
for column in database[row].size():
- if column == x_values_index:
+ if column == labels_index:
var x_data = database[row][column]
if x_data.is_valid_float() or x_data.is_valid_integer():
x_datas.append(x_data as float)
@@ -181,7 +181,7 @@ func structure_datas(database: Array, are_values_columns: bool, x_values_index:
x_label = str(x_datas.pop_front())
else:
for row in database.size():
- if row == x_values_index:
+ if row == labels_index:
x_datas = (database[row])
x_label = x_datas.pop_front() as String
else:
@@ -244,13 +244,10 @@ func build_chart():
func calculate_pass():
- if invert_chart:
- x_chors = y_labels.duplicate(true) as PoolStringArray
+ if show_x_values_as_labels:
+ x_chors = x_datas.duplicate(true) as PoolStringArray
else:
- if show_x_values_as_labels:
- x_chors = x_datas.duplicate(true) as PoolStringArray
- else:
- x_chors = x_labels.duplicate(true)
+ x_chors = x_labels.duplicate(true)
# calculate distance in pixel between 2 consecutive values/datas
x_pass = (SIZE.x - OFFSET.x) / (x_chors.size()-1 if x_chors.size()>1 else x_chors.size() )
@@ -262,25 +259,15 @@ func calculate_coordinates():
y_coordinates.clear()
point_values.clear()
point_positions.clear()
-
- if invert_chart:
- for column in y_datas[0].size():
- var single_coordinates: Array
- for row in y_datas:
- if origin_at_zero:
- single_coordinates.append((row[column] * y_pass) / v_dist)
- else:
- single_coordinates.append((row[column] - y_margin_min) * y_pass / v_dist)
- y_coordinates.append(single_coordinates)
- else:
- for cluster in y_datas:
- var single_coordinates: Array
- for value in cluster.size():
- if origin_at_zero:
- single_coordinates.append((cluster[value] * y_pass) / v_dist)
- else:
- single_coordinates.append((cluster[value] - y_margin_min) * y_pass / v_dist)
- y_coordinates.append(single_coordinates)
+
+ for cluster in y_datas:
+ var single_coordinates: Array
+ for value in cluster.size():
+ if origin_at_zero:
+ single_coordinates.append((cluster[value] * y_pass) / v_dist)
+ else:
+ single_coordinates.append((cluster[value] - y_margin_min) * y_pass / v_dist)
+ y_coordinates.append(single_coordinates)
if show_x_values_as_labels:
for x in x_datas.size():
@@ -288,10 +275,7 @@ func calculate_coordinates():
else:
for x in x_datas.size():
if origin_at_zero:
- if invert_chart:
- x_coordinates.append(x_pass * x)
- else:
- x_coordinates.append(x_datas[x] * x_pass / h_dist)
+ x_coordinates.append(x_datas[x] * x_pass / h_dist)
else:
x_coordinates.append((x_datas[x] - x_margin_min) * x_pass / h_dist)
@@ -299,33 +283,17 @@ func calculate_coordinates():
point_values.append([])
point_positions.append([])
- if invert_chart:
- for function in y_coordinates.size():
- for function_value in y_coordinates[function].size():
- if are_values_columns:
- point_positions[function_value].append(Vector2(
- x_coordinates[function] + origin.x,
- origin.y - y_coordinates[function][function_value]))
- point_values[function_value].append(
- [x_datas[function_value], y_datas[function_value][function]])
- else:
- point_positions[function].append(Vector2(
- x_coordinates[function_value] + origin.x,
- origin.y - y_coordinates[function][function_value]))
- point_values[function].append(
- [x_datas[function_value], y_datas[function_value][function]])
- else:
- for cluster in y_coordinates.size():
- for y in y_coordinates[cluster].size():
- if are_values_columns:
- point_values[y].append([x_datas[cluster], y_datas[cluster][y]])
- point_positions[y].append(Vector2(
- x_coordinates[cluster] + origin.x, origin.y - y_coordinates[cluster][y]))
- else:
- point_values[cluster].append([x_datas[y], y_datas[cluster][y]])
- point_positions[cluster].append(Vector2(
- x_coordinates[y] + origin.x,
- origin.y - y_coordinates[cluster][y]))
+ for cluster in y_coordinates.size():
+ for y in y_coordinates[cluster].size():
+ if are_values_columns:
+ point_values[y].append([x_datas[cluster], y_datas[cluster][y]])
+ point_positions[y].append(Vector2(
+ x_coordinates[cluster] + origin.x, origin.y - y_coordinates[cluster][y]))
+ else:
+ point_values[cluster].append([x_datas[y], y_datas[cluster][y]])
+ point_positions[cluster].append(Vector2(
+ x_coordinates[y] + origin.x,
+ origin.y - y_coordinates[cluster][y]))
func _draw():
clear_points()
@@ -346,14 +314,14 @@ func _draw():
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_point if invert_chart else _function],Color.white,point_positions[_function][function_point],point.format_value(point_values[_function][function_point], false, false),y_labels[function_point if invert_chart else _function] as String)
+ 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] as String)
Points.add_child(point)
if function_point > 0:
draw_line(
point_positions[_function][function_point - 1],
point_positions[_function][function_point],
- function_colors[function_point if invert_chart else _function],
+ function_colors[_function],
2,
false)
draw_treshold()
diff --git a/addons/easy_charts/LineChart2D/LineChart2D.gd b/addons/easy_charts/LineChart2D/LineChart2D.gd
index e3b0f31..6653c79 100644
--- a/addons/easy_charts/LineChart2D/LineChart2D.gd
+++ b/addons/easy_charts/LineChart2D/LineChart2D.gd
@@ -14,108 +14,6 @@ class_name LineChart2D
# In these cases they are known as run charts.
# Source: Wikipedia
-
-signal chart_plotted(chart)
-signal point_pressed(point)
-
-
-const OFFSET: Vector2 = Vector2(0,0)
-
-
-export (Vector2) var SIZE: Vector2 = Vector2() setget _set_size
-export (String, FILE, "*.txt, *.csv") var source: String = ""
-export (String) var delimiter: String = ";"
-export (bool) var origin_at_zero: bool = true
-
-export (bool) var are_values_columns: bool = false
-export (int, 0, 100) var x_values_index: int = 0
-export(bool) var show_x_values_as_labels: bool = true
-
-#export (float,1,20,0.5) var column_width: float = 10
-#export (float,0,10,0.5) var column_gap: float = 2
-
-export (float, 0.1, 10.0) var x_decim: float = 5.0
-export (float, 0.1, 10.0) var y_decim: float = 5.0
-export (PointShapes) var point_shape: int = 0
-export (PoolColorArray) var function_colors = [Color("#1e1e1e")]
-export (Color) var v_lines_color: Color = Color("#cacaca")
-export (Color) var h_lines_color: Color = Color("#cacaca")
-
-export (bool) var boxed: bool = true
-export (Color) var box_color: Color = Color("#1e1e1e")
-export (Font) var font: Font
-export (Font) var bold_font: Font
-export (Color) var font_color: Color = Color("#1e1e1e")
-export (TemplatesNames) var template: int = Chart.TemplatesNames.Default setget apply_template
-export (float, 0.1, 1) var drawing_duration: float = 0.5
-export (bool) var invert_chart: bool = false
-
-
-var OutlinesTween: Tween
-var FunctionsTween: Tween
-var Functions: Node2D
-var GridTween: Tween
-var PointData: PointData
-var Outlines: Line2D
-var Grid: Node2D
-
-var point_node: PackedScene = preload("../Utilities/Point/Point.tscn")
-var FunctionLegend: PackedScene = preload("../Utilities/Legend/FunctionLegend.tscn")
-
-var font_size: float = 16
-var const_height: float = font_size / 2 * font_size / 20
-var const_width: float = font_size / 2
-
-var origin: Vector2
-
-# actual distance between x and y values
-var x_pass: float
-var y_pass: float
-
-# vertical distance between y consecutive points used for intervals
-var v_dist: float
-var h_dist: float
-
-# quantization, representing the interval in which values will be displayed
-
-# define values on x an y axis
-var x_chors: Array
-var y_chors: Array
-
-# actual coordinates of points (in pixel)
-var x_coordinates: Array
-var y_coordinates: Array
-
-# datas contained in file
-var datas: Array
-
-# amount of functions to represent
-var functions: int = 0
-
-var x_label: String
-
-# database values
-var x_datas: Array
-var y_datas: Array
-
-# labels displayed on chart
-var x_labels: Array
-var y_labels: Array
-
-var x_margin_min: int = 0
-var y_margin_min: int = 0
-
-# actual values of point, from the database
-var point_values: Array
-
-# actual position of points in pixel
-var point_positions: Array
-
-var legend: Array setget set_legend, get_legend
-
-var templates: Dictionary = {}
-
-
func _point_plotted():
pass
@@ -124,16 +22,6 @@ func _ready():
_get_children()
-func _get_children():
- OutlinesTween = $OutlinesTween
- FunctionsTween = $FunctionsTween
- Functions = $Functions
- GridTween = $GridTween
- PointData = $PointData/PointData
- Outlines = $Outlines
- Grid = $Grid
-
-
func _set_size(size: Vector2):
SIZE = size
build_chart()
@@ -566,94 +454,12 @@ func calculate_coordinates():
origin.y - y_coordinates[cluster][y]))
-func redraw():
- build_chart()
- calculate_pass()
- calculate_coordinates()
- update()
-
-
-func show_data(point):
- PointData.update_datas(point)
- PointData.show()
-
-
-func hide_data():
- PointData.hide()
-
-
-func clear_points():
- function_colors.clear()
- if Functions.get_children():
- for function in Functions.get_children():
- function.queue_free()
-
-
-func set_legend(l: Array):
- legend = l
-
-
-func get_legend():
- return legend
-
-
func invert_chart():
invert_chart = !invert_chart
count_functions()
redraw()
create_legend()
-
-func count_functions():
- if are_values_columns:
- if not invert_chart:
- functions = datas[0].size() - 1
- else:
- functions = datas.size() - 1
- else:
- if invert_chart:
- functions = datas[0].size() - 1
- else:
- functions = datas.size() - 1
-
-
-func create_legend():
- legend.clear()
- for function in functions:
- var function_legend = FunctionLegend.instance()
- var f_name: String
- if invert_chart:
- f_name = x_datas[function] as String
- else:
- f_name = y_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 apply_template(template_name: int):
- template = template_name
- templates = Utilities._load_templates()
- if template_name != null:
- var custom_template = templates.get(templates.keys()[template_name])
- function_colors = custom_template.function_colors as PoolColorArray
- v_lines_color = Color(custom_template.v_lines_color)
- h_lines_color = Color(custom_template.h_lines_color)
- box_color = Color(custom_template.outline_color)
- font_color = Color(custom_template.font_color)
- property_list_changed_notify()
-
- if Engine.editor_hint:
- _get_children()
- Outlines.set_default_color(box_color)
- Grid.get_node("VLine").set_default_color(v_lines_color)
- Grid.get_node("HLine").set_default_color(h_lines_color)
-
-
func _enter_tree():
_ready()
diff --git a/addons/easy_charts/LineChart2D/LineChart2D.tscn.depren b/addons/easy_charts/LineChart2D/LineChart2D.tscn.depren
deleted file mode 100644
index aa35599..0000000
--- a/addons/easy_charts/LineChart2D/LineChart2D.tscn.depren
+++ /dev/null
@@ -1,108 +0,0 @@
-[gd_scene load_steps=4 format=2]
-
-[ext_resource path="res://addons/easy_charts/LineChart2D/LineChart2D.gd" type="Script" id=1]
-[ext_resource path="res://addons/easy_charts/Utilities/Point/PointData.gd" type="Script" id=3]
-
-
-
-
-[sub_resource type="StyleBoxFlat" id=1]
-content_margin_left = 8.0
-content_margin_right = 8.0
-content_margin_top = 5.0
-content_margin_bottom = 5.0
-bg_color = Color( 1, 1, 1, 0 )
-border_width_left = 2
-border_width_top = 2
-border_width_right = 2
-border_width_bottom = 2
-border_color = Color( 1, 1, 1, 1 )
-corner_radius_top_left = 5
-corner_radius_top_right = 5
-corner_radius_bottom_right = 5
-corner_radius_bottom_left = 5
-corner_detail = 20
-
-[node name="LineChart2D" type="Node2D"]
-script = ExtResource( 1 )
-drawing_duration = 0.3
-font_color = Color( 0.137255, 0.137255, 0.137255, 1 )
-
-[node name="Grid" type="Node2D" parent="."]
-
-[node name="VLine" type="Line2D" parent="Grid"]
-points = PoolVector2Array( 0, 0, 0, 0 )
-width = 1.0
-default_color = Color( 0.792157, 0.792157, 0.792157, 1 )
-
-[node name="HLine" type="Line2D" parent="Grid"]
-points = PoolVector2Array( 0, 0, 0, 0 )
-width = 1.0
-default_color = Color( 0.792157, 0.792157, 0.792157, 1 )
-
-[node name="Outlines" type="Line2D" parent="."]
-points = PoolVector2Array( 0, 0, 2, 0, 2, 2, 0, 2, 0, 0 )
-width = 2.0
-default_color = Color( 0.117647, 0.117647, 0.117647, 1 )
-
-[node name="Functions" type="Node2D" parent="."]
-
-[node name="Function" type="Line2D" parent="Functions"]
-points = PoolVector2Array( 0, 0, 0, 0 )
-width = 2.0
-default_color = Color( 0.117647, 0.117647, 0.117647, 1 )
-
-[node name="FunctionsTween" type="Tween" parent="."]
-
-[node name="OutlinesTween" type="Tween" parent="."]
-
-[node name="GridTween" type="Tween" parent="."]
-
-[node name="UI" type="CanvasLayer" parent="."]
-
-[node name="PointData" type="PanelContainer" parent="UI"]
-margin_right = 67.0
-margin_bottom = 38.0
-mouse_filter = 2
-custom_styles/panel = SubResource( 1 )
-script = ExtResource( 3 )
-__meta__ = {
-"_edit_use_anchors_": false
-}
-
-[node name="PointData" type="VBoxContainer" parent="UI/PointData"]
-margin_left = 8.0
-margin_top = 5.0
-margin_right = 59.0
-margin_bottom = 36.0
-custom_constants/separation = 3
-alignment = 1
-__meta__ = {
-"_edit_use_anchors_": false
-}
-
-[node name="Function" type="Label" parent="UI/PointData/PointData"]
-margin_right = 51.0
-margin_bottom = 14.0
-align = 1
-valign = 1
-
-[node name="Value" type="HBoxContainer" parent="UI/PointData/PointData"]
-margin_top = 17.0
-margin_right = 51.0
-margin_bottom = 31.0
-
-[node name="x" type="Label" parent="UI/PointData/PointData/Value"]
-margin_right = 39.0
-margin_bottom = 14.0
-custom_colors/font_color = Color( 1, 1, 1, 1 )
-text = "Value:"
-valign = 1
-
-[node name="y" type="Label" parent="UI/PointData/PointData/Value"]
-margin_left = 43.0
-margin_right = 51.0
-margin_bottom = 14.0
-custom_colors/font_color = Color( 1, 1, 1, 1 )
-text = "0"
-valign = 1
diff --git a/addons/easy_charts/PieChart/pie_chart.gd b/addons/easy_charts/PieChart/pie_chart.gd
index efe2ed1..5dcff66 100644
--- a/addons/easy_charts/PieChart/pie_chart.gd
+++ b/addons/easy_charts/PieChart/pie_chart.gd
@@ -108,15 +108,15 @@ func plot_placeholder() -> void:
]
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
+func structure_datas(database: Array):
+ # @labels_index can be either a column or a row relative to x values
clean_variables()
- self.are_values_columns = are_values_columns
+ are_values_columns = invert_chart != are_values_columns
if are_values_columns:
for row in database.size():
var t_vals: Array
for column in database[row].size():
- if column == x_values_index:
+ if column == labels_index:
var x_data = database[row][column]
if x_data.is_valid_float() or x_data.is_valid_integer():
x_datas.append(x_data as float)
@@ -136,7 +136,7 @@ func structure_datas(database: Array, are_values_columns: bool, x_values_index:
x_label = str(x_datas.pop_front())
else:
for row in database.size():
- if row == x_values_index:
+ if row == labels_index:
x_datas = (database[row])
x_label = x_datas.pop_front() as String
else:
diff --git a/addons/easy_charts/RadarChart/RadarChart.gd b/addons/easy_charts/RadarChart/RadarChart.gd
deleted file mode 100644
index 7bec9cb..0000000
--- a/addons/easy_charts/RadarChart/RadarChart.gd
+++ /dev/null
@@ -1,280 +0,0 @@
-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(TemplatesNames.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():
- if row == labels_index:
- x_labels = database[row] as PoolStringArray
- else:
- if database[row].empty() or database[row].size() < 2:
- continue
- x_datas.append(PoolRealArray(database[row] as Array))
-
- for column in database[row].size():
- if column == function_names_index:
- y_labels.append(database[row][column])
- 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 as Array)
- 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