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 99% rename from addons/easy_charts/BarChart/bar_chart.gd rename to addons/easy_charts/ColumnChart/column_chart.gd index e291192..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 }, { diff --git a/addons/easy_charts/BarChart2D/BarChart2D.gd b/addons/easy_charts/ColumnChart2D/ColumnChart2D.gd similarity index 99% rename from addons/easy_charts/BarChart2D/BarChart2D.gd rename to addons/easy_charts/ColumnChart2D/ColumnChart2D.gd index f3abf1a..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. 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/Utilities/Containers/ChartContainer2D.gd b/addons/easy_charts/Utilities/Containers/ChartContainer2D.gd index 5fec906..bc23830 100644 --- a/addons/easy_charts/Utilities/Containers/ChartContainer2D.gd +++ b/addons/easy_charts/Utilities/Containers/ChartContainer2D.gd @@ -2,9 +2,9 @@ tool extends Node2D var LineChart = preload("LineChart2D/LineChart2D.tscn") -var ColumnChart = preload("BarChart2D/BarChart2D.tscn") +var ColumnChart = preload("ColumnChart2D/ColumnChart2D.tscn") -export (String,"None","LineChart2D","BarChart2D") var chart_type : String setget set_type,get_type +export (String,"None","LineChart2D","ColumnChart2D") var chart_type : String setget set_type,get_type var chart : Node2D setget set_chart,get_chart # Called when the node enters the scene tree for the first time. diff --git a/addons/easy_charts/Utilities/Scripts/utilities.gd b/addons/easy_charts/Utilities/Scripts/utilities.gd index 836b796..d4eabb8 100644 --- a/addons/easy_charts/Utilities/Scripts/utilities.gd +++ b/addons/easy_charts/Utilities/Scripts/utilities.gd @@ -5,7 +5,7 @@ var plugin_name : String = "Easy Charts" var templates : Dictionary = {} var chart_types : Dictionary = { 0:"LineChart", - 1:"BarChart", + 1:"ColumnChart", 2:"ScatterChart", 3:"RadarChart", 4:"PieChart"