Compare commits
20
Commits
dev0
...
ab6fd43883
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ab6fd43883 | ||
|
|
dc25e2d98b | ||
|
|
ac7a841d05 | ||
|
|
bc5ae5394c | ||
|
|
e3f5828334 | ||
|
|
c657415bf0 | ||
|
|
6a66a02071 | ||
|
|
da169b49fc | ||
|
|
6254de74e4 | ||
|
|
1da622cd7c | ||
|
|
63a51c7ae3 | ||
|
|
c07bf63b8b | ||
|
|
f80a9b4098 | ||
|
|
f38539f3c8 | ||
|
|
715853c4b9 | ||
|
|
e5bfbee528 | ||
|
|
5fcbf5ac06 | ||
|
|
3add50cbbc | ||
|
|
e533acd9f1 | ||
|
|
a25997992e |
+4
-1
@@ -38,4 +38,7 @@ env/
|
||||
venv/
|
||||
ENV/
|
||||
env.bak/
|
||||
venv.bak/
|
||||
venv.bak/
|
||||
|
||||
# Sandbox
|
||||
sandbox
|
||||
@@ -0,0 +1,12 @@
|
||||
# Описание протокола
|
||||
## Формат сообщений
|
||||
```json
|
||||
{
|
||||
"version": "1.0",
|
||||
"id": 0,
|
||||
"event": "role_changed",
|
||||
"payload": {
|
||||
"role": "NONE"
|
||||
}
|
||||
}
|
||||
```
|
||||
@@ -0,0 +1,20 @@
|
||||
from dataclasses import dataclass
|
||||
from typing import Optional
|
||||
|
||||
from .input import SessionInput
|
||||
from .network import SessionNetworkController
|
||||
from .state import SessionState
|
||||
from .ui.views import SessionPanel
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class SessionContext:
|
||||
input: SessionInput
|
||||
network: SessionNetworkController
|
||||
state: SessionState
|
||||
view: SessionPanel
|
||||
|
||||
|
||||
@dataclass
|
||||
class AppContext:
|
||||
session: Optional[SessionContext] = None
|
||||
@@ -0,0 +1,7 @@
|
||||
from .state import AppState, LobbyState, SessionState
|
||||
|
||||
__all__ = [
|
||||
"AppState",
|
||||
"LobbyState",
|
||||
"SessionState",
|
||||
]
|
||||
@@ -0,0 +1,172 @@
|
||||
from typing import Callable, Optional
|
||||
|
||||
from wx.lib.pubsub import pub
|
||||
|
||||
from ..network import NetworkController, NetworkMesssage
|
||||
|
||||
OnNetworkEventCallback = Callable[[dict[str, str]], None]
|
||||
|
||||
|
||||
class BaseState:
|
||||
def __init__(self, app_state: "AppState"):
|
||||
self.app_state = app_state
|
||||
|
||||
def handle_network_message(self, message: NetworkMesssage) -> None:
|
||||
pass
|
||||
|
||||
|
||||
class LobbyState(BaseState):
|
||||
def __init__(self, app_state: "AppState", local_player_name: str):
|
||||
super().__init__(app_state)
|
||||
self.local_player_name: str = local_player_name
|
||||
self.remote_player_name: Optional[str] = None
|
||||
self.players: dict[str, str] = {self.local_player_name: "NONE"}
|
||||
|
||||
def handle_network_message(self, message: NetworkMesssage) -> None:
|
||||
callbacks: dict[str, OnNetworkEventCallback] = {
|
||||
"add_player": self.handle_add_player,
|
||||
"get_player": self.handle_get_player,
|
||||
"set_role": self.handle_set_player_role,
|
||||
"disconnect": self.handle_disconnect,
|
||||
"server_stop": self.handle_server_stop,
|
||||
}
|
||||
|
||||
callback = callbacks.get(message.event, None)
|
||||
if callback:
|
||||
callback(message.payload)
|
||||
pub.sendMessage("lobby.refresh", state=self)
|
||||
|
||||
def send_local_player(self) -> None:
|
||||
player_name = self.local_player_name
|
||||
player_role = self.players.get(player_name, "NONE")
|
||||
|
||||
self.app_state.network.send(
|
||||
"add_player",
|
||||
{
|
||||
"player_name": player_name,
|
||||
"player_role": player_role,
|
||||
},
|
||||
)
|
||||
|
||||
def get_remote_player(self) -> None:
|
||||
self.app_state.network.send("get_player")
|
||||
|
||||
def set_player_role(self, role: str) -> bool:
|
||||
current_role = self.players[self.local_player_name]
|
||||
result = False
|
||||
|
||||
if current_role == role:
|
||||
result = False
|
||||
|
||||
if role in ["NONE", "SETTER", "GUESSER"]:
|
||||
self.players[self.local_player_name] = role
|
||||
result = True
|
||||
|
||||
if result:
|
||||
if self.app_state.network.conn:
|
||||
self.app_state.network.send(
|
||||
"set_role",
|
||||
{
|
||||
"player_name": self.local_player_name,
|
||||
"player_role": role,
|
||||
},
|
||||
)
|
||||
|
||||
return result
|
||||
|
||||
def send_client_disconnect(self) -> None:
|
||||
self.app_state.network.send(
|
||||
"disconnect", {"player_name": self.local_player_name}
|
||||
)
|
||||
|
||||
def send_server_stop(self) -> None:
|
||||
self.app_state.network.send("server_stop")
|
||||
|
||||
def handle_add_player(self, payload: dict[str, str]) -> None:
|
||||
player_name = payload["player_name"]
|
||||
player_role = payload["player_role"]
|
||||
self.remote_player_name = player_name
|
||||
self.players[self.remote_player_name] = player_role
|
||||
|
||||
def handle_get_player(self, payload: dict[str, str]) -> None:
|
||||
self.send_local_player()
|
||||
|
||||
def handle_set_player_role(self, payload: dict[str, str]) -> None:
|
||||
player_name = payload["player_name"]
|
||||
player_role = payload["player_role"]
|
||||
|
||||
self.players[player_name] = player_role
|
||||
|
||||
def handle_disconnect(self, payload: dict[str, str]) -> None:
|
||||
player_name = payload["player_name"]
|
||||
self.players.pop(player_name)
|
||||
self.remote_player_name = None
|
||||
|
||||
def handle_server_stop(self, payload: dict[str, str]) -> None:
|
||||
pub.sendMessage("mainframe.remote_server_stop", state=self.app_state)
|
||||
|
||||
@property
|
||||
def local_player_role(self) -> str:
|
||||
return self.players[self.local_player_name]
|
||||
|
||||
def is_ready(self) -> bool:
|
||||
roles = list(self.players.values())
|
||||
return ("SETTER" in roles) and ("GUESSER" in roles)
|
||||
|
||||
|
||||
class SessionState(BaseState):
|
||||
def __init__(self, app_state: "AppState"):
|
||||
super().__init__(app_state)
|
||||
|
||||
|
||||
class AppState:
|
||||
def __init__(self):
|
||||
self.network = NetworkController(
|
||||
self.handle_network_message,
|
||||
self.handle_network_notice,
|
||||
)
|
||||
|
||||
self.lobby: Optional[LobbyState] = None
|
||||
self.session: Optional[SessionState] = None
|
||||
|
||||
def handle_network_message(self, message: NetworkMesssage) -> None:
|
||||
if self.lobby:
|
||||
self.lobby.handle_network_message(message)
|
||||
|
||||
if self.session:
|
||||
self.session.handle_network_message(message)
|
||||
|
||||
def handle_network_notice(self, notice: str) -> None:
|
||||
pub.sendMessage("mainframe.statusbar", notice=notice)
|
||||
|
||||
def recreate_network_controller(self) -> None:
|
||||
self.network.stop()
|
||||
self.network = NetworkController(
|
||||
self.handle_network_message,
|
||||
self.handle_network_notice,
|
||||
)
|
||||
|
||||
def connect(self, player_name: str, host: str, port: int = 8994) -> bool:
|
||||
if self.network.connect(host, port):
|
||||
self.lobby = LobbyState(self, player_name)
|
||||
self.lobby.send_local_player()
|
||||
self.lobby.get_remote_player()
|
||||
return True
|
||||
else:
|
||||
self.recreate_network_controller()
|
||||
return False
|
||||
|
||||
def serve(self, player_name: str, host: str, port: int = 8994) -> None:
|
||||
self.network.serve(host, port)
|
||||
self.lobby = LobbyState(self, player_name)
|
||||
|
||||
def disconnect(self) -> None:
|
||||
if self.lobby:
|
||||
if self.network.is_server:
|
||||
self.lobby.send_server_stop()
|
||||
else:
|
||||
self.lobby.send_client_disconnect()
|
||||
|
||||
self.lobby = None
|
||||
|
||||
self.recreate_network_controller()
|
||||
@@ -0,0 +1,65 @@
|
||||
from dataclasses import dataclass
|
||||
from enum import Enum, auto
|
||||
from typing import Optional
|
||||
|
||||
|
||||
class CardState(Enum):
|
||||
SETTER_NOT_SET = auto()
|
||||
SETTER_HIDDEN = auto()
|
||||
SETTER_REVEALED = auto()
|
||||
GUESSER_DISABLED = auto()
|
||||
GUESSER_WAITING = auto()
|
||||
GUESSER_CORRECT = auto()
|
||||
GUESSER_WRONG = auto()
|
||||
|
||||
|
||||
class ArrowDirection(Enum):
|
||||
LEFT = auto()
|
||||
RIGHT = auto()
|
||||
|
||||
|
||||
@dataclass
|
||||
class SessionStats:
|
||||
total: int
|
||||
setted: int
|
||||
correct: int
|
||||
wrong: int
|
||||
taken_time: float
|
||||
|
||||
@property
|
||||
def accuracy(self) -> float:
|
||||
accuracy: float
|
||||
if self.total == 0:
|
||||
accuracy = 0.0
|
||||
accuracy = (self.correct / self.total) * 100
|
||||
return round(accuracy, 1)
|
||||
|
||||
|
||||
class StepState(Enum):
|
||||
WAITING_FOR_SETTER = auto()
|
||||
WAITING_FOR_GUESSER = auto()
|
||||
SESSION_FINISHED = auto()
|
||||
|
||||
|
||||
class PlayerRole(Enum):
|
||||
SETTER = auto()
|
||||
GUESSER = auto()
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class CardData:
|
||||
direction: Optional[ArrowDirection]
|
||||
state: CardState
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class StepData:
|
||||
index: int
|
||||
setter: CardData
|
||||
guesser: CardData
|
||||
|
||||
|
||||
@dataclass
|
||||
class Player:
|
||||
name: str
|
||||
role: PlayerRole
|
||||
@@ -0,0 +1,3 @@
|
||||
from .session_input import SessionInput
|
||||
|
||||
__all__ = ["SessionInput"]
|
||||
@@ -0,0 +1,16 @@
|
||||
from mind_reader.app_context import SessionContext
|
||||
from mind_reader.domain import ArrowDirection
|
||||
|
||||
|
||||
class SessionInput:
|
||||
def __init__(self, context: SessionContext):
|
||||
self._context = context
|
||||
|
||||
def start_session(self) -> None:
|
||||
pass
|
||||
|
||||
def make_local_move(self, direction: ArrowDirection) -> bool:
|
||||
pass
|
||||
|
||||
def finish_session(self) -> None:
|
||||
pass
|
||||
@@ -0,0 +1,9 @@
|
||||
from .controller import NetworkController
|
||||
from .protocol import NetworkMesssage
|
||||
from .session_network_controller import SessionNetworkController
|
||||
|
||||
__all__ = [
|
||||
"SessionNetworkController",
|
||||
"NetworkController",
|
||||
"NetworkMesssage",
|
||||
]
|
||||
@@ -0,0 +1,150 @@
|
||||
import socket
|
||||
import struct
|
||||
import threading
|
||||
from typing import Callable, Optional
|
||||
|
||||
import wx
|
||||
|
||||
from .protocol import NetworkMesssage
|
||||
|
||||
OnMessageCallback = Callable[[NetworkMesssage], None]
|
||||
OnNoticeCallback = Callable[[str], None]
|
||||
|
||||
|
||||
def receive_exact(sock: socket.socket, n: int) -> Optional[bytes]:
|
||||
data = bytearray()
|
||||
|
||||
while len(data) < n:
|
||||
packet = sock.recv(n - len(data))
|
||||
if not packet:
|
||||
return None
|
||||
data.extend(packet)
|
||||
|
||||
return bytes(data)
|
||||
|
||||
|
||||
class NetworkController(threading.Thread):
|
||||
def __init__(
|
||||
self,
|
||||
on_message_callback: OnMessageCallback,
|
||||
on_notice_callback: Optional[OnNoticeCallback] = None,
|
||||
):
|
||||
super().__init__(daemon=True)
|
||||
self.on_message_callback = on_message_callback
|
||||
self.on_notice_callback = on_notice_callback
|
||||
|
||||
self.sock: Optional[socket.socket] = None
|
||||
self.conn: Optional[socket.socket] = None
|
||||
|
||||
self.is_running: bool = False
|
||||
self.is_server: bool = False
|
||||
|
||||
def serve(self, host: str = "0.0.0.0", port: int = 8994) -> None:
|
||||
self.is_server = True
|
||||
|
||||
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||
self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
|
||||
self.sock.bind((host, port))
|
||||
self.sock.listen(1)
|
||||
|
||||
self.is_running = True
|
||||
self.start()
|
||||
|
||||
def connect(self, host: str, port: int = 8994) -> bool:
|
||||
self.is_server = False
|
||||
|
||||
try:
|
||||
self.conn = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||
self.conn.connect((host, port))
|
||||
|
||||
self.is_running = True
|
||||
self._notify("Connected to host")
|
||||
self.start()
|
||||
return True
|
||||
except Exception as e:
|
||||
self._notify(f"Connection failed: {e}")
|
||||
return False
|
||||
|
||||
def send(self, event: str, payload: dict = {}) -> None:
|
||||
if not self.conn or not self.is_running:
|
||||
return
|
||||
|
||||
m = NetworkMesssage(event, payload)
|
||||
|
||||
try:
|
||||
self.conn.sendall(m.encode())
|
||||
except Exception as e:
|
||||
self._notify(f"Send error: {e}")
|
||||
self._close_active_connection()
|
||||
|
||||
def run(self) -> None:
|
||||
HEADER_SIZE = 4
|
||||
|
||||
while self.is_running:
|
||||
if self.is_server and self.sock and not self.conn:
|
||||
self._notify("Waiting for peer to connect...")
|
||||
|
||||
try:
|
||||
self.conn, addr = self.sock.accept()
|
||||
self._notify(f"Peer connected from {addr[0]}:{addr[1]}")
|
||||
except Exception:
|
||||
break
|
||||
|
||||
while self.is_running and self.conn:
|
||||
try:
|
||||
header_bytes = receive_exact(self.conn, HEADER_SIZE)
|
||||
if not header_bytes:
|
||||
self._notify("Peer disconnected")
|
||||
break
|
||||
|
||||
body_size = struct.unpack(">I", header_bytes)[0]
|
||||
|
||||
body_bytes = receive_exact(self.conn, body_size)
|
||||
if not body_bytes:
|
||||
self._notify("Peer disconnected unexpectedly")
|
||||
break
|
||||
|
||||
json_str = body_bytes.decode("utf-8")
|
||||
m = NetworkMesssage.from_json(json_str)
|
||||
|
||||
wx.CallAfter(self.on_message_callback, m)
|
||||
|
||||
except Exception as e:
|
||||
self._notify(f"Read error: {e}")
|
||||
break
|
||||
|
||||
self._close_active_connection()
|
||||
|
||||
if not self.is_server:
|
||||
break
|
||||
|
||||
self.stop()
|
||||
|
||||
def _close_active_connection(self) -> None:
|
||||
if self.conn:
|
||||
try:
|
||||
self.conn.shutdown(socket.SHUT_RDWR)
|
||||
self.conn.close()
|
||||
except Exception:
|
||||
pass
|
||||
finally:
|
||||
self.conn = None
|
||||
|
||||
def _notify(self, notice: str) -> None:
|
||||
if self.on_notice_callback:
|
||||
wx.CallAfter(self.on_notice_callback, notice)
|
||||
|
||||
def stop(self) -> None:
|
||||
self.is_running = False
|
||||
|
||||
self._close_active_connection()
|
||||
|
||||
if self.sock:
|
||||
try:
|
||||
self.sock.close()
|
||||
except Exception:
|
||||
pass
|
||||
finally:
|
||||
self.sock = None
|
||||
|
||||
self._notify("Connection closed")
|
||||
@@ -0,0 +1,46 @@
|
||||
import itertools
|
||||
import json
|
||||
import struct
|
||||
from dataclasses import dataclass, field
|
||||
|
||||
_id_generator = itertools.count(0)
|
||||
|
||||
|
||||
@dataclass
|
||||
class NetworkMesssage:
|
||||
event: str
|
||||
payload: dict[str, str] = field(default_factory=dict)
|
||||
id: int = field(default_factory=lambda: next(_id_generator))
|
||||
version: str = "1.0"
|
||||
|
||||
def to_json(self) -> str:
|
||||
return json.dumps(
|
||||
{
|
||||
"version": self.version,
|
||||
"id": self.id,
|
||||
"event": self.event,
|
||||
"payload": self.payload,
|
||||
},
|
||||
ensure_ascii=False,
|
||||
)
|
||||
|
||||
@classmethod
|
||||
def from_json(cls, json_str: str) -> "NetworkMesssage":
|
||||
data = json.loads(json_str)
|
||||
return cls(
|
||||
event=data.get("event", "unknown"),
|
||||
payload=data.get("payload", {}),
|
||||
id=data.get("id", -1),
|
||||
version=data.get("version", "unknown"),
|
||||
)
|
||||
|
||||
def encode(self) -> bytes:
|
||||
raw_bytes = self.to_json().encode("utf-8")
|
||||
length_prefix = struct.pack(">I", len(raw_bytes))
|
||||
return length_prefix + raw_bytes
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
for i in range(10):
|
||||
message = NetworkMesssage("none")
|
||||
print(message.encode())
|
||||
@@ -0,0 +1,2 @@
|
||||
class SessionNetworkController:
|
||||
pass
|
||||
@@ -0,0 +1,3 @@
|
||||
from .session_state import SessionState
|
||||
|
||||
__all__ = ["SessionState"]
|
||||
@@ -0,0 +1,194 @@
|
||||
from wx.lib.pubsub import pub
|
||||
|
||||
from mind_reader.domain import (
|
||||
ArrowDirection,
|
||||
CardData,
|
||||
CardState,
|
||||
Player,
|
||||
PlayerRole,
|
||||
StepData,
|
||||
StepState,
|
||||
)
|
||||
|
||||
|
||||
class SessionState:
|
||||
def __init__(
|
||||
self,
|
||||
local_player: Player,
|
||||
remote_player: Player,
|
||||
sequence_length: int = 20,
|
||||
):
|
||||
self._local_player = local_player
|
||||
self._remote_player = remote_player
|
||||
|
||||
self._sequence_length = sequence_length
|
||||
self._setter_moves: list[ArrowDirection] = []
|
||||
self._guesser_moves: list[ArrowDirection] = []
|
||||
|
||||
self._step_state: StepState = StepState.WAITING_FOR_SETTER
|
||||
|
||||
@property
|
||||
def _completed_move_count(self):
|
||||
return len(self._guesser_moves)
|
||||
|
||||
def _get_setter_card_state(self, index: int) -> CardState:
|
||||
current_index = len(self._setter_moves)
|
||||
|
||||
if index > current_index:
|
||||
return CardState.SETTER_NOT_SET
|
||||
|
||||
elif index == current_index:
|
||||
if self._step_state == StepState.WAITING_FOR_GUESSER:
|
||||
if self._local_player.role == PlayerRole.SETTER:
|
||||
return CardState.SETTER_REVEALED
|
||||
else:
|
||||
return CardState.SETTER_HIDDEN
|
||||
|
||||
return CardState.SETTER_REVEALED
|
||||
|
||||
def _get_guesser_card_state(self, index: int) -> CardState:
|
||||
completed_move_count = self._completed_move_count
|
||||
|
||||
if index > completed_move_count:
|
||||
return CardState.GUESSER_DISABLED
|
||||
|
||||
elif index == completed_move_count:
|
||||
if self._step_state == StepState.WAITING_FOR_GUESSER:
|
||||
return CardState.GUESSER_WAITING
|
||||
else:
|
||||
return CardState.GUESSER_DISABLED
|
||||
|
||||
else:
|
||||
setter_move = self._setter_moves[index]
|
||||
guesser_move = self._guesser_moves[index]
|
||||
if setter_move == guesser_move:
|
||||
return CardState.GUESSER_CORRECT
|
||||
else:
|
||||
return CardState.GUESSER_WRONG
|
||||
|
||||
def start_session(self) -> None:
|
||||
index = 0
|
||||
pub.sendMessage(
|
||||
"session.session_started",
|
||||
step=StepData(
|
||||
index=index,
|
||||
setter=CardData(
|
||||
direction=None,
|
||||
state=self._get_setter_card_state(index),
|
||||
),
|
||||
guesser=CardData(
|
||||
direction=None,
|
||||
state=self._get_guesser_card_state(index),
|
||||
),
|
||||
),
|
||||
)
|
||||
|
||||
def setter_move(self, direction: ArrowDirection) -> bool:
|
||||
if self._step_state != StepState.WAITING_FOR_SETTER:
|
||||
return False
|
||||
|
||||
self._setter_moves.append(direction)
|
||||
self._step_state = StepState.WAITING_FOR_GUESSER
|
||||
|
||||
index = len(self._setter_moves) - 1
|
||||
|
||||
pub.sendMessage(
|
||||
"session.setter_moved",
|
||||
step=StepData(
|
||||
index=index,
|
||||
setter=CardData(
|
||||
direction=direction,
|
||||
state=self._get_setter_card_state(index),
|
||||
),
|
||||
guesser=CardData(
|
||||
direction=direction,
|
||||
state=self._get_guesser_card_state(index),
|
||||
),
|
||||
),
|
||||
)
|
||||
return True
|
||||
|
||||
def guesser_move(self, direction: ArrowDirection) -> bool:
|
||||
if self._step_state != StepState.WAITING_FOR_GUESSER:
|
||||
return False
|
||||
|
||||
self._guesser_moves.append(direction)
|
||||
|
||||
if self._completed_move_count < self._sequence_length:
|
||||
self._step_state = StepState.WAITING_FOR_SETTER
|
||||
else:
|
||||
self._step_state = StepState.SESSION_FINISHED
|
||||
|
||||
index = len(self._guesser_moves) - 1
|
||||
|
||||
pub.sendMessage(
|
||||
"session.guesser_moved",
|
||||
step=StepData(
|
||||
index=index,
|
||||
setter=CardData(
|
||||
direction=self._setter_moves[index],
|
||||
state=self._get_setter_card_state(index),
|
||||
),
|
||||
guesser=CardData(
|
||||
direction=self._guesser_moves[index],
|
||||
state=self._get_guesser_card_state(index),
|
||||
),
|
||||
),
|
||||
)
|
||||
|
||||
next = index + 1
|
||||
|
||||
pub.sendMessage(
|
||||
"session.step_closed",
|
||||
step=StepData(
|
||||
index=next,
|
||||
setter=CardData(
|
||||
direction=None,
|
||||
state=self._get_setter_card_state(next),
|
||||
),
|
||||
guesser=CardData(
|
||||
direction=None,
|
||||
state=self._get_guesser_card_state(next),
|
||||
),
|
||||
),
|
||||
)
|
||||
|
||||
if self._step_state == StepState.SESSION_FINISHED:
|
||||
pub.sendMessage("session.session_finished")
|
||||
|
||||
return True
|
||||
|
||||
def local_move(self, direction: ArrowDirection) -> bool:
|
||||
if not self.can_local_move():
|
||||
return False
|
||||
if self._local_player.role == PlayerRole.SETTER:
|
||||
return self.setter_move(direction)
|
||||
else:
|
||||
return self.guesser_move(direction)
|
||||
|
||||
def can_local_move(self) -> bool:
|
||||
match self._step_state:
|
||||
case StepState.WAITING_FOR_SETTER:
|
||||
return self._local_player.role == PlayerRole.SETTER
|
||||
case StepState.WAITING_FOR_GUESSER:
|
||||
return self._local_player.role == PlayerRole.GUESSER
|
||||
case StepState.SESSION_FINISHED:
|
||||
return False
|
||||
|
||||
@property
|
||||
def setter_name(self) -> str:
|
||||
if self._local_player.role == PlayerRole.SETTER:
|
||||
return self._local_player.name
|
||||
else:
|
||||
return self._remote_player.name
|
||||
|
||||
@property
|
||||
def guesser_name(self) -> str:
|
||||
if self._local_player.role == PlayerRole.GUESSER:
|
||||
return self._local_player.name
|
||||
else:
|
||||
return self._remote_player.name
|
||||
|
||||
@property
|
||||
def sequence_length(self) -> int:
|
||||
return self._sequence_length
|
||||
@@ -1,7 +1,12 @@
|
||||
import wx
|
||||
from typing import Optional
|
||||
|
||||
from mind_reader.ui.dialogs import ClientConnectDialog, ServerStartDialog
|
||||
from mind_reader.ui.menu_bar import AppMenuBar
|
||||
import wx
|
||||
from wx.lib.pubsub import pub
|
||||
|
||||
from ..core import AppState
|
||||
from ..ui.dialogs import ClientConnectDialog, ServerStartDialog
|
||||
from ..ui.menu_bar import AppMenuBar
|
||||
from ..ui.views import LobbyPanel
|
||||
|
||||
|
||||
class MainFrame(wx.Frame):
|
||||
@@ -13,13 +18,21 @@ class MainFrame(wx.Frame):
|
||||
size=wx.Size(700, 500),
|
||||
style=wx.DEFAULT_FRAME_STYLE,
|
||||
)
|
||||
self.state: AppState = AppState()
|
||||
|
||||
self.lobby_panel: Optional[LobbyPanel] = None
|
||||
|
||||
self.Center()
|
||||
|
||||
self.main_sizer = wx.BoxSizer(wx.VERTICAL)
|
||||
self.SetSizer(self.main_sizer)
|
||||
|
||||
self.menu_bar = AppMenuBar(self)
|
||||
self.SetMenuBar(self.menu_bar)
|
||||
|
||||
self.CreateStatusBar(1)
|
||||
self.SetStatusText("Подключение отсутствует")
|
||||
pub.subscribe(self.set_statusbar_text, "mainframe.statusbar")
|
||||
pub.subscribe(self.remote_server_stop, "mainframe.remote_server_stop")
|
||||
|
||||
self._bind_menu_events()
|
||||
|
||||
@@ -32,22 +45,50 @@ class MainFrame(wx.Frame):
|
||||
wx.EVT_MENU, self.on_disconnect, self.menu_bar.item_disconnect
|
||||
)
|
||||
|
||||
def set_statusbar_text(self, notice: str):
|
||||
self.SetStatusText(notice)
|
||||
|
||||
def remote_server_stop(self, state: AppState):
|
||||
self.on_disconnect(None)
|
||||
|
||||
def _show_lobby(self):
|
||||
self._destroy_lobby()
|
||||
|
||||
if self.state.lobby:
|
||||
self.lobby_panel = LobbyPanel(self, self.state.lobby)
|
||||
self.main_sizer.Add(self.lobby_panel, 1, wx.EXPAND)
|
||||
self.Layout()
|
||||
|
||||
def _destroy_lobby(self):
|
||||
if self.lobby_panel:
|
||||
self.main_sizer.Detach(self.lobby_panel)
|
||||
self.lobby_panel.Destroy()
|
||||
self.lobby_panel = None
|
||||
self.Layout()
|
||||
|
||||
def on_client_connect(self, event):
|
||||
d = ClientConnectDialog(self)
|
||||
|
||||
if d.ShowModal() == wx.ID_OK:
|
||||
name, ip = d.get_data()
|
||||
self.menu_bar.set_connected_state(True)
|
||||
self.SetStatusText(f"Подключено к {ip} | Ваше имя {name}")
|
||||
player_name, ip = d.get_data()
|
||||
if self.state.connect(player_name, ip):
|
||||
self.menu_bar.set_connected_state(True)
|
||||
self._show_lobby()
|
||||
|
||||
d.Destroy()
|
||||
|
||||
def on_server_start(self, event):
|
||||
d = ServerStartDialog(self)
|
||||
|
||||
if d.ShowModal() == wx.ID_OK:
|
||||
name, ip = d.get_data()
|
||||
player_name, ip = d.get_data()
|
||||
self.state.serve(player_name, ip)
|
||||
self.menu_bar.set_connected_state(True)
|
||||
self.SetStatusText(f"Сервер запущен на {ip} | Ваше имя {name}")
|
||||
self._show_lobby()
|
||||
|
||||
d.Destroy()
|
||||
|
||||
def on_disconnect(self, event):
|
||||
self._destroy_lobby()
|
||||
self.state.disconnect()
|
||||
self.menu_bar.set_connected_state(False)
|
||||
self.SetStatusText("Подключение отсутствует")
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
from .lobby_view import LobbyPanel
|
||||
from .session_view import SessionPanel
|
||||
|
||||
__all__ = ["LobbyPanel", "SessionPanel"]
|
||||
@@ -0,0 +1,128 @@
|
||||
from typing import Callable, Optional
|
||||
|
||||
import wx
|
||||
from wx.lib.pubsub import pub
|
||||
|
||||
from ...core import LobbyState
|
||||
|
||||
|
||||
class RoleColumn(wx.Panel):
|
||||
def __init__(
|
||||
self,
|
||||
parent,
|
||||
role_key: str,
|
||||
button_label: str,
|
||||
on_role_selected: Optional[Callable[[str], None]] = None,
|
||||
):
|
||||
super().__init__(parent)
|
||||
self.role_key = role_key
|
||||
self.on_role_selected = on_role_selected
|
||||
self.is_active = False
|
||||
|
||||
sizer = wx.BoxSizer(wx.VERTICAL)
|
||||
|
||||
self.button_select = wx.ToggleButton(self, label=button_label)
|
||||
self.button_select.Bind(wx.EVT_TOGGLEBUTTON, self._on_button_click)
|
||||
sizer.Add(self.button_select, 0, wx.EXPAND | wx.ALL, 5)
|
||||
|
||||
self.list_players = wx.ListBox(self)
|
||||
sizer.Add(self.list_players, 1, wx.EXPAND | wx.ALL, 5)
|
||||
|
||||
self.SetSizer(sizer)
|
||||
|
||||
def _on_button_click(self, event):
|
||||
if self.is_active:
|
||||
self.button_select.SetValue(True)
|
||||
return
|
||||
|
||||
if self.on_role_selected:
|
||||
self.on_role_selected(self.role_key)
|
||||
|
||||
def set_players(self, players: list[str]):
|
||||
self.list_players.Clear()
|
||||
if players:
|
||||
self.list_players.AppendItems(players)
|
||||
|
||||
def set_role_state(self, role: str):
|
||||
self.is_active = self.role_key == role
|
||||
self.button_select.SetValue(self.is_active)
|
||||
|
||||
|
||||
class LobbyPanel(wx.Panel):
|
||||
def __init__(self, parent, state: LobbyState):
|
||||
super().__init__(parent)
|
||||
self.state = state
|
||||
self._init_ui()
|
||||
|
||||
self.Bind(wx.EVT_WINDOW_DESTROY, self._on_destroy)
|
||||
|
||||
def _init_ui(self):
|
||||
main_sizer = wx.BoxSizer(wx.VERTICAL)
|
||||
|
||||
columns_sizer = wx.BoxSizer(wx.HORIZONTAL)
|
||||
|
||||
self.column_none = RoleColumn(
|
||||
self, "NONE", "👤 Без роли", self._on_role_click
|
||||
)
|
||||
self.column_setter = RoleColumn(
|
||||
self, "SETTER", "🧠 Загадывает", self._on_role_click
|
||||
)
|
||||
self.column_guesser = RoleColumn(
|
||||
self, "GUESSER", "🕵️ Угадывает", self._on_role_click
|
||||
)
|
||||
|
||||
columns_sizer.Add(self.column_none, 1, wx.EXPAND | wx.ALL, 5)
|
||||
columns_sizer.Add(self.column_setter, 1, wx.EXPAND | wx.ALL, 5)
|
||||
columns_sizer.Add(self.column_guesser, 1, wx.EXPAND | wx.ALL, 5)
|
||||
|
||||
self.button_start = wx.Button(self, label="➔ Начать сессию")
|
||||
self.button_start.Bind(wx.EVT_BUTTON, self._on_start_click)
|
||||
|
||||
main_sizer.Add(columns_sizer, 1, wx.EXPAND | wx.ALL, 5)
|
||||
main_sizer.Add(
|
||||
self.button_start, 0, wx.EXPAND | wx.LEFT | wx.RIGHT | wx.BOTTOM, 10
|
||||
)
|
||||
|
||||
self.SetSizer(main_sizer)
|
||||
|
||||
pub.subscribe(self.refresh, "lobby.refresh")
|
||||
|
||||
self.refresh(self.state)
|
||||
|
||||
def _on_role_click(self, target_role: str):
|
||||
success = self.state.set_player_role(target_role)
|
||||
|
||||
if not success:
|
||||
wx.MessageBox(
|
||||
f"Не удалось занять роль «{target_role}».",
|
||||
"Внимание",
|
||||
wx.OK | wx.ICON_WARNING,
|
||||
)
|
||||
return
|
||||
|
||||
self.refresh(self.state)
|
||||
|
||||
def _on_start_click(self, event):
|
||||
wx.MessageBox("Сессия запущена!", "Старт", wx.OK | wx.ICON_INFORMATION)
|
||||
|
||||
def _on_destroy(self, event):
|
||||
pub.unsubscribe(self.refresh, "lobby.refresh")
|
||||
event.Skip()
|
||||
|
||||
def refresh(self, state: LobbyState):
|
||||
players_by_role = {"NONE": [], "SETTER": [], "GUESSER": []}
|
||||
|
||||
for player, role in state.players.items():
|
||||
if role in players_by_role:
|
||||
players_by_role[role].append(player)
|
||||
|
||||
self.column_none.set_players(players_by_role["NONE"])
|
||||
self.column_setter.set_players(players_by_role["SETTER"])
|
||||
self.column_guesser.set_players(players_by_role["GUESSER"])
|
||||
|
||||
local_player_role = state.local_player_role
|
||||
self.column_none.set_role_state(local_player_role)
|
||||
self.column_setter.set_role_state(local_player_role)
|
||||
self.column_guesser.set_role_state(local_player_role)
|
||||
|
||||
self.button_start.Enable(state.is_ready())
|
||||
@@ -0,0 +1,367 @@
|
||||
import sys
|
||||
from dataclasses import dataclass
|
||||
from typing import Callable, Optional
|
||||
|
||||
import wx
|
||||
from wx.lib.pubsub import pub
|
||||
|
||||
from mind_reader.domain import ArrowDirection, CardState, SessionStats, StepData
|
||||
from mind_reader.state import SessionState
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class SetterCardColour:
|
||||
NOT_SET = wx.Colour(82, 97, 107)
|
||||
HIDDEN = wx.Colour(201, 214, 223)
|
||||
REVEALED = wx.Colour(240, 245, 249)
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class GuesserCardColour:
|
||||
DISABLED = wx.Colour(82, 97, 107)
|
||||
WAITING = wx.Colour(201, 214, 223)
|
||||
CORRECT = wx.Colour(76, 175, 80)
|
||||
WRONG = wx.Colour(229, 115, 115)
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class ArrowSymbol:
|
||||
LEFT: str = "←"
|
||||
RIGHT: str = "→"
|
||||
|
||||
|
||||
class Card(wx.Panel):
|
||||
def __init__(self, parent, state: CardState):
|
||||
super().__init__(parent, style=wx.BORDER_SIMPLE)
|
||||
self._direction: Optional[ArrowDirection] = None
|
||||
self._state = state
|
||||
self._setup()
|
||||
self._update()
|
||||
|
||||
def _setup(self):
|
||||
self.SetMinSize(wx.Size(45, 75))
|
||||
|
||||
self.label = wx.StaticText(self, style=wx.ALIGN_CENTER)
|
||||
|
||||
font = self.label.GetFont()
|
||||
font.SetPointSize(20)
|
||||
self.label.SetFont(font)
|
||||
|
||||
sizer = wx.BoxSizer(wx.VERTICAL)
|
||||
sizer.Add(self.label, 0, wx.EXPAND)
|
||||
|
||||
self.SetSizer(sizer)
|
||||
|
||||
def _update(self):
|
||||
match self._state:
|
||||
case CardState.SETTER_NOT_SET:
|
||||
colour = SetterCardColour.NOT_SET
|
||||
show_arrow = False
|
||||
|
||||
case CardState.SETTER_HIDDEN:
|
||||
colour = SetterCardColour.HIDDEN
|
||||
show_arrow = False
|
||||
|
||||
case CardState.SETTER_REVEALED:
|
||||
colour = SetterCardColour.REVEALED
|
||||
show_arrow = True
|
||||
|
||||
case CardState.GUESSER_DISABLED:
|
||||
colour = GuesserCardColour.DISABLED
|
||||
show_arrow = False
|
||||
|
||||
case CardState.GUESSER_WAITING:
|
||||
colour = GuesserCardColour.WAITING
|
||||
show_arrow = False
|
||||
|
||||
case CardState.GUESSER_CORRECT:
|
||||
colour = GuesserCardColour.CORRECT
|
||||
show_arrow = True
|
||||
|
||||
case CardState.GUESSER_WRONG:
|
||||
colour = GuesserCardColour.WRONG
|
||||
show_arrow = True
|
||||
|
||||
if show_arrow and self._direction:
|
||||
match self._direction:
|
||||
case ArrowDirection.LEFT:
|
||||
symbol = ArrowSymbol.LEFT
|
||||
|
||||
case ArrowDirection.RIGHT:
|
||||
symbol = ArrowSymbol.RIGHT
|
||||
|
||||
self.label.SetLabel(symbol)
|
||||
|
||||
else:
|
||||
self.label.SetLabel("")
|
||||
|
||||
self.SetBackgroundColour(colour)
|
||||
|
||||
self.Layout()
|
||||
self.Refresh()
|
||||
|
||||
def set(
|
||||
self,
|
||||
state: CardState,
|
||||
direction: Optional[ArrowDirection] = None,
|
||||
) -> None:
|
||||
self._state = state
|
||||
self._direction = direction
|
||||
self._update()
|
||||
|
||||
|
||||
class SessionPanel(wx.Panel):
|
||||
def __init__(
|
||||
self, parent, setter_name: str, guesser_name: str, sequence_length: int
|
||||
):
|
||||
super().__init__(parent)
|
||||
|
||||
self._setter_name = setter_name
|
||||
self._guesser_name = guesser_name
|
||||
self._sequence_length = sequence_length
|
||||
|
||||
self._setter_sequence: list[Card] = []
|
||||
self._guesser_sequence: list[Card] = []
|
||||
|
||||
self._statusbar = self._get_statusbar()
|
||||
self._setup_statusbar()
|
||||
|
||||
self._setup()
|
||||
self._fit_parent_frame()
|
||||
|
||||
pub.subscribe(self._on_session_started, "session.session_started")
|
||||
pub.subscribe(self._on_setter_moved, "session.setter_moved")
|
||||
pub.subscribe(self._on_guesser_moved, "session.guesser_moved")
|
||||
pub.subscribe(self._on_step_closed, "session.step_closed")
|
||||
pub.subscribe(self._on_session_finished, "session.session_finished")
|
||||
|
||||
def _setup(self) -> None:
|
||||
main_sizer = wx.BoxSizer(wx.VERTICAL)
|
||||
|
||||
setter_sizer = self._create_sequence_section(
|
||||
title=f"Загадывает: {self._setter_name}",
|
||||
sequence=self._setter_sequence,
|
||||
sequence_length=self._sequence_length,
|
||||
initial_card_state=CardState.SETTER_NOT_SET,
|
||||
)
|
||||
|
||||
guesser_sizer = self._create_sequence_section(
|
||||
title=f"Угадывает: {self._guesser_name}",
|
||||
sequence=self._guesser_sequence,
|
||||
sequence_length=self._sequence_length,
|
||||
initial_card_state=CardState.GUESSER_DISABLED,
|
||||
)
|
||||
|
||||
controls_sizer = self._create_controls_sizer(
|
||||
on_left=self._on_left_click,
|
||||
on_right=self._on_right_click,
|
||||
)
|
||||
|
||||
secondary_sizer = wx.BoxSizer(wx.VERTICAL)
|
||||
secondary_sizer.Add(setter_sizer, 0, wx.EXPAND)
|
||||
secondary_sizer.Add(guesser_sizer, 0, wx.EXPAND)
|
||||
secondary_sizer.Add(
|
||||
controls_sizer, 0, wx.ALIGN_CENTER | wx.TOP | wx.BOTTOM, 25
|
||||
)
|
||||
|
||||
main_sizer.Add(secondary_sizer, 0, wx.LEFT | wx.ALL, 0)
|
||||
|
||||
self.SetSizer(main_sizer)
|
||||
|
||||
def _create_sequence_section(
|
||||
self,
|
||||
title: str,
|
||||
sequence: list[Card],
|
||||
sequence_length: int,
|
||||
initial_card_state: CardState,
|
||||
) -> wx.Sizer:
|
||||
section_sizer = wx.BoxSizer(wx.VERTICAL)
|
||||
title_label = wx.StaticText(self, label=title)
|
||||
cards_sizer = wx.BoxSizer(wx.HORIZONTAL)
|
||||
|
||||
for _ in range(sequence_length):
|
||||
card = Card(self, initial_card_state)
|
||||
cards_sizer.Add(card, 0, wx.ALL, 4)
|
||||
sequence.append(card)
|
||||
|
||||
section_sizer.Add(title_label, 0, wx.LEFT | wx.TOP, 9)
|
||||
section_sizer.Add(cards_sizer, 0, wx.ALL, 5)
|
||||
|
||||
return section_sizer
|
||||
|
||||
def _create_controls_sizer(
|
||||
self,
|
||||
on_left: Callable[[wx.CommandEvent], None],
|
||||
on_right: Callable[[wx.CommandEvent], None],
|
||||
) -> wx.Sizer:
|
||||
left = wx.Button(self, label=ArrowSymbol.LEFT, size=wx.Size(145, 55))
|
||||
right = wx.Button(self, label=ArrowSymbol.RIGHT, size=wx.Size(145, 55))
|
||||
|
||||
font = left.GetFont()
|
||||
font.SetPointSize(22)
|
||||
|
||||
left.SetFont(font)
|
||||
right.SetFont(font)
|
||||
|
||||
left.Bind(wx.EVT_BUTTON, on_left)
|
||||
right.Bind(wx.EVT_BUTTON, on_right)
|
||||
|
||||
controls_sizer = wx.BoxSizer(wx.HORIZONTAL)
|
||||
controls_sizer.Add(left, 0, wx.RIGHT, 10)
|
||||
controls_sizer.Add(right, 0, wx.LEFT, 10)
|
||||
|
||||
return controls_sizer
|
||||
|
||||
def _get_statusbar(self) -> Optional[wx.StatusBar]:
|
||||
top_frame = self.GetTopLevelParent()
|
||||
|
||||
if isinstance(top_frame, wx.Frame):
|
||||
statusbar = top_frame.GetStatusBar()
|
||||
if not statusbar:
|
||||
statusbar = top_frame.CreateStatusBar(1)
|
||||
statusbar.SetFieldsCount(4)
|
||||
return statusbar
|
||||
|
||||
return None
|
||||
|
||||
def _setup_statusbar(self) -> None:
|
||||
if not self._statusbar:
|
||||
return
|
||||
|
||||
message = " Ожидание начала игры... "
|
||||
progress = f" Прогресс 0/{self._sequence_length} "
|
||||
accuracy = " Точность 0.0% (0/0) "
|
||||
taken_time = " Время 00:00 "
|
||||
|
||||
self._statusbar.SetStatusText(message, 0)
|
||||
self._statusbar.SetStatusText(progress, 1)
|
||||
self._statusbar.SetStatusText(accuracy, 2)
|
||||
self._statusbar.SetStatusText(taken_time, 3)
|
||||
|
||||
self._autofit_statusbar([progress, accuracy, message])
|
||||
|
||||
def _autofit_statusbar(self, texts: list[str]) -> None:
|
||||
if not self._statusbar:
|
||||
return
|
||||
|
||||
dc = wx.ClientDC(self._statusbar)
|
||||
width_1 = dc.GetTextExtent(texts[0]).width
|
||||
width_2 = dc.GetTextExtent(texts[1]).width
|
||||
width_3 = dc.GetTextExtent(texts[2]).width
|
||||
self._statusbar.SetStatusWidths([-1, width_1, width_2, width_3])
|
||||
|
||||
def _fit_parent_frame(self) -> None:
|
||||
top_frame = self.GetTopLevelParent()
|
||||
|
||||
if isinstance(top_frame, wx.Frame):
|
||||
self.Layout()
|
||||
best_size = self.GetBestSize()
|
||||
min_size = top_frame.ClientToWindowSize(best_size)
|
||||
top_frame.SetMinSize(min_size)
|
||||
top_frame.Fit()
|
||||
|
||||
def _on_left_click(self, event: wx.CommandEvent) -> None:
|
||||
self._handle_arrow_input(ArrowDirection.LEFT)
|
||||
|
||||
def _on_right_click(self, event: wx.CommandEvent) -> None:
|
||||
self._handle_arrow_input(ArrowDirection.RIGHT)
|
||||
|
||||
def _handle_arrow_input(self, direction: ArrowDirection) -> None:
|
||||
pass
|
||||
|
||||
def _on_session_started(self, step: StepData) -> None:
|
||||
self.update_setter_card(
|
||||
step.index,
|
||||
step.setter.state,
|
||||
step.setter.direction,
|
||||
)
|
||||
|
||||
self.update_guesser_card(
|
||||
step.index,
|
||||
step.guesser.state,
|
||||
step.guesser.direction,
|
||||
)
|
||||
|
||||
def _on_setter_moved(self, step: StepData) -> None:
|
||||
self.update_setter_card(
|
||||
step.index,
|
||||
step.setter.state,
|
||||
step.setter.direction,
|
||||
)
|
||||
|
||||
self.update_guesser_card(
|
||||
step.index,
|
||||
step.guesser.state,
|
||||
step.guesser.direction,
|
||||
)
|
||||
|
||||
def _on_guesser_moved(self, step: StepData):
|
||||
self.update_setter_card(
|
||||
step.index,
|
||||
step.setter.state,
|
||||
step.setter.direction,
|
||||
)
|
||||
|
||||
self.update_guesser_card(
|
||||
step.index,
|
||||
step.guesser.state,
|
||||
step.guesser.direction,
|
||||
)
|
||||
|
||||
def _on_step_closed(self, step: StepData):
|
||||
self.update_setter_card(
|
||||
step.index,
|
||||
step.setter.state,
|
||||
step.setter.direction,
|
||||
)
|
||||
|
||||
self.update_guesser_card(
|
||||
step.index,
|
||||
step.guesser.state,
|
||||
step.guesser.direction,
|
||||
)
|
||||
|
||||
def _on_session_finished(self):
|
||||
pass
|
||||
|
||||
def update_setter_card(
|
||||
self,
|
||||
index: int,
|
||||
state: CardState,
|
||||
direction: Optional[ArrowDirection] = None,
|
||||
) -> None:
|
||||
self._setter_sequence[index].set(state, direction)
|
||||
|
||||
def update_guesser_card(
|
||||
self,
|
||||
index: int,
|
||||
state: CardState,
|
||||
direction: Optional[ArrowDirection] = None,
|
||||
) -> None:
|
||||
self._guesser_sequence[index].set(state, direction)
|
||||
|
||||
def update_statusbar(
|
||||
self,
|
||||
message: Optional[str],
|
||||
stats: SessionStats,
|
||||
):
|
||||
if not self._statusbar:
|
||||
return
|
||||
|
||||
if message is not None:
|
||||
self._statusbar.SetStatusText(message, 0)
|
||||
|
||||
progress = f" Прогресс {stats.setted}/{stats.total} "
|
||||
self._statusbar.SetStatusText(progress, 1)
|
||||
|
||||
accuracy = (
|
||||
f" Точность {stats.accuracy}% ({stats.correct}/{stats.wrong}) "
|
||||
)
|
||||
self._statusbar.SetStatusText(accuracy, 2)
|
||||
|
||||
minutes = int(stats.taken_time) // 60
|
||||
seconds = int(stats.taken_time) % 60
|
||||
taken_time = f" Время {minutes:02d}:{seconds:02d} "
|
||||
self._statusbar.SetStatusText(taken_time, 3)
|
||||
|
||||
self._autofit_statusbar([progress, accuracy, taken_time])
|
||||
Reference in New Issue
Block a user