added controller to model view controller

moves

src/controller/controller.py

@@ -0,0 +1,13 @@
+from logic.board import Board
+from view.view import View
+
+
+class Controller:
+    def __init__(self, board: Board, view: View) -> None:
+        self._board = board
+        self._view = view
+
+        self._view.set_controller(self)
+
+    def on_tile_selected(self, x: int, y: int) -> None:
+        raise NotImplementedError(f"Cannot handle tile selected event, {type(self).__name__} did not implement it")

src/controller/gui_controller.py

@@ -0,0 +1,20 @@
+from logic.board import Board
+from view.view import View
+from .controller import Controller
+
+
+class GuiController(Controller):
+    def __init__(self, board: Board, view: View) -> None:
+        super().__init__(board, view)
+        self._view.update_board(self._board, None, [])
+
+    def on_tile_selected(self, x: int, y: int) -> None:
+        piece = self._board.piece_at(x, y)
+        print(f"Clicked on {x, y}, {piece = }")
+
+        if piece:
+            self._view.update_board(self._board, piece, piece.legal_moves(self._board))
+        else:
+            self._view.update_board(self._board, None, [])
+
+

src/logic/move.py

@@ -1,4 +1,4 @@
-from logic.pieces.piece import Piece
+# from logic.pieces.piece import Piece
 from logic.position import Position
 from enum import Enum
 
@@ -15,7 +15,7 @@ class Move:
 
 
 class PieceMove(Move):
-    def __init__(self, piece: Piece, pos: Position,/, is_capturing: bool = False) -> None:
+    def __init__(self, piece: "Piece", pos: Position,/, is_capturing: bool = False) -> None:
         super().__init__(is_capturing)
         self.piece = piece
         self.pos = pos

src/logic/pieces/bishop.py

@@ -1,38 +1,7 @@
-from logic.move import Move, PieceMove
+from logic.move import Move
-from logic.position import Position
 from .piece import Piece
 
 class Bishop(Piece):
-    def _move_for_position(self, board: "Board", x: int, y: int) -> Move | None:
-        if not Position.is_within_bounds(x, y):
-            return None
-        piece = board.piece_at(x, y) 
-
-        if piece is None:
-            return PieceMove(self, Position(x, y))
-
-        if piece.colour != self.colour:
-            return PieceMove(self, Position(x, y), is_capturing=True)
-        return None
-
-
-
-    def _look_direction(self, board: "Board", mult_dx: int, mult_dy: int):
-        ret = []
-        for d in range(1, 8):
-            dx = mult_dx * d
-            dy = mult_dy * d
-
-            move = self._move_for_position(board, self.pos.x + dx, self.pos.y + dy)
-            if move is None:
-                break
-            ret.append(move)
-            if move.is_capturing:
-                break
-
-        return ret
-        
-
     def legal_moves(self, board: "Board") -> list[Move]:
         ret = []
 

src/logic/pieces/knight.py

@@ -1,5 +1,16 @@
 from .piece import Piece
 
 class Knight(Piece):
-    pass
+    def legal_moves(self, board: "Board") -> list["Move"]:
+        ret = []
+        for dx, dy in [
+            (+2, +1), (+1, +2), # north east
+            (+2, -1), (+1, -2), # south east
+            (-2, -1), (-1, -2), # south west
+            (-2, +1), (-1, +2), # north west
+        ]:
+            move = self._move_for_position(board, self.pos.x + dx, self.pos.y + dy)
+            if move is not None:
+                ret.append(move)
+        return ret
 

src/logic/pieces/pawn.py

@@ -1,5 +1,5 @@
 from logic.move import Move, PieceMove
-from logic.pieces.piece import Piece
+from logic.pieces.piece import Colour, Piece
 from logic.position import Position
 
 class Pawn(Piece):
