From dd21e575cd71a3e611b6ba102faaa7d7997e1ead Mon Sep 17 00:00:00 2001 From: Jaap Marsman Date: Tue, 1 Nov 2022 17:28:59 +0800 Subject: [PATCH] Built functional Results screen --- godot/Assets/sample_text.md | 6 + godot/ObservationWindow.gd | 19 ++- godot/ProgressBar.gd | 13 ++ godot/Results.gd | 17 +- godot/TimerBar.gd | 14 ++ godot/global_ints.gd | 2 + godot/main_screen.gd | 10 ++ godot/main_screen.tscn | 311 ++++++++++++++++++++++++++++++------ godot/wb_theme.tres | 18 ++- 9 files changed, 348 insertions(+), 62 deletions(-) create mode 100644 godot/Assets/sample_text.md create mode 100644 godot/ProgressBar.gd create mode 100644 godot/TimerBar.gd diff --git a/godot/Assets/sample_text.md b/godot/Assets/sample_text.md new file mode 100644 index 0000000..c748f41 --- /dev/null +++ b/godot/Assets/sample_text.md @@ -0,0 +1,6 @@ +Date: xx-xx-xxxx +Time: X to X + +This Time Sampling Form (TSF) observation was completed by %T. %S was observed for %time minutes during %AL. + +During the observation, OBS1 was observed x out of x times, resulting in xx%. OBS2 was observed x out of x times, resulting in xx%. OBS3 was observed x out of x times, resulting in xx%. OBS4 was observed x out of x times, resulting in xx%. OBS5 was observed x out of x times, resulting in xx%. \ No newline at end of file diff --git a/godot/ObservationWindow.gd b/godot/ObservationWindow.gd index 67de90c..3d2a246 100644 --- a/godot/ObservationWindow.gd +++ b/godot/ObservationWindow.gd @@ -1,16 +1,23 @@ extends CanvasLayer + onready var global_ints = $"/root/GlobalInts" + var time_lefts : int var toggle_observation : bool = false var observation_button_pressed : bool = false + func _ready(): $"Panel/BehaviourButtons".visible = false pass +func on_finished(): + pass + + func _process(_delta): time_lefts = $"TwentySecondTimer".time_left $"Panel/TimeRemaining".text = str(time_lefts) @@ -19,12 +26,14 @@ func _process(_delta): toggle_observation = true $"Panel/BehaviourButtons".visible = true + func on_interval_moment(): print("Timer reaches 0 - Let's check if buttons have been pressed and count something") toggle_observation = false # Otherwise - a 6 is registered (nothing selected) # Buttons are to become visible again global_ints.locked_observations_intervals_remaining -= 1 + global_ints.locked_observations_completed += 1 $"Panel/BehaviourButtons".visible = false if observation_button_pressed == false: @@ -34,7 +43,8 @@ func on_interval_moment(): observation_button_pressed = false # The thing below here should become a graphic bar as well - $"Panel/ObservationsRemaining".text = str(global_ints.locked_observations_intervals_remaining) + $"Panel/DescriptorBox/ObservationsRemaining".text = str(global_ints.locked_observations_intervals_remaining) + func _on_TwentySecondTimer_timeout(): if global_ints.locked_observations_intervals_remaining == 1: @@ -51,6 +61,7 @@ func _on_TwentySecondTimer_timeout(): $"TwentySecondTimer".stop() global_ints.generate_results = true + on_finished() $"../Results".visible = true if global_ints.locked_observations_intervals_remaining > 1: @@ -95,7 +106,10 @@ func _on_BehaviourFive_pressed(): func _on_Button_pressed(): on_interval_moment() - print("We're completely done - no intervals remain") + print("We're aborting, so deal with as completely done - no intervals remain") + + # This to set the original total count to what's actually been completed + global_ints.locked_observation_intervals = global_ints.locked_observations_completed # So I should end the observation and move to the Results window. var obs_date_time = OS.get_time() @@ -106,4 +120,5 @@ func _on_Button_pressed(): $"TwentySecondTimer".stop() global_ints.generate_results = true + on_finished() $"../Results".visible = true diff --git a/godot/ProgressBar.gd b/godot/ProgressBar.gd new file mode 100644 index 0000000..acc1fc4 --- /dev/null +++ b/godot/ProgressBar.gd @@ -0,0 +1,13 @@ +extends ProgressBar + + +onready var global_ints = $"/root/GlobalInts" + + +func _ready(): + pass # Replace with function body. + + +func _process(_delta): + value = global_ints.locked_observations_intervals_remaining + max_value = global_ints.locked_observation_intervals diff --git a/godot/Results.gd b/godot/Results.gd index 250efc6..69e7dd9 100644 --- a/godot/Results.gd +++ b/godot/Results.gd @@ -1,18 +1,18 @@ extends CanvasLayer + onready var global_ints = $"/root/GlobalInts" + func _ready(): - pass # Replace with function body. + pass -#func _process(delta): -# pass - func Download_File(_img,_filename): var buf = _img.save_png_to_buffer() JavaScript.download_buffer(buf,_filename+".png") + func _on_SaveReport_pressed(): # Download_File(results, results) pass @@ -25,6 +25,9 @@ func _on_BackMainMenu_pressed(): func _on_Results_visibility_changed(): if global_ints.generate_results == true: - print("Yeah. We'll put result code here.") - $"Panel/Obs1Text".text = str(global_ints.one_behaviour_score) - # Code to generate the results screen - graphing, text + global_ints.generate_results = false + var result_text : String + result_text = str("wins: ", global_ints.five_behaviour_score , " Losses: ", global_ints.two_behaviour_score, " blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah ") + result_text = str("Date: xx-xx-xxxx \nTime: X to X \n \nThis Time Sampling Form (TSF) observation was completed by %T. %S was observed for %time minutes during %AL. \n \nDuring the observation, OBS1 was observed x out of x times, resulting in xx%. OBS2 was observed x out of x times, resulting in xx%. OBS3 was observed x out of x times, resulting in xx%. OBS4 was observed x out of x times, resulting in xx%. OBS5 was observed x out of x times, resulting in xx%. xx intervals were not scored.") + result_text = str("Date: xx-xx-xxxx \nTime: ", global_ints.observation_start_time , " to " , global_ints.observation_end_time , "\n \nThis Time Sampling Form (TSF) observation was completed by %T. %S was observed for %time minutes during %AL. \n \nDuring the observation, OBS1 was observed x out of x times, resulting in xx%. OBS2 was observed x out of x times, resulting in xx%. OBS3 was observed x out of x times, resulting in xx%. OBS4 was observed x out of x times, resulting in xx%. OBS5 was observed x out of x times, resulting in xx%. xx intervals were not scored.") + $"%FullResult".text = result_text diff --git a/godot/TimerBar.gd b/godot/TimerBar.gd new file mode 100644 index 0000000..a59ec12 --- /dev/null +++ b/godot/TimerBar.gd @@ -0,0 +1,14 @@ +extends ProgressBar + + +onready var global_ints = $"/root/GlobalInts" + +var time_lefts : int + +func _ready(): + pass + + +func _process(_delta): + time_lefts = $"%TwentySecondTimer".time_left + value = time_lefts diff --git a/godot/global_ints.gd b/godot/global_ints.gd index dea8136..618b15c 100644 --- a/godot/global_ints.gd +++ b/godot/global_ints.gd @@ -18,6 +18,7 @@ var observed_activity : String var locked_observation_minutes : int var locked_observation_intervals : int var locked_observations_intervals_remaining : int +var locked_observations_completed : int var one_acronym = "OnT" var two_acronym = "Loo" @@ -60,6 +61,7 @@ func reset_all_vars(): locked_observation_minutes = 0 locked_observation_intervals = 0 locked_observations_intervals_remaining = 0 + locked_observations_completed = 0 one_acronym = "OnT" two_acronym = "Loo" diff --git a/godot/main_screen.gd b/godot/main_screen.gd index 342443a..8a2a2c7 100644 --- a/godot/main_screen.gd +++ b/godot/main_screen.gd @@ -95,6 +95,16 @@ func _on_Start_pressed() -> void: $"%BehaviourThree".text = global_ints.three_acronym $"%BehaviourFour".text = global_ints.four_acronym $"%BehaviourFive".text = global_ints.five_acronym + $"%BTitle1".text = global_ints.one_behaviour + $"%BTitle2".text = global_ints.two_behaviour + $"%BTitle3".text = global_ints.three_behaviour + $"%BTitle4".text = global_ints.four_behaviour + $"%BTitle5".text = global_ints.five_behaviour + $"%ObsTitle1".text = global_ints.one_behaviour + $"%ObsTitle2".text = global_ints.two_behaviour + $"%ObsTitle3".text = global_ints.three_behaviour + $"%ObsTitle4".text = global_ints.four_behaviour + $"%ObsTitle5".text = global_ints.five_behaviour global_ints.locked_observation_minutes = global_ints.observation_minutes global_ints.locked_observation_intervals = global_ints.locked_observation_minutes * 3 diff --git a/godot/main_screen.tscn b/godot/main_screen.tscn index 382d64f..47bdf69 100644 --- a/godot/main_screen.tscn +++ b/godot/main_screen.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=17 format=2] +[gd_scene load_steps=23 format=2] [ext_resource path="res://wb_theme.tres" type="Theme" id=1] [ext_resource path="res://main_screen.gd" type="Script" id=2] @@ -9,6 +9,8 @@ [ext_resource path="res://ObservationWindow.gd" type="Script" id=7] [ext_resource path="res://EditScreen.gd" type="Script" id=8] [ext_resource path="res://Results.gd" type="Script" id=9] +[ext_resource path="res://TimerBar.gd" type="Script" id=10] +[ext_resource path="res://ProgressBar.gd" type="Script" id=11] [sub_resource type="StyleBoxFlat" id=2] bg_color = Color( 0.952941, 0.933333, 0.847059, 1 ) @@ -35,9 +37,23 @@ bg_color = Color( 1, 1, 1, 1 ) corner_radius_top_left = 50 corner_radius_top_right = 50 +[sub_resource type="StyleBoxFlat" id=10] +bg_color = Color( 0.941176, 0.772549, 0.517647, 1 ) + +[sub_resource type="StyleBoxFlat" id=11] +bg_color = Color( 0.862745, 0.435294, 0.329412, 1 ) + [sub_resource type="StyleBoxFlat" id=8] bg_color = Color( 1, 1, 1, 1 ) +[sub_resource type="DynamicFont" id=9] +size = 14 +font_data = ExtResource( 5 ) + +[sub_resource type="DynamicFont" id=12] +size = 18 +font_data = ExtResource( 5 ) + [node name="AppWindow" type="CanvasLayer"] script = ExtResource( 2 ) @@ -59,6 +75,7 @@ __meta__ = { } [node name="StartScreen" type="CanvasLayer" parent="."] +visible = false [node name="InstructionPanel" type="Panel" parent="StartScreen"] unique_name_in_owner = true @@ -762,7 +779,6 @@ margin_bottom = 649.0 text = "Clear All" [node name="ObservationWindow" type="CanvasLayer" parent="."] -visible = false script = ExtResource( 7 ) [node name="Panel" type="Panel" parent="ObservationWindow"] @@ -779,9 +795,9 @@ anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 margin_left = -453.0 -margin_top = 144.0 +margin_top = 51.0 margin_right = 453.0 -margin_bottom = 184.0 +margin_bottom = 91.0 [node name="BehaviourOne" type="Button" parent="ObservationWindow/Panel/BehaviourButtons"] unique_name_in_owner = true @@ -822,6 +838,61 @@ margin_bottom = 40.0 size_flags_horizontal = 3 text = "Acronym1" +[node name="BehaviourTitles" type="HBoxContainer" parent="ObservationWindow/Panel"] +margin_left = 189.0 +margin_top = 368.0 +margin_right = 1095.0 +margin_bottom = 408.0 + +[node name="BTitle1" type="Label" parent="ObservationWindow/Panel/BehaviourTitles"] +unique_name_in_owner = true +margin_top = 3.0 +margin_right = 178.0 +margin_bottom = 37.0 +size_flags_horizontal = 3 +text = "Title1" +align = 1 + +[node name="BTitle2" type="Label" parent="ObservationWindow/Panel/BehaviourTitles"] +unique_name_in_owner = true +margin_left = 182.0 +margin_top = 3.0 +margin_right = 360.0 +margin_bottom = 37.0 +size_flags_horizontal = 3 +text = "Title2" +align = 1 + +[node name="BTitle3" type="Label" parent="ObservationWindow/Panel/BehaviourTitles"] +unique_name_in_owner = true +margin_left = 364.0 +margin_top = 3.0 +margin_right = 542.0 +margin_bottom = 37.0 +size_flags_horizontal = 3 +text = "Title3" +align = 1 + +[node name="BTitle4" type="Label" parent="ObservationWindow/Panel/BehaviourTitles"] +unique_name_in_owner = true +margin_left = 546.0 +margin_top = 3.0 +margin_right = 724.0 +margin_bottom = 37.0 +size_flags_horizontal = 3 +text = "Title4" +align = 1 + +[node name="BTitle5" type="Label" parent="ObservationWindow/Panel/BehaviourTitles"] +unique_name_in_owner = true +margin_left = 728.0 +margin_top = 3.0 +margin_right = 906.0 +margin_bottom = 37.0 +size_flags_horizontal = 3 +text = "Title5" +align = 1 + [node name="TimeRemaining" type="Label" parent="ObservationWindow/Panel"] margin_left = 532.0 margin_top = 98.0 @@ -838,87 +909,223 @@ margin_bottom = 132.0 theme = ExtResource( 1 ) text = "Seconds remaining" -[node name="ObservationsRemaining" type="Label" parent="ObservationWindow/Panel"] +[node name="Button" type="Button" parent="ObservationWindow/Panel"] +margin_left = 582.0 +margin_top = 13.0 +margin_right = 700.0 +margin_bottom = 47.0 +text = "Stop Early" + +[node name="TimerBar" type="ProgressBar" parent="ObservationWindow/Panel"] +margin_left = 406.0 +margin_top = 145.0 +margin_right = 891.0 +margin_bottom = 206.0 +theme = ExtResource( 1 ) +max_value = 20.0 +step = 1.0 +value = 20.0 +rounded = true +percent_visible = false +script = ExtResource( 10 ) + +[node name="DescriptorBox" type="HBoxContainer" parent="ObservationWindow/Panel"] +margin_left = 361.0 +margin_top = 441.0 +margin_right = 966.0 +margin_bottom = 481.0 +alignment = 1 + +[node name="ObservationsRemaining" type="Label" parent="ObservationWindow/Panel/DescriptorBox"] unique_name_in_owner = true -margin_left = 438.0 -margin_top = 472.0 -margin_right = 553.0 -margin_bottom = 506.0 +margin_left = 31.0 +margin_top = 3.0 +margin_right = 146.0 +margin_bottom = 37.0 theme = ExtResource( 1 ) text = "Remaining" +__meta__ = { +"_edit_lock_": true +} -[node name="Button" type="Button" parent="ObservationWindow/Panel"] -margin_left = 1179.0 -margin_top = 29.0 -margin_right = 1246.0 -margin_bottom = 63.0 -text = "Abort" +[node name="ObservationsSlash" type="Label" parent="ObservationWindow/Panel/DescriptorBox"] +margin_left = 150.0 +margin_top = 3.0 +margin_right = 158.0 +margin_bottom = 37.0 +theme = ExtResource( 1 ) +text = "/" +__meta__ = { +"_edit_lock_": true +} + +[node name="ObservationsTotal" type="Label" parent="ObservationWindow/Panel/DescriptorBox"] +unique_name_in_owner = true +margin_left = 162.0 +margin_top = 3.0 +margin_right = 359.0 +margin_bottom = 37.0 +theme = ExtResource( 1 ) +text = "ObservationsTotal" +__meta__ = { +"_edit_lock_": true +} + +[node name="ObservationsDescriptor" type="Label" parent="ObservationWindow/Panel/DescriptorBox"] +margin_left = 363.0 +margin_top = 3.0 +margin_right = 573.0 +margin_bottom = 37.0 +theme = ExtResource( 1 ) +text = "intervals remaining" +__meta__ = { +"_edit_lock_": true +} + +[node name="ProgressBar" type="ProgressBar" parent="ObservationWindow/Panel"] +anchor_top = 1.0 +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_top = -14.0 +custom_styles/fg = SubResource( 10 ) +custom_styles/bg = SubResource( 11 ) +step = 1.0 +percent_visible = false +script = ExtResource( 11 ) [node name="TwentySecondTimer" type="Timer" parent="ObservationWindow"] unique_name_in_owner = true wait_time = 20.0 -[node name="ObservationsTotal" type="Label" parent="ObservationWindow"] -unique_name_in_owner = true -margin_left = 723.0 -margin_top = 660.0 -margin_right = 920.0 -margin_bottom = 694.0 -theme = ExtResource( 1 ) -text = "ObservationsTotal" - [node name="Results" type="CanvasLayer" parent="."] -visible = false script = ExtResource( 9 ) [node name="Panel" type="Panel" parent="Results"] anchor_right = 1.0 anchor_bottom = 1.0 -margin_top = -157.0 +margin_top = -3.0 theme = ExtResource( 1 ) custom_styles/panel = SubResource( 8 ) -__meta__ = { -"_edit_lock_": true -} [node name="SaveReport" type="Button" parent="Results/Panel"] -margin_left = 1045.0 -margin_top = 835.0 -margin_right = 1274.0 -margin_bottom = 869.0 +margin_left = 1042.0 +margin_top = 683.0 +margin_right = 1271.0 +margin_bottom = 717.0 text = "Save Report as PNG" [node name="BackMainMenu" type="Button" parent="Results/Panel"] -margin_left = 14.0 -margin_top = 828.0 -margin_right = 158.0 -margin_bottom = 862.0 +margin_left = 11.0 +margin_top = 676.0 +margin_right = 155.0 +margin_bottom = 710.0 text = "Restart" -[node name="MainText" type="Label" parent="Results/Panel"] +[node name="FullResult" type="Label" parent="Results/Panel"] +unique_name_in_owner = true margin_left = 11.0 -margin_top = 11.0 +margin_top = 13.0 margin_right = 1268.0 -margin_bottom = 163.0 +margin_bottom = 396.0 +custom_fonts/font = SubResource( 9 ) text = "Can this be multi-line? Or does text-wrap work? Can I get integers in? Must be able to, concatenate." autowrap = true -[node name="Obs1" type="Label" parent="Results/Panel"] -margin_left = 31.0 -margin_top = 277.0 -margin_right = 71.0 -margin_bottom = 311.0 -text = "Observation 1: " +[node name="GridContainer" type="GridContainer" parent="Results/Panel"] +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -423.0 +margin_top = 60.5 +margin_right = 423.0 +margin_bottom = 181.5 +columns = 2 -[node name="Obs1Text" type="Label" parent="Results/Panel"] +[node name="ObsTitle1" type="Label" parent="Results/Panel/GridContainer"] unique_name_in_owner = true -margin_left = 199.0 -margin_top = 278.0 -margin_right = 361.0 -margin_bottom = 312.0 -text = "Observation 1: " +margin_right = 50.0 +margin_bottom = 26.0 +custom_fonts/font = SubResource( 12 ) +text = "Item1" + +[node name="ObsBar1" type="ProgressBar" parent="Results/Panel/GridContainer"] +margin_left = 54.0 +margin_right = 846.0 +margin_bottom = 20.0 +size_flags_horizontal = 3 +step = 1.0 +percent_visible = false + +[node name="ObsTitle2" type="Label" parent="Results/Panel/GridContainer"] +unique_name_in_owner = true +margin_top = 30.0 +margin_right = 50.0 +margin_bottom = 56.0 +custom_fonts/font = SubResource( 12 ) +text = "Item2" + +[node name="ObsBar2" type="ProgressBar" parent="Results/Panel/GridContainer"] +margin_left = 54.0 +margin_top = 30.0 +margin_right = 846.0 +margin_bottom = 50.0 +size_flags_horizontal = 3 +step = 1.0 +percent_visible = false + +[node name="ObsTitle3" type="Label" parent="Results/Panel/GridContainer"] +unique_name_in_owner = true +margin_top = 60.0 +margin_right = 50.0 +margin_bottom = 86.0 +custom_fonts/font = SubResource( 12 ) +text = "Item3" + +[node name="ObsBar3" type="ProgressBar" parent="Results/Panel/GridContainer"] +margin_left = 54.0 +margin_top = 60.0 +margin_right = 846.0 +margin_bottom = 80.0 +size_flags_horizontal = 3 +step = 1.0 +percent_visible = false + +[node name="ObsTitle4" type="Label" parent="Results/Panel/GridContainer"] +unique_name_in_owner = true +margin_top = 90.0 +margin_right = 50.0 +margin_bottom = 116.0 +custom_fonts/font = SubResource( 12 ) +text = "Item4" + +[node name="ObsBar4" type="ProgressBar" parent="Results/Panel/GridContainer"] +margin_left = 54.0 +margin_top = 90.0 +margin_right = 846.0 +margin_bottom = 110.0 +size_flags_horizontal = 3 +step = 1.0 +percent_visible = false + +[node name="ObsTitle5" type="Label" parent="Results/Panel/GridContainer"] +unique_name_in_owner = true +margin_top = 120.0 +margin_right = 50.0 +margin_bottom = 146.0 +custom_fonts/font = SubResource( 12 ) +text = "Item5" + +[node name="ObsBar5" type="ProgressBar" parent="Results/Panel/GridContainer"] +margin_left = 54.0 +margin_top = 120.0 +margin_right = 846.0 +margin_bottom = 140.0 +size_flags_horizontal = 3 +step = 1.0 +percent_visible = false [connection signal="pressed" from="StartScreen/InstructionPanel/MinuteBox/MinuteMinus" to="." method="_on_MinuteMinus_pressed"] [connection signal="pressed" from="StartScreen/InstructionPanel/MinuteBox/MinutePlus" to="." method="_on_MinutePlus_pressed"] diff --git a/godot/wb_theme.tres b/godot/wb_theme.tres index ff78e49..88ca0d5 100644 --- a/godot/wb_theme.tres +++ b/godot/wb_theme.tres @@ -1,4 +1,4 @@ -[gd_resource type="Theme" load_steps=14 format=2] +[gd_resource type="Theme" load_steps=16 format=2] [ext_resource path="res://Assets/fonts/noto_sans_display_bold.ttf" type="DynamicFontData" id=1] [ext_resource path="res://Assets/fonts/noto_sans_display.ttf" type="DynamicFontData" id=2] @@ -73,6 +73,20 @@ corner_radius_bottom_left = 10 [sub_resource type="StyleBoxEmpty" id=12] +[sub_resource type="StyleBoxFlat" id=13] +bg_color = Color( 0.862745, 0.435294, 0.329412, 1 ) +corner_radius_top_left = 5 +corner_radius_top_right = 5 +corner_radius_bottom_right = 5 +corner_radius_bottom_left = 5 + +[sub_resource type="StyleBoxFlat" id=14] +bg_color = Color( 0.941176, 0.772549, 0.517647, 1 ) +corner_radius_top_left = 5 +corner_radius_top_right = 5 +corner_radius_bottom_right = 5 +corner_radius_bottom_left = 5 + [resource] Button/fonts/font = SubResource( 1 ) Button/styles/disabled = SubResource( 4 ) @@ -86,3 +100,5 @@ LineEdit/fonts/font = SubResource( 8 ) LineEdit/styles/normal = SubResource( 9 ) Panel/styles/panel = SubResource( 11 ) PanelContainer/styles/panel = SubResource( 12 ) +ProgressBar/styles/bg = SubResource( 13 ) +ProgressBar/styles/fg = SubResource( 14 )