Relintai/pandemonium_engine_easy_charts
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine_easy_charts.git synced 2025-02-26 17:24:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix .instance() and RadarChart scene

Browse Source
This commit is contained in:
fenix-hub 2022-01-09 16:32:44 +01:00
parent c7ab170ceb
commit 20dc80b4b6
4 changed files with 253 additions and 261 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
addons/easy_charts/control_charts/RadarChart/radar_chart.tscn
View File

@ -1,16 +1,7 @@
[gd_scene load_steps=3 format=2]
<<<<<<<< HEAD:addons/easy_charts/ControlChart/RadarChart/radar_chart.tscn
[ext_resource path="res://addons/easy_charts/Utilities/Point/point_data.tscn" type="PackedScene" id=1]
[ext_resource path="res://addons/easy_charts/ControlChart/RadarChart/radar_chart.gd" type="Script" id=2]
[sub_resource type="Theme" id=1]
========
[ext_resource path="res://addons/easy_charts/control_charts/RadarChart/radar_chart.gd" type="Script" id=1]
[ext_resource path="res://addons/easy_charts/utilities/containers/data_tooltip/data_tooltip.tscn" type="PackedScene" id=2]
>>>>>>>> dev:addons/easy_charts/control_charts/RadarChart/radar_chart.tscn
[node name="RadarChart" type="Control"]
anchor_right = 1.0
@ -83,7 +74,7 @@ __meta__ = {
[node name="CanvasLayer" type="CanvasLayer" parent="."]
[node name="DataTooltip" parent="CanvasLayer" instance=ExtResource( 2 )]
margin_left = -473.792
margin_top = 853.111
margin_right = -473.928
margin_bottom = 853.911
margin_left = -15.644
margin_top = -15.8509
margin_right = -15.78
margin_bottom = -15.0509

5
addons/easy_charts/utilities/classes/base/chart.gd
View File

@ -148,8 +148,9 @@ var property_list: Array = []
# !! API v2
static func instance(chart_type : int):
var chart_t : String = ECUtilities.get_chart_type(chart_type)
var chart : String = "res://addons/easy_charts/%s/%s.tscn" % [chart_t, chart_t]
var chart_t : Array = ECUtilities.get_chart_type(chart_type)
"res://addons/easy_charts/control_charts/RadarChart/radar_chart.tscn"
var chart : String = "res://addons/easy_charts/control_charts/%s/%s.tscn" % [chart_t[0], chart_t[1]]
return load(chart).instance()
# .......................... Properties Manager ....................................

12
addons/easy_charts/utilities/scripts/ec_utilities.gd
View File

@ -6,11 +6,11 @@ var alphabet : String = "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
var plugin_name : String = "Easy Charts"
var templates : Dictionary = {}
var chart_types : Dictionary = {
0:"LineChart",
1:"ColumnChart",
2:"ScatterChart",
3:"RadarChart",
4:"PieChart"
0:["LineChart","line_chart"],
1:["ColumnChart","column_chart"],
2:["ScatterChart","scatter_chart"],
3:["RadarChart","radar_chart"],
4:["PieChart","pie_chart"]
}
func _ready():
@ -33,7 +33,7 @@ func _load_templates() -> Dictionary:
func get_template(template_index : int):
return templates.get(templates.keys()[template_index])
func get_chart_type(chart_type : int):
func get_chart_type(chart_type : int) -> Array:
return chart_types.get(chart_types.keys()[chart_type])
func get_letter_index(index : int) -> String: