From 06151e97b9d418ec697c570f7a704b9729e33e40 Mon Sep 17 00:00:00 2001
From: fheinrich <fheinrich@techfak.uni-bielefeld.de>
Date: Wed, 6 Mar 2024 15:09:01 +0100
Subject: [PATCH] Fix screen update on scroll, adjusted post game screen
---
cooperative_cuisine/pygame_2d_vis/gui.py | 102 +++++++++++-------
.../pygame_2d_vis/gui_theme.json | 14 +++
2 files changed, 75 insertions(+), 41 deletions(-)
diff --git a/cooperative_cuisine/pygame_2d_vis/gui.py b/cooperative_cuisine/pygame_2d_vis/gui.py
index e9c9f6c6..c4d8dff9 100644
--- a/cooperative_cuisine/pygame_2d_vis/gui.py
+++ b/cooperative_cuisine/pygame_2d_vis/gui.py
@@ -754,14 +754,12 @@ class PyGameGUI:
self.continue_button.get_abs_rect().top
- self.text_recipes_label.get_abs_rect().bottom
)
-
self.scroll_width = self.window_width
- self.scroll_space = pygame_gui.elements.UIScrollingContainer(
+ self.scroll_space_recipes = pygame_gui.elements.UIScrollingContainer(
relative_rect=pygame.Rect((0, 0), (self.scroll_width, scroll_height)),
manager=self.manager,
anchors={"centerx": "centerx", "top_target": self.text_recipes_label},
)
-
########################################################################
# Game screen
########################################################################
@@ -817,7 +815,7 @@ class PyGameGUI:
########################################################################
rect = pygame.Rect((0, 0), (220, 80))
- rect.bottom = -20
+ rect.bottom = -self.elements_margin
self.next_game_button = pygame_gui.elements.UIButton(
relative_rect=rect,
manager=self.manager,
@@ -826,25 +824,15 @@ class PyGameGUI:
object_id="#split_players_button",
)
- rect = pygame.Rect((0, 0), (220, 80))
- rect.bottom = -20
- self.finish_study_button = pygame_gui.elements.UIButton(
- relative_rect=rect,
- manager=self.manager,
- text="Finish study",
- anchors={"centerx": "centerx", "bottom": "bottom"},
- object_id="#split_players_button",
- )
-
rect = pygame.Rect(
(0, 0),
- (self.window_width, 50),
+ (self.window_width, self.window_height * 0.07),
)
self.score_conclusion = pygame_gui.elements.UILabel(
text=f"not set",
relative_rect=rect,
manager=self.manager,
- object_id="#level_name",
+ object_id="#score_conclusion",
anchors={"centerx": "centerx", "top_target": self.level_name_label},
)
@@ -852,13 +840,38 @@ class PyGameGUI:
text=f"Completed meals:",
relative_rect=pygame.Rect(
(0, 0),
- (self.window_width * 0.7, 50),
+ (self.window_width, self.window_height * 0.05),
),
manager=self.manager,
- object_id="#level_name",
+ object_id="#completed_meals_label",
anchors={"centerx": "centerx", "top_target": self.score_conclusion},
)
+ scroll_height = (
+ self.continue_button.get_abs_rect().top
+ - self.completed_meals_text_label.get_abs_rect().bottom
+ - 10
+ )
+ self.scroll_width_completed_meals = self.window_width
+ self.scroll_space_completed_meals = pygame_gui.elements.UIScrollingContainer(
+ relative_rect=pygame.Rect((0, 0), (self.scroll_width, scroll_height)),
+ manager=self.manager,
+ anchors={
+ "centerx": "centerx",
+ "top_target": self.completed_meals_text_label,
+ },
+ )
+
+ rect = pygame.Rect((0, 0), (220, 80))
+ rect.bottom = -self.elements_margin
+ self.finish_study_button = pygame_gui.elements.UIButton(
+ relative_rect=rect,
+ manager=self.manager,
+ text="Finish study",
+ anchors={"centerx": "centerx", "bottom": "bottom"},
+ object_id="#split_players_button",
+ )
+
########################################################################
# End screen
########################################################################
@@ -884,7 +897,7 @@ class PyGameGUI:
)
rect = pygame.Rect((0, 0), (self.window_width * 0.9, self.window_height * 0.1))
text2 = pygame_gui.elements.UILabel(
- text="Please signal the study supervisor that you are ready.",
+ text="Please signal the study supervisor that you the study is finished.",
relative_rect=rect,
manager=self.manager,
object_id="#score_label",
@@ -915,7 +928,7 @@ class PyGameGUI:
self.pregame_screen_elements = [
self.level_name_label,
self.text_recipes_label,
- self.scroll_space,
+ self.scroll_space_recipes,
self.continue_button,
self.quit_button,
self.fullscreen_button,
@@ -933,7 +946,7 @@ class PyGameGUI:
self.postgame_screen_elements = [
self.score_conclusion,
self.quit_button,
- self.scroll_space,
+ self.scroll_space_completed_meals,
self.level_name_label,
self.next_game_button,
self.finish_study_button,
@@ -1056,13 +1069,12 @@ class PyGameGUI:
def update_postgame_screen(self, state):
score = state["score"]
self.score_conclusion.set_text(f"Your final score is {score}. Hurray!")
- self.level_name_label.set_text(f"Completed: {self.level_info['name']}!")
+ self.level_name_label.set_text(f"Completed: {self.level_info['name']}")
served_meals = state["served_meals"]
- row_height = 30
- # icon_size = 50
- container_width = self.scroll_width * 0.9
+ row_height = self.window_height * 0.04
+ container_width = self.scroll_width_completed_meals * 0.9
container_height = len(served_meals) * row_height
main_container = pygame_gui.elements.UIPanel(
@@ -1075,11 +1087,10 @@ class PyGameGUI:
),
object_id="#graph_container",
manager=self.manager,
- container=self.scroll_space,
+ container=self.scroll_space_completed_meals,
)
last_completed_meals = []
-
for idx, (player, meal) in enumerate(served_meals):
if idx == 0:
anchors = {"centerx": "centerx", "top": "top"}
@@ -1113,12 +1124,12 @@ class PyGameGUI:
manager=self.manager,
container=container,
object_id="#recipe",
- anchors={"centery": "centery", "left": "left"},
+ anchors={"center": "center"},
)
last_completed_meals.append(container)
- self.scroll_space.set_scrollable_area_dimensions(
- (self.scroll_width * 0.95, container_height)
+ self.scroll_space_completed_meals.set_scrollable_area_dimensions(
+ (self.scroll_width_completed_meals * 0.95, container_height)
)
def exit_game(self):
@@ -1308,7 +1319,7 @@ class PyGameGUI:
),
object_id="#graph_container",
manager=self.manager,
- container=self.scroll_space,
+ container=self.scroll_space_recipes,
)
last_recipes_labels = []
@@ -1377,7 +1388,7 @@ class PyGameGUI:
last_recipes_labels.append(container)
- self.scroll_space.set_scrollable_area_dimensions(
+ self.scroll_space_recipes.set_scrollable_area_dimensions(
(self.scroll_width * 0.95, container_height)
)
@@ -1760,17 +1771,19 @@ class PyGameGUI:
############################################
case MenuStates.PreGame:
- self.setup_game()
- self.set_game_size()
- self.menu_state = MenuStates.Game
+ if button == self.continue_button:
+ self.setup_game()
+ self.set_game_size()
+ self.menu_state = MenuStates.Game
############################################
case MenuStates.PostGame:
- if self.last_level:
- self.menu_state = MenuStates.End
- else:
- self.button_continue_postgame_pressed()
+ if button in [self.next_game_button, self.finish_study_button]:
+ if self.last_level:
+ self.menu_state = MenuStates.End
+ else:
+ self.button_continue_postgame_pressed()
############################################
@@ -1851,8 +1864,15 @@ class PyGameGUI:
self.update_screen_elements()
if event.type == pygame_gui.UI_BUTTON_PRESSED:
- self.manage_button_event(event.ui_element)
- self.update_screen_elements()
+ button = event.ui_element
+ self.manage_button_event(button)
+ if button in [
+ self.start_button,
+ self.continue_button,
+ self.finish_study_button,
+ self.next_game_button,
+ ]:
+ self.update_screen_elements()
if event.type in [
pygame.KEYDOWN,
diff --git a/cooperative_cuisine/pygame_2d_vis/gui_theme.json b/cooperative_cuisine/pygame_2d_vis/gui_theme.json
index 0f3e1bf4..be4c5ad6 100644
--- a/cooperative_cuisine/pygame_2d_vis/gui_theme.json
+++ b/cooperative_cuisine/pygame_2d_vis/gui_theme.json
@@ -174,6 +174,20 @@
"colour": "#000000"
}
},
+ "#score_conclusion": {
+ "font": {
+ "size": 23,
+ "bold": 1,
+ "colour": "#000000"
+ }
+ },
+ "#completed_meals_label": {
+ "font": {
+ "size": 20,
+ "bold": 0,
+ "colour": "#000000"
+ }
+ },
"#recipe_name": {
"font": {
"size": 20,
--
GitLab