From a7158126fe486dcb137fef960b339be04aebc267 Mon Sep 17 00:00:00 2001 From: Jaap Marsman Date: Fri, 28 Oct 2022 16:28:42 +0800 Subject: [PATCH] Reaching alpha stage on coding - now need to work on UI-UX --- godot/EditScreen.gd | 23 +++ godot/NameChangePanel.gd | 15 +- godot/ObservationWindow.gd | 77 ++++++++ godot/Results.gd | 17 +- godot/global_ints.gd | 54 +++++- godot/main_screen.gd | 11 +- godot/main_screen.tscn | 364 +++++++++++++++++++++++++------------ 7 files changed, 432 insertions(+), 129 deletions(-) diff --git a/godot/EditScreen.gd b/godot/EditScreen.gd index 4aea2c3..e8d1814 100644 --- a/godot/EditScreen.gd +++ b/godot/EditScreen.gd @@ -9,6 +9,7 @@ func _ready(): func _on_CancelButton_pressed(): + main_window.refresh_descriptors() $"%EditScreen".visible = false @@ -35,3 +36,25 @@ func _on_OKButton_pressed(): $"%EditScreen".visible = false main_window.refresh_descriptors() + + +func _on_ClearAll_pressed(): + $"%1AcronymE".text = "" + $"%1ItemE".text = "" + $"%1ExplanationE".text = "" + + $"%2AcronymE".text = "" + $"%2ItemE".text = "" + $"%2ExplanationE".text = "" + + $"%3AcronymE".text = "" + $"%3ItemE".text = "" + $"%3ExplanationE".text = "" + + $"%4AcronymE".text = "" + $"%4ItemE".text = "" + $"%4ExplanationE".text = "" + + $"%5AcronymE".text = "" + $"%5ItemE".text = "" + $"%5ExplanationE".text = "" diff --git a/godot/NameChangePanel.gd b/godot/NameChangePanel.gd index 74e43ff..ab06a13 100644 --- a/godot/NameChangePanel.gd +++ b/godot/NameChangePanel.gd @@ -4,20 +4,13 @@ extends Panel onready var global_ints = $"/root/GlobalInts" -func _ready() -> void: - pass # Replace with function body. - - -# Called every frame. 'delta' is the elapsed time since the previous frame. -#func _process(delta: float) -> void: -# pass - - -func _on_OkButton_pressed() -> void: - if $"%NameLine".text != "": +func _on_OkButton_pressed(): + if $"%NameLine".text and $"NameContainer/ObserverLine".text and $"NameContainer/ObservedActivity".text != "": $"%InstructionPanel".visible = true $"%NameChangePanel".visible = false global_ints.observed_person_name = $"%NameLine".text + global_ints.observer_person_name = $"NameContainer/ObserverLine".text + global_ints.observed_activity = $"NameContainer/ObservedActivity".text else: $"%ObservedNameLabel".visible = false $"%WarningLabel".visible = true diff --git a/godot/ObservationWindow.gd b/godot/ObservationWindow.gd index 2d56129..67de90c 100644 --- a/godot/ObservationWindow.gd +++ b/godot/ObservationWindow.gd @@ -3,20 +3,36 @@ 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 _process(_delta): time_lefts = $"TwentySecondTimer".time_left $"Panel/TimeRemaining".text = str(time_lefts) + if time_lefts == 5 && toggle_observation == false: + print("We're at the five second mark!") + 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 + $"Panel/BehaviourButtons".visible = false + + if observation_button_pressed == false: + global_ints.six_behaviour_score += 1 + global_ints.total_behaviours += 1 + + 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) @@ -25,8 +41,69 @@ func _on_TwentySecondTimer_timeout(): on_interval_moment() print("We're completely done - no intervals remain") # So I should end the observation and move to the Results window. + + var obs_date_time = OS.get_time() + if obs_date_time.minute < 10: + global_ints.observation_end_time = str(obs_date_time.hour, ":0", obs_date_time.minute) + if obs_date_time.minute >= 10: + global_ints.observation_end_time = str(obs_date_time.hour, ":", obs_date_time.minute) + + $"TwentySecondTimer".stop() + global_ints.generate_results = true $"../Results".visible = true if global_ints.locked_observations_intervals_remaining > 1: on_interval_moment() + + +func _on_BehaviourOne_pressed(): + global_ints.one_behaviour_score += 1 + global_ints.total_behaviours += 1 + observation_button_pressed = true + $"Panel/BehaviourButtons".visible = false + print(str(global_ints.one_behaviour_score)) + + +func _on_BehaviourTwo_pressed(): + global_ints.two_behaviour_score += 1 + global_ints.total_behaviours += 1 + observation_button_pressed = true + $"Panel/BehaviourButtons".visible = false + + +func _on_BehaviourThree_pressed(): + global_ints.three_behaviour_score += 1 + global_ints.total_behaviours += 1 + observation_button_pressed = true + $"Panel/BehaviourButtons".visible = false + + +func _on_BehaviourFour_pressed(): + global_ints.four_behaviour_score += 1 + global_ints.total_behaviours += 1 + observation_button_pressed = true + $"Panel/BehaviourButtons".visible = false + + +func _on_BehaviourFive_pressed(): + global_ints.five_behaviour_score += 1 + global_ints.total_behaviours += 1 + observation_button_pressed = true + $"Panel/BehaviourButtons".visible = false + + +func _on_Button_pressed(): + on_interval_moment() + print("We're completely done - no intervals remain") + # So I should end the observation and move to the Results window. + + var obs_date_time = OS.get_time() + if obs_date_time.minute < 10: + global_ints.observation_end_time = str(obs_date_time.hour, ":0", obs_date_time.minute) + if obs_date_time.minute >= 10: + global_ints.observation_end_time = str(obs_date_time.hour, ":", obs_date_time.minute) + + $"TwentySecondTimer".stop() + global_ints.generate_results = true + $"../Results".visible = true diff --git a/godot/Results.gd b/godot/Results.gd index e69ea5f..250efc6 100644 --- a/godot/Results.gd +++ b/godot/Results.gd @@ -1,5 +1,6 @@ extends CanvasLayer +onready var global_ints = $"/root/GlobalInts" func _ready(): pass # Replace with function body. @@ -8,10 +9,22 @@ func _ready(): #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(): - pass # Replace with function body. +# Download_File(results, results) + pass func _on_BackMainMenu_pressed(): - pass # Replace with function body. + global_ints.reset_all_vars() + var _ignore = get_tree().reload_current_scene() + + +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 diff --git a/godot/global_ints.gd b/godot/global_ints.gd index 773012e..dea8136 100644 --- a/godot/global_ints.gd +++ b/godot/global_ints.gd @@ -2,11 +2,18 @@ extends Node # For testing purposes - make the intervals 4 seconds instead of 20 -var timer_duration : int = 4 +var timer_duration : int = 20 var observation_minutes : int = 1 +var observation_start_time : String +var observation_end_time : String + +var generate_results : bool = false + var observed_person_name : String +var observer_person_name : String +var observed_activity : String var locked_observation_minutes : int var locked_observation_intervals : int @@ -40,3 +47,48 @@ var three_behaviour_score : int var four_behaviour_score: int var five_behaviour_score : int var six_behaviour_score : int + +func reset_all_vars(): + observation_minutes = 1 + + generate_results = false + + observed_person_name = "" + observer_person_name = "" + observed_activity = "" + + locked_observation_minutes = 0 + locked_observation_intervals = 0 + locked_observations_intervals_remaining = 0 + + one_acronym = "OnT" + two_acronym = "Loo" + three_acronym = "Dis" + four_acronym = "Wal" + five_acronym = "Oth" + six_acronym = "Emp" + + one_behaviour = "On Task" + two_behaviour = "Looking" + three_behaviour = "Distracting" + four_behaviour = "Walking" + five_behaviour = "Other" + six_behaviour = "Empty" + + one_explanation = "The pupil is on task" + two_explanation = "The pupil is looking around in a distracted manner or is staring into the distance" + three_explanation = "The pupil is distracting other pupils or talking to them" + four_explanation = "The pupil is walking through the class" + five_explanation = "The pupil is otherwise distracted and not on task" + six_explanation = "No answer was selected for this round" + + total_behaviours = 0 + one_behaviour_score = 0 + two_behaviour_score = 0 + three_behaviour_score = 0 + four_behaviour_score = 0 + five_behaviour_score = 0 + six_behaviour_score = 0 + + observation_start_time = "" + observation_end_time = "" diff --git a/godot/main_screen.gd b/godot/main_screen.gd index 51d41b4..342443a 100644 --- a/godot/main_screen.gd +++ b/godot/main_screen.gd @@ -58,7 +58,10 @@ func _process(_delta): if check_time_var == 10: check_time_var = 0 date_time = OS.get_time() - date_time_display.text = str(date_time.hour, ":", date_time.minute) + if date_time.minute < 10: + date_time_display.text = str(date_time.hour, ":0", date_time.minute) + if date_time.minute >= 10: + date_time_display.text = str(date_time.hour, ":", date_time.minute) func _on_MinuteMinus_pressed() -> void: @@ -99,6 +102,12 @@ func _on_Start_pressed() -> void: $"%ObservationsTotal".text = str(global_ints.locked_observation_intervals) $"%ObservationsRemaining".text = str(global_ints.locked_observations_intervals_remaining) + + var obs_date_time = OS.get_time() + if obs_date_time.minute < 10: + global_ints.observation_start_time = str(obs_date_time.hour, ":0", obs_date_time.minute) + if obs_date_time.minute >= 10: + global_ints.observation_start_time = str(obs_date_time.hour, ":", obs_date_time.minute) $"%TwentySecondTimer".start(global_ints.timer_duration) diff --git a/godot/main_screen.tscn b/godot/main_screen.tscn index 8ef1c12..d2c6292 100644 --- a/godot/main_screen.tscn +++ b/godot/main_screen.tscn @@ -51,8 +51,8 @@ __meta__ = { } [node name="ClassroomPhoto" type="Sprite" parent="."] -position = Vector2( 640, 204 ) -scale = Vector2( 0.67, 0.67 ) +position = Vector2( 639.9, 201.694 ) +scale = Vector2( 0.665729, 0.665729 ) texture = ExtResource( 3 ) __meta__ = { "_edit_lock_": true @@ -138,7 +138,7 @@ margin_top = -197.0 margin_right = 322.5 margin_bottom = -163.0 theme = ExtResource( 1 ) -text = "How long is your observation? (in minutes)" +text = "How long will you observe? (in minutes)" align = 1 [node name="ObservationItemsTitle" type="Label" parent="StartScreen/InstructionPanel"] @@ -191,7 +191,7 @@ margin_right = 498.0 margin_bottom = 60.0 size_flags_horizontal = 3 theme = ExtResource( 1 ) -text = "Change Items" +text = "Edit Items" [node name="PupilName" type="Button" parent="StartScreen/InstructionPanel/BottomButtons"] margin_left = 502.0 @@ -199,7 +199,7 @@ margin_right = 749.0 margin_bottom = 60.0 size_flags_horizontal = 3 theme = ExtResource( 1 ) -text = "Pupil Name" +text = "Edit Names" [node name="Start" type="Button" parent="StartScreen/InstructionPanel/BottomButtons"] margin_left = 753.0 @@ -214,16 +214,49 @@ anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -margin_left = -518.5 +margin_left = -589.0 margin_top = -57.0 -margin_right = 518.5 -margin_bottom = 129.0 +margin_right = 603.0 +margin_bottom = 167.0 columns = 3 +[node name="AcronymLabel" type="Label" parent="StartScreen/InstructionPanel/GridObservations"] +unique_name_in_owner = true +margin_right = 96.0 +margin_bottom = 34.0 +theme = ExtResource( 1 ) +text = "Acronym" +__meta__ = { +"_edit_lock_": true +} + +[node name="DescriptorLabel" type="Label" parent="StartScreen/InstructionPanel/GridObservations"] +unique_name_in_owner = true +margin_left = 100.0 +margin_right = 218.0 +margin_bottom = 34.0 +theme = ExtResource( 1 ) +text = "Descriptor" +__meta__ = { +"_edit_lock_": true +} + +[node name="ExplanationLabel" type="Label" parent="StartScreen/InstructionPanel/GridObservations"] +unique_name_in_owner = true +margin_left = 222.0 +margin_right = 1088.0 +margin_bottom = 34.0 +theme = ExtResource( 1 ) +text = "Explanation" +__meta__ = { +"_edit_lock_": true +} + [node name="1Acronym" type="Label" parent="StartScreen/InstructionPanel/GridObservations"] unique_name_in_owner = true -margin_right = 45.0 -margin_bottom = 34.0 +margin_top = 38.0 +margin_right = 96.0 +margin_bottom = 72.0 theme = ExtResource( 1 ) text = "OnT" __meta__ = { @@ -232,9 +265,10 @@ __meta__ = { [node name="1Item" type="Label" parent="StartScreen/InstructionPanel/GridObservations"] unique_name_in_owner = true -margin_left = 49.0 -margin_right = 167.0 -margin_bottom = 34.0 +margin_left = 100.0 +margin_top = 38.0 +margin_right = 218.0 +margin_bottom = 72.0 theme = ExtResource( 1 ) text = "On Task" __meta__ = { @@ -243,9 +277,10 @@ __meta__ = { [node name="1Explanation" type="Label" parent="StartScreen/InstructionPanel/GridObservations"] unique_name_in_owner = true -margin_left = 171.0 -margin_right = 1037.0 -margin_bottom = 34.0 +margin_left = 222.0 +margin_top = 38.0 +margin_right = 1088.0 +margin_bottom = 72.0 theme = ExtResource( 1 ) text = "The pupil is on task" __meta__ = { @@ -254,9 +289,9 @@ __meta__ = { [node name="2Acronym" type="Label" parent="StartScreen/InstructionPanel/GridObservations"] unique_name_in_owner = true -margin_top = 38.0 -margin_right = 45.0 -margin_bottom = 72.0 +margin_top = 76.0 +margin_right = 96.0 +margin_bottom = 110.0 theme = ExtResource( 1 ) text = "Loo" __meta__ = { @@ -265,10 +300,10 @@ __meta__ = { [node name="2Item" type="Label" parent="StartScreen/InstructionPanel/GridObservations"] unique_name_in_owner = true -margin_left = 49.0 -margin_top = 38.0 -margin_right = 167.0 -margin_bottom = 72.0 +margin_left = 100.0 +margin_top = 76.0 +margin_right = 218.0 +margin_bottom = 110.0 theme = ExtResource( 1 ) text = "Looking" __meta__ = { @@ -277,10 +312,10 @@ __meta__ = { [node name="2Explanation" type="Label" parent="StartScreen/InstructionPanel/GridObservations"] unique_name_in_owner = true -margin_left = 171.0 -margin_top = 38.0 -margin_right = 1037.0 -margin_bottom = 72.0 +margin_left = 222.0 +margin_top = 76.0 +margin_right = 1088.0 +margin_bottom = 110.0 theme = ExtResource( 1 ) text = " The pupil is looking around in a distracted manner or is staring into the distance" __meta__ = { @@ -289,9 +324,9 @@ __meta__ = { [node name="3Acronym" type="Label" parent="StartScreen/InstructionPanel/GridObservations"] unique_name_in_owner = true -margin_top = 76.0 -margin_right = 45.0 -margin_bottom = 110.0 +margin_top = 114.0 +margin_right = 96.0 +margin_bottom = 148.0 theme = ExtResource( 1 ) text = "Dis" __meta__ = { @@ -300,10 +335,10 @@ __meta__ = { [node name="3Item" type="Label" parent="StartScreen/InstructionPanel/GridObservations"] unique_name_in_owner = true -margin_left = 49.0 -margin_top = 76.0 -margin_right = 167.0 -margin_bottom = 110.0 +margin_left = 100.0 +margin_top = 114.0 +margin_right = 218.0 +margin_bottom = 148.0 theme = ExtResource( 1 ) text = "Distracting" __meta__ = { @@ -312,10 +347,10 @@ __meta__ = { [node name="3Explanation" type="Label" parent="StartScreen/InstructionPanel/GridObservations"] unique_name_in_owner = true -margin_left = 171.0 -margin_top = 76.0 -margin_right = 1037.0 -margin_bottom = 110.0 +margin_left = 222.0 +margin_top = 114.0 +margin_right = 1088.0 +margin_bottom = 148.0 theme = ExtResource( 1 ) text = "The pupil is distracting other pupils or talking to them" __meta__ = { @@ -324,9 +359,9 @@ __meta__ = { [node name="4Acronym" type="Label" parent="StartScreen/InstructionPanel/GridObservations"] unique_name_in_owner = true -margin_top = 114.0 -margin_right = 45.0 -margin_bottom = 148.0 +margin_top = 152.0 +margin_right = 96.0 +margin_bottom = 186.0 theme = ExtResource( 1 ) text = "Wal" __meta__ = { @@ -335,10 +370,10 @@ __meta__ = { [node name="4Item" type="Label" parent="StartScreen/InstructionPanel/GridObservations"] unique_name_in_owner = true -margin_left = 49.0 -margin_top = 114.0 -margin_right = 167.0 -margin_bottom = 148.0 +margin_left = 100.0 +margin_top = 152.0 +margin_right = 218.0 +margin_bottom = 186.0 theme = ExtResource( 1 ) text = "Walking" __meta__ = { @@ -347,10 +382,10 @@ __meta__ = { [node name="4Explanation" type="Label" parent="StartScreen/InstructionPanel/GridObservations"] unique_name_in_owner = true -margin_left = 171.0 -margin_top = 114.0 -margin_right = 1037.0 -margin_bottom = 148.0 +margin_left = 222.0 +margin_top = 152.0 +margin_right = 1088.0 +margin_bottom = 186.0 theme = ExtResource( 1 ) text = "The pupil is walking through the class" __meta__ = { @@ -359,9 +394,9 @@ __meta__ = { [node name="5Acronym" type="Label" parent="StartScreen/InstructionPanel/GridObservations"] unique_name_in_owner = true -margin_top = 152.0 -margin_right = 45.0 -margin_bottom = 186.0 +margin_top = 190.0 +margin_right = 96.0 +margin_bottom = 224.0 theme = ExtResource( 1 ) text = "Oth" __meta__ = { @@ -370,10 +405,10 @@ __meta__ = { [node name="5Item" type="Label" parent="StartScreen/InstructionPanel/GridObservations"] unique_name_in_owner = true -margin_left = 49.0 -margin_top = 152.0 -margin_right = 167.0 -margin_bottom = 186.0 +margin_left = 100.0 +margin_top = 190.0 +margin_right = 218.0 +margin_bottom = 224.0 theme = ExtResource( 1 ) text = "Other" __meta__ = { @@ -382,10 +417,10 @@ __meta__ = { [node name="5Explanation" type="Label" parent="StartScreen/InstructionPanel/GridObservations"] unique_name_in_owner = true -margin_left = 171.0 -margin_top = 152.0 -margin_right = 1037.0 -margin_bottom = 186.0 +margin_left = 222.0 +margin_top = 190.0 +margin_right = 1088.0 +margin_bottom = 224.0 theme = ExtResource( 1 ) text = "The pupil is otherwise distracted and not on task" __meta__ = { @@ -414,17 +449,17 @@ anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -margin_left = -269.5 -margin_top = -103.0 -margin_right = 269.5 -margin_bottom = 7.0 +margin_left = -269.0 +margin_top = -210.0 +margin_right = 270.0 +margin_bottom = 237.0 [node name="ObservedNameLabel" type="Label" parent="StartScreen/NameChangePanel/NameContainer"] unique_name_in_owner = true margin_right = 539.0 margin_bottom = 34.0 theme = ExtResource( 1 ) -text = "Observed Individual Name:" +text = "Observed Individual First Name:" [node name="WarningLabel" type="Label" parent="StartScreen/NameChangePanel/NameContainer"] unique_name_in_owner = true @@ -432,7 +467,7 @@ margin_top = 38.0 margin_right = 539.0 margin_bottom = 72.0 theme = ExtResource( 1 ) -text = "You must enter a name in the field below!" +text = "You must complete all fields below!" [node name="NameLine" type="LineEdit" parent="StartScreen/NameChangePanel/NameContainer"] unique_name_in_owner = true @@ -441,11 +476,41 @@ margin_right = 539.0 margin_bottom = 110.0 theme = ExtResource( 1 ) -[node name="OkButton" type="Button" parent="StartScreen/NameChangePanel/NameContainer"] +[node name="ObserverName" type="Label" parent="StartScreen/NameChangePanel/NameContainer"] +unique_name_in_owner = true margin_top = 114.0 margin_right = 539.0 margin_bottom = 148.0 theme = ExtResource( 1 ) +text = "Your Full Name:" + +[node name="ObserverLine" type="LineEdit" parent="StartScreen/NameChangePanel/NameContainer"] +unique_name_in_owner = true +margin_top = 152.0 +margin_right = 539.0 +margin_bottom = 186.0 +theme = ExtResource( 1 ) + +[node name="ObserverName2" type="Label" parent="StartScreen/NameChangePanel/NameContainer"] +unique_name_in_owner = true +margin_top = 190.0 +margin_right = 539.0 +margin_bottom = 224.0 +theme = ExtResource( 1 ) +text = "Observed during which Activity/Lesson:" + +[node name="ObservedActivity" type="LineEdit" parent="StartScreen/NameChangePanel/NameContainer"] +unique_name_in_owner = true +margin_top = 228.0 +margin_right = 539.0 +margin_bottom = 262.0 +theme = ExtResource( 1 ) + +[node name="OkButton" type="Button" parent="StartScreen/NameChangePanel/NameContainer"] +margin_top = 266.0 +margin_right = 539.0 +margin_bottom = 300.0 +theme = ExtResource( 1 ) text = "OK" [node name="EditScreen" type="CanvasLayer" parent="."] @@ -469,10 +534,28 @@ margin_right = 518.5 margin_bottom = 129.0 columns = 3 +[node name="AcronymLabel" type="Label" parent="EditScreen/Panel/GridObservations"] +margin_right = 96.0 +margin_bottom = 34.0 +text = "Acronym" + +[node name="AcronymLabel2" type="Label" parent="EditScreen/Panel/GridObservations"] +margin_left = 100.0 +margin_right = 244.0 +margin_bottom = 34.0 +text = "Descriptor" + +[node name="AcronymLabel3" type="Label" parent="EditScreen/Panel/GridObservations"] +margin_left = 248.0 +margin_right = 1037.0 +margin_bottom = 34.0 +text = "Explanation" + [node name="1AcronymE" type="LineEdit" parent="EditScreen/Panel/GridObservations"] unique_name_in_owner = true -margin_right = 92.0 -margin_bottom = 34.0 +margin_top = 38.0 +margin_right = 96.0 +margin_bottom = 72.0 theme = ExtResource( 1 ) text = "O" max_length = 3 @@ -482,9 +565,10 @@ __meta__ = { [node name="1ItemE" type="LineEdit" parent="EditScreen/Panel/GridObservations"] unique_name_in_owner = true -margin_left = 96.0 -margin_right = 240.0 -margin_bottom = 34.0 +margin_left = 100.0 +margin_top = 38.0 +margin_right = 244.0 +margin_bottom = 72.0 theme = ExtResource( 1 ) text = "On Task" expand_to_text_length = true @@ -494,9 +578,10 @@ __meta__ = { [node name="1ExplanationE" type="LineEdit" parent="EditScreen/Panel/GridObservations"] unique_name_in_owner = true -margin_left = 244.0 +margin_left = 248.0 +margin_top = 38.0 margin_right = 1037.0 -margin_bottom = 34.0 +margin_bottom = 72.0 size_flags_horizontal = 3 theme = ExtResource( 1 ) text = "The pupil is on task" @@ -506,9 +591,9 @@ __meta__ = { [node name="2AcronymE" type="LineEdit" parent="EditScreen/Panel/GridObservations"] unique_name_in_owner = true -margin_top = 38.0 -margin_right = 92.0 -margin_bottom = 72.0 +margin_top = 76.0 +margin_right = 96.0 +margin_bottom = 110.0 theme = ExtResource( 1 ) text = "L" max_length = 3 @@ -519,10 +604,10 @@ __meta__ = { [node name="2ItemE" type="LineEdit" parent="EditScreen/Panel/GridObservations"] unique_name_in_owner = true -margin_left = 96.0 -margin_top = 38.0 -margin_right = 240.0 -margin_bottom = 72.0 +margin_left = 100.0 +margin_top = 76.0 +margin_right = 244.0 +margin_bottom = 110.0 theme = ExtResource( 1 ) text = "Looking" expand_to_text_length = true @@ -532,10 +617,10 @@ __meta__ = { [node name="2ExplanationE" type="LineEdit" parent="EditScreen/Panel/GridObservations"] unique_name_in_owner = true -margin_left = 244.0 -margin_top = 38.0 +margin_left = 248.0 +margin_top = 76.0 margin_right = 1037.0 -margin_bottom = 72.0 +margin_bottom = 110.0 size_flags_horizontal = 3 theme = ExtResource( 1 ) text = " The pupil is looking around in a distracted manner or is staring into the distance" @@ -545,9 +630,9 @@ __meta__ = { [node name="3AcronymE" type="LineEdit" parent="EditScreen/Panel/GridObservations"] unique_name_in_owner = true -margin_top = 76.0 -margin_right = 92.0 -margin_bottom = 110.0 +margin_top = 114.0 +margin_right = 96.0 +margin_bottom = 148.0 theme = ExtResource( 1 ) text = "D" max_length = 3 @@ -558,10 +643,10 @@ __meta__ = { [node name="3ItemE" type="LineEdit" parent="EditScreen/Panel/GridObservations"] unique_name_in_owner = true -margin_left = 96.0 -margin_top = 76.0 -margin_right = 240.0 -margin_bottom = 110.0 +margin_left = 100.0 +margin_top = 114.0 +margin_right = 244.0 +margin_bottom = 148.0 theme = ExtResource( 1 ) text = "Distracting" expand_to_text_length = true @@ -571,10 +656,10 @@ __meta__ = { [node name="3ExplanationE" type="LineEdit" parent="EditScreen/Panel/GridObservations"] unique_name_in_owner = true -margin_left = 244.0 -margin_top = 76.0 +margin_left = 248.0 +margin_top = 114.0 margin_right = 1037.0 -margin_bottom = 110.0 +margin_bottom = 148.0 size_flags_horizontal = 3 theme = ExtResource( 1 ) text = "The pupil is distracting other pupils or talking to them" @@ -584,9 +669,9 @@ __meta__ = { [node name="4AcronymE" type="LineEdit" parent="EditScreen/Panel/GridObservations"] unique_name_in_owner = true -margin_top = 114.0 -margin_right = 92.0 -margin_bottom = 148.0 +margin_top = 152.0 +margin_right = 96.0 +margin_bottom = 186.0 theme = ExtResource( 1 ) text = "W" max_length = 3 @@ -596,10 +681,10 @@ __meta__ = { [node name="4ItemE" type="LineEdit" parent="EditScreen/Panel/GridObservations"] unique_name_in_owner = true -margin_left = 96.0 -margin_top = 114.0 -margin_right = 240.0 -margin_bottom = 148.0 +margin_left = 100.0 +margin_top = 152.0 +margin_right = 244.0 +margin_bottom = 186.0 theme = ExtResource( 1 ) text = "Walking" expand_to_text_length = true @@ -609,10 +694,10 @@ __meta__ = { [node name="4ExplanationE" type="LineEdit" parent="EditScreen/Panel/GridObservations"] unique_name_in_owner = true -margin_left = 244.0 -margin_top = 114.0 +margin_left = 248.0 +margin_top = 152.0 margin_right = 1037.0 -margin_bottom = 148.0 +margin_bottom = 186.0 size_flags_horizontal = 3 theme = ExtResource( 1 ) text = "The pupil is walking through the class" @@ -622,9 +707,9 @@ __meta__ = { [node name="5AcronymE" type="LineEdit" parent="EditScreen/Panel/GridObservations"] unique_name_in_owner = true -margin_top = 152.0 -margin_right = 92.0 -margin_bottom = 186.0 +margin_top = 190.0 +margin_right = 96.0 +margin_bottom = 224.0 theme = ExtResource( 1 ) text = "O" max_length = 3 @@ -634,10 +719,10 @@ __meta__ = { [node name="5ItemE" type="LineEdit" parent="EditScreen/Panel/GridObservations"] unique_name_in_owner = true -margin_left = 96.0 -margin_top = 152.0 -margin_right = 240.0 -margin_bottom = 186.0 +margin_left = 100.0 +margin_top = 190.0 +margin_right = 244.0 +margin_bottom = 224.0 theme = ExtResource( 1 ) text = "Other" expand_to_text_length = true @@ -647,10 +732,10 @@ __meta__ = { [node name="5ExplanationE" type="LineEdit" parent="EditScreen/Panel/GridObservations"] unique_name_in_owner = true -margin_left = 244.0 -margin_top = 152.0 +margin_left = 248.0 +margin_top = 190.0 margin_right = 1037.0 -margin_bottom = 186.0 +margin_bottom = 224.0 size_flags_horizontal = 3 theme = ExtResource( 1 ) text = "The pupil is otherwise distracted and not on task" @@ -672,7 +757,15 @@ margin_right = 656.0 margin_bottom = 679.0 text = "OK" +[node name="ClearAll" type="Button" parent="EditScreen/Panel"] +margin_left = 952.0 +margin_top = 615.0 +margin_right = 1051.0 +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"] @@ -757,6 +850,13 @@ margin_bottom = 506.0 theme = ExtResource( 1 ) text = "Remaining" +[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="TwentySecondTimer" type="Timer" parent="ObservationWindow"] unique_name_in_owner = true wait_time = 20.0 @@ -780,6 +880,9 @@ anchor_bottom = 1.0 margin_top = -157.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 @@ -795,6 +898,31 @@ margin_right = 158.0 margin_bottom = 862.0 text = "Restart" +[node name="MainText" type="Label" parent="Results/Panel"] +margin_left = 11.0 +margin_top = 11.0 +margin_right = 1268.0 +margin_bottom = 163.0 +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="Obs1Text" type="Label" parent="Results/Panel"] +unique_name_in_owner = true +margin_left = 199.0 +margin_top = 278.0 +margin_right = 361.0 +margin_bottom = 312.0 +text = "Observation 1: " + [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"] [connection signal="pressed" from="StartScreen/InstructionPanel/BottomButtons/Manual" to="." method="_on_Manual_pressed"] @@ -804,6 +932,14 @@ text = "Restart" [connection signal="pressed" from="StartScreen/NameChangePanel/NameContainer/OkButton" to="StartScreen/NameChangePanel" method="_on_OkButton_pressed"] [connection signal="pressed" from="EditScreen/Panel/CancelButton" to="EditScreen" method="_on_CancelButton_pressed"] [connection signal="pressed" from="EditScreen/Panel/OKButton" to="EditScreen" method="_on_OKButton_pressed"] +[connection signal="pressed" from="EditScreen/Panel/ClearAll" to="EditScreen" method="_on_ClearAll_pressed"] +[connection signal="pressed" from="ObservationWindow/Panel/BehaviourButtons/BehaviourOne" to="ObservationWindow" method="_on_BehaviourOne_pressed"] +[connection signal="pressed" from="ObservationWindow/Panel/BehaviourButtons/BehaviourTwo" to="ObservationWindow" method="_on_BehaviourTwo_pressed"] +[connection signal="pressed" from="ObservationWindow/Panel/BehaviourButtons/BehaviourThree" to="ObservationWindow" method="_on_BehaviourThree_pressed"] +[connection signal="pressed" from="ObservationWindow/Panel/BehaviourButtons/BehaviourFour" to="ObservationWindow" method="_on_BehaviourFour_pressed"] +[connection signal="pressed" from="ObservationWindow/Panel/BehaviourButtons/BehaviourFive" to="ObservationWindow" method="_on_BehaviourFive_pressed"] +[connection signal="pressed" from="ObservationWindow/Panel/Button" to="ObservationWindow" method="_on_Button_pressed"] [connection signal="timeout" from="ObservationWindow/TwentySecondTimer" to="ObservationWindow" method="_on_TwentySecondTimer_timeout"] +[connection signal="visibility_changed" from="Results" to="Results" method="_on_Results_visibility_changed"] [connection signal="pressed" from="Results/Panel/SaveReport" to="Results" method="_on_SaveReport_pressed"] [connection signal="pressed" from="Results/Panel/BackMainMenu" to="Results" method="_on_BackMainMenu_pressed"]