From 75263e7262f3c133caece8a0082b65b9ee3c0d21 Mon Sep 17 00:00:00 2001 From: Sander Land Date: Tue, 28 Apr 2020 22:14:40 +0200 Subject: [PATCH] almost there --- gui/controls.py | 6 +++++- gui/kivyutils.py | 5 ++--- katrain.kv | 12 +++++------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/gui/controls.py b/gui/controls.py index 85e4da5..594fdf3 100644 --- a/gui/controls.py +++ b/gui/controls.py @@ -50,7 +50,8 @@ class Controls(BoxLayout): if current_node: move = current_node.single_move - next_player_is_human_or_both_robots = current_node.player and ("ai" not in self.player_mode(current_node.player) or "ai" in self.player_mode(current_node.next_player)) + both_players_are_robots = "ai" in self.player_mode(current_node.player) and "ai" in self.player_mode(current_node.next_player) + next_player_is_human_or_both_robots = current_node.player and ("ai" not in self.player_mode(current_node.player) or both_players_are_robots) current_player_is_ai_playing_human = current_node.player and "ai" in self.player_mode(current_node.player) and "ai" not in self.player_mode(current_node.next_player) if next_player_is_human_or_both_robots and not current_node.is_root and move: info += current_node.comment(teach="undo" in self.player_mode(current_node.player), hints=self.hints.active) @@ -67,6 +68,9 @@ class Controls(BoxLayout): elif not current_player_is_ai_playing_human: self.score_change.label = f"Points lost" self.score_change.text = "" + elif both_players_are_robots and current_node.parent and current_node.parent.analysis_ready: + self.score.text = current_node.parent.format_score() + self.win_rate.text = current_node.parent.format_win_rate() self.graph.update_value(current_node) diff --git a/gui/kivyutils.py b/gui/kivyutils.py index 7d5de69..58e5342 100644 --- a/gui/kivyutils.py +++ b/gui/kivyutils.py @@ -202,9 +202,8 @@ class LabelledIntInput(LabelledTextInput): class CensorableLabel(BoxLayout): - @property - def text(self): - return self.value.text + text = StringProperty("") + label = StringProperty("") class ScoreGraph(Label): diff --git a/katrain.kv b/katrain.kv index a6b18fa..4a547db 100644 --- a/katrain.kv +++ b/katrain.kv @@ -150,23 +150,21 @@ valign: 'center' size: self.texture_size -: +: color: BLACK halign: 'center' valign: 'center' size: self.texture_size : + value : value orientation: 'horizontal' - text: '' - label: '' ClickableLabel: size_hint: 0.6,1 id: desc text: root.label font_size: self.size[1] * 0.8 - on_press: - value.opacity = 1 if value.opacity==0 else 0 + on_press: value.opacity = 1 if value.opacity==0 else 0 DarkLabel: size_hint: 0.4,1 text: root.text @@ -578,8 +576,8 @@ size_hint: 1,0.2 CensorableLabel: id: score_change - size_hint: 1, 0.025 - label: 'Score change' + size_hint: 1, 0.024 + label: 'Points Lost' text: '' BoxLayout: size_hint: 1,0.2