Merge pull request #146 from Nemrav/piechart2

Add Piecharts (gd 4.1)

2 files changed, 29 insertions, 2 deletions

diff --git a/game/src/Game/GameSession/ProvinceOverviewPanel/ProvinceOverviewPanel.gd b/game/src/Game/GameSession/ProvinceOverviewPanel/ProvinceOverviewPanel.gd
index 9a3690e..0220be2 100644
--- a/game/src/Game/GameSession/ProvinceOverviewPanel/ProvinceOverviewPanel.gd
+++ b/game/src/Game/GameSession/ProvinceOverviewPanel/ProvinceOverviewPanel.gd
@@ -7,6 +7,9 @@ extends PanelContainer
 @export var _rgo_icon_texture_rect : TextureRect
 @export var _rgo_name_label : Label
 @export var _buildings_container : Container
+@export var _pop_type_chart : PieChart
+@export var _pop_ideology_chart : PieChart
+@export var _pop_culture_chart : PieChart
 
 const _missing_suffix : String = "_MISSING"
 
@@ -113,6 +116,10 @@ func _update_info() -> void:
 
 		_total_population_label.text = Localisation.tr_number(_province_info.get(GameSingleton.get_province_info_total_population_key(), 0))
 
+		_pop_type_chart.set_to_distribution(_province_info.get(GameSingleton.get_province_info_pop_types_key(), {}))
+		_pop_ideology_chart.set_to_distribution(_province_info.get(GameSingleton.get_province_info_pop_ideologies_key(), {}))
+		_pop_culture_chart.set_to_distribution(_province_info.get(GameSingleton.get_province_info_pop_cultures_key(), {}))
+
 		_rgo_name_label.text = _province_info.get(GameSingleton.get_province_info_rgo_key(),
 			GameSingleton.get_province_info_rgo_key() + _missing_suffix)
 		_rgo_icon_texture_rect.texture = GameSingleton.get_good_icon_texture(_rgo_name_label.text)
diff --git a/game/src/Game/GameSession/ProvinceOverviewPanel/ProvinceOverviewPanel.tscn b/game/src/Game/GameSession/ProvinceOverviewPanel/ProvinceOverviewPanel.tscn
index 7c82f10..7e49ac8 100644
--- a/game/src/Game/GameSession/ProvinceOverviewPanel/ProvinceOverviewPanel.tscn
+++ b/game/src/Game/GameSession/ProvinceOverviewPanel/ProvinceOverviewPanel.tscn
@@ -1,8 +1,9 @@
-[gd_scene load_steps=2 format=3 uid="uid://byq323jbel48u"]
+[gd_scene load_steps=3 format=3 uid="uid://byq323jbel48u"]
 
 [ext_resource type="Script" path="res://src/Game/GameSession/ProvinceOverviewPanel/ProvinceOverviewPanel.gd" id="1_3n8k5"]
+[ext_resource type="PackedScene" uid="uid://cr7p1k2xm7mum" path="res://src/Game/Theme/PieChart/PieChart.tscn" id="2_3oytt"]
 
-[node name="ProvinceOverviewPanel" type="PanelContainer" node_paths=PackedStringArray("_province_name_label", "_region_name_label", "_life_rating_bar", "_total_population_label", "_rgo_icon_texture_rect", "_rgo_name_label", "_buildings_container")]
+[node name="ProvinceOverviewPanel" type="PanelContainer" node_paths=PackedStringArray("_province_name_label", "_region_name_label", "_life_rating_bar", "_total_population_label", "_rgo_icon_texture_rect", "_rgo_name_label", "_buildings_container", "_pop_type_chart", "_pop_ideology_chart", "_pop_culture_chart")]
 editor_description = "UI-56"
 anchors_preset = 2
 anchor_top = 1.0
@@ -19,6 +20,9 @@ _total_population_label = NodePath("PanelList/InteractList/TotalPopulation")
 _rgo_icon_texture_rect = NodePath("PanelList/InteractList/RGOInfo/RGOIcon")
 _rgo_name_label = NodePath("PanelList/InteractList/RGOInfo/RGOName")
 _buildings_container = NodePath("PanelList/InteractList/BuildingsContainer")
+_pop_type_chart = NodePath("PanelList/InteractList/PopStats/PopTypeChart")
+_pop_ideology_chart = NodePath("PanelList/InteractList/PopStats/PopIdeologyChart")
+_pop_culture_chart = NodePath("PanelList/InteractList/PopStats/PopCultureChart")
 
 [node name="PanelList" type="VBoxContainer" parent="."]
 layout_mode = 2
@@ -88,6 +92,22 @@ vertical_alignment = 1
 layout_mode = 2
 mouse_filter = 1
 
+[node name="PopStats" type="HBoxContainer" parent="PanelList/InteractList"]
+layout_mode = 2
+
+[node name="PopTypeChart" parent="PanelList/InteractList/PopStats" instance=ExtResource("2_3oytt")]
+layout_mode = 2
+
+[node name="PopIdeologyChart" parent="PanelList/InteractList/PopStats" instance=ExtResource("2_3oytt")]
+layout_mode = 2
+
+[node name="PopCultureChart" parent="PanelList/InteractList/PopStats" instance=ExtResource("2_3oytt")]
+layout_mode = 2
+
+[node name="HSeparator3" type="HSeparator" parent="PanelList/InteractList"]
+layout_mode = 2
+mouse_filter = 1
+
 [node name="BuildingsContainer" type="GridContainer" parent="PanelList/InteractList"]
 layout_mode = 2
 columns = 3