@@ -8,23 +8,23 @@ class Pawn(Piece):
 
         # can we capture to the left?
         if self.pos.x > 0 and (
-            (self.colour == self.WHITE and (capturable_piece := board.piece_at(self.pos.x - 1, self.pos.y + 1)))
+            (self.colour == Colour.WHITE and (capturable_piece := board.piece_at(self.pos.x - 1, self.pos.y + 1)))
             or
-            (self.colour == self.BLACK and (capturable_piece := board.piece_at(self.pos.x - 1, self.pos.y - 1)))
+            (self.colour == Colour.BLACK and (capturable_piece := board.piece_at(self.pos.x - 1, self.pos.y - 1)))
         ):
             if capturable_piece.colour != self.colour:
                 ret.append(PieceMove(self, capturable_piece.pos, is_capturing = True))
 
         # can we capture to the right?
         if self.pos.x < 7 and (
-            (self.colour == self.WHITE and (capturable_piece := board.piece_at(self.pos.x + 1, self.pos.y + 1)))
+            (self.colour == Colour.WHITE and (capturable_piece := board.piece_at(self.pos.x + 1, self.pos.y + 1)))
             or
-            (self.colour == self.BLACK and (capturable_piece := board.piece_at(self.pos.x + 1, self.pos.y - 1)))
+            (self.colour == Colour.BLACK and (capturable_piece := board.piece_at(self.pos.x + 1, self.pos.y - 1)))
         ):
             if capturable_piece.colour != self.colour:
                 ret.append(PieceMove(self, capturable_piece.pos, is_capturing = True))
 
-        if self.colour == Piece.WHITE:
+        if self.colour == Colour.WHITE:
             for dy in range(1, 3 if self.pos.y == 1 else 2):
                 if self.pos.y + dy > 7 or board.piece_at(self.pos.x, self.pos.y + dy):
                     break

src/logic/pieces/piece.py

@@ -1,3 +1,4 @@
+from logic.move import Move, PieceMove
 from logic.position import Position
 from enum import Enum
 
@@ -12,6 +13,33 @@ class Piece:
         assert colour == Colour.WHITE or colour == Colour.BLACK, "The colour of the piece must be either Piece.WHITE or Piece.BLACK"
         self.colour = colour
 
+    def _look_direction(self, board: "Board", mult_dx: int, mult_dy: int):
+        ret = []
+        for d in range(1, 8):
+            dx = mult_dx * d
+            dy = mult_dy * d
+
+            move = self._move_for_position(board, self.pos.x + dx, self.pos.y + dy)
+            if move is None:
+                break
+            ret.append(move)
+            if move.is_capturing:
+                break
+
+        return ret
+
+    def _move_for_position(self, board: "Board", x: int, y: int) -> Move | None:
+        if not Position.is_within_bounds(x, y):
+            return None
+        piece = board.piece_at(x, y) 
+
+        if piece is None:
+            return PieceMove(self, Position(x, y))
+
+        if piece.colour != self.colour:
+            return PieceMove(self, Position(x, y), is_capturing=True)
+        return None
+
     def position(self) -> Position:
         return self.pos
 

src/logic/pieces/queen.py

@@ -1,5 +1,32 @@
+from logic.move import Move
 from .piece import Piece
 
 class Queen(Piece):
-    pass
+    def legal_moves(self, board: "Board") -> list[Move]:
+        ret = []
 
+        # looking north east
+        ret.extend(self._look_direction(board, 1, 1))
+
+        # looking south east
+        ret.extend(self._look_direction(board, 1, -1))
+
+        # looking south west
+        ret.extend(self._look_direction(board, -1, -1))
+
+        # looking north west
+        ret.extend(self._look_direction(board, -1, 1))
+
+        # looking east
+        ret.extend(self._look_direction(board, 1, 0))
+
+        # looking south
+        ret.extend(self._look_direction(board, 0, -1))
+
+        # looking west
+        ret.extend(self._look_direction(board, -1, 0))
+
+        # looking north
+        ret.extend(self._look_direction(board, 0, 1))
+
+        return ret

src/logic/pieces/rook.py

@@ -1,5 +1,20 @@
+from logic.move import Move
 from .piece import Piece
 
 class Rook(Piece):
-    pass
+    def legal_moves(self, board: "Board") -> list[Move]:
+        ret = []
 
+        # looking east
+        ret.extend(self._look_direction(board, 1, 0))
+
+        # looking south
+        ret.extend(self._look_direction(board, 0, -1))
+
+        # looking west
+        ret.extend(self._look_direction(board, -1, 0))
+
+        # looking north
+        ret.extend(self._look_direction(board, 0, 1))
+
+        return ret

src/main.py

@@ -1,3 +1,4 @@
+from controller.gui_controller import GuiController
 from logic.board import Board
 from view.gui import GUI
 from view.tui import TUI
@@ -6,6 +7,8 @@ if __name__ == "__main__":
     initial_board_position = "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1"
     board = Board.setup_FEN_position(initial_board_position)
 
-    view = GUI(board)
+    view = GUI()
+
+    controller = GuiController(board, view)
 
     view.show()

src/view/gui.py

@@ -1,13 +1,14 @@
 import tkinter as tk
 
 from logic.board import Board
+from logic.move import Move
 from logic.pieces.piece import Colour, Piece
 from logic.position import Position
 from view.view import View
 
 class GUI(View):
-    def __init__(self, board: Board) -> None:
+    def __init__(self) -> None:
-        super().__init__(board)
+        super().__init__()
 
         self.root = tk.Tk()
         self.root.title("Chess Board")
@@ -18,20 +19,26 @@ class GUI(View):
         self.canvas = tk.Canvas(self.root, width=board_size, height=board_size)
         self.canvas.pack()
 
-        self.state = {"selected_piece": None, "legal_moves": []}
-
         self.canvas.bind("<Button-1>", self._on_canvas_click)
-        self._draw_chess_board()
 
+    def _on_canvas_click(self, event):
+        x, y = event.x // self.tile_size, event.y // self.tile_size
+        y = 7 - y
 
-    def _draw_chess_board(self):
+        self._controller.on_tile_selected(x, y)
+
+    def update_board(self, board: Board, selected_piece: Piece, legal_moves: list[Move]) -> None:
+        self.canvas.delete("all")
+        self._draw_chess_board(board, selected_piece, legal_moves)
+
+    def _draw_chess_board(self, board, selected_piece = None, legal_moves = []):
         colours = ["#F0D9B5", "#B58863"]  # Light and dark squares
 
         for y in range(8):
             for x in range(8):
                 colour = colours[(x + y) % 2]
-                if self.state["selected_piece"]:
+                if selected_piece is not None:
-                    possible_positions = [move.pos for move in self.state["legal_moves"]] 
+                    possible_positions = [move.pos for move in legal_moves] 
                     if Position(x, 7-y) in possible_positions:
                         colour = "#ADD8E6"  # Highlight legal moves
 
@@ -44,7 +51,7 @@ class GUI(View):
                     outline=colour,
                 )
 
-                piece = self.board.piece_at(x, 7-y)
+                piece = board.piece_at(x, 7-y)
 
                 if piece:
                     text_colour = "white" if piece.colour == Colour.WHITE else "black"
@@ -75,23 +82,6 @@ class GUI(View):
                         fill=text_colour, 
                         font=("Arial", 10, "bold")
                     )
-                    
-
-    def _on_canvas_click(self, event):
-        x, y = event.x // self.tile_size, event.y // self.tile_size
-        y = 7 - y
-        piece = self.board.piece_at(x, y)
-        print(f"Clicked on {x, y}, {piece = }")
-
-        if piece:
-            self.state["selected_piece"] = piece
-            self.state["legal_moves"] = piece.legal_moves(self.board)
-        else:
-            self.state["selected_piece"] = None
-            self.state["legal_moves"] = []
-
-        self.canvas.delete("all")
-        self._draw_chess_board()
 
     def show(self) -> None:
         self.root.mainloop()

src/view/view.py

@@ -1,10 +1,18 @@
 from logic.board import Board
+from logic.move import Move
+from logic.pieces.piece import Piece
 
 
 class View:
-    def __init__(self, board: Board) -> None:
+    def __init__(self) -> None:
-        self.board: Board = board
+        self._controller: "Controller" = None
 
     def show(self) -> None:
         raise NotImplementedError(f"Can't show the board, the show() method of {type(self)} is not implemented")
 
+    def update_board(self, board: Board, selected_piece: Piece, legal_moves: list[Move]) -> None:
+        raise NotImplementedError(f"Can't update the board, the update_board() method of {type(self)} is not implemented")
+
+    def set_controller(self, controller: "Controller") -> None:
+        self._controller = controller
+