Commit d7a986f9 authored by Aurelien Dufour's avatar Aurelien Dufour
Browse files

ajout de superClasses pour les level (model, vue et controlleur)

parent 47f28c6b

controller/binaryTreeToDyckWord.py

+5 −19
Original line number Diff line number Diff line 
from controller.levelController import LevelController

from model.GameEnum import GameEnum

from model.levelBinarytreetodyckword import LevelBinaryTreeToDyckWord

from view.binaryTreeToDyckWordGui import BinaryTreeToDyckWordGui

from view.launcherGame import LauncherGame





class BinaryTreeToDyckWord:

class BinaryTreeToDyckWord(LevelController):

    def __init__(self, menuController):

        self.levelGui = None

        self.menuController = menuController

        super().__init__(menuController)

        self.level = LevelBinaryTreeToDyckWord(1)



        self.launcher = LauncherGame(GameEnum.BINARY_TREE_TO_DYCK_WORD)

        self.launcher.levelButton.clicked.connect(self.displayLevels)

        self.launcher.beginButton.clicked.connect(self.launchLevel)

        self.launcher.demoButton.clicked.connect(self.demo)



        self.menuController.menu.displayLauncher(self.launcher)



    def launchLevel(self):
@@ -22,22 +24,6 @@ class BinaryTreeToDyckWord: 
        self.levelGui.shortCutAction.triggered.connect(self.nextLevel)

        self.menuController.menu.displayLevel(self.levelGui)



    def displayLevels(self):

        print("voici les niveaux")

        self.launchLevel()



    def demo(self):

        print("voici la demo...")

        self.launchLevel()



    def nextLevel(self):

        self.level = self.level.nextLevel()

        self.launchLevel()



    def sameLevel(self):

        self.level.initialize()

        self.launchLevel()

controller/binaryTreeToPlanarTree.py

+6 −19
Original line number Diff line number Diff line 
from controller.levelController import LevelController

from model.GameEnum import GameEnum

from model.levelBinaryTreeToPlanarTree import LevelBinaryTreeToPlanarTree

from view.binaryTreeToPlanarTreeGui import BinaryTreeToPlanarTreeGui

from view.launcherGame import LauncherGame





class BinaryTreeToPlanarTree:

class BinaryTreeToPlanarTree(LevelController):

    def __init__(self, menuController):

        self.levelGui = None

        self.menuController = menuController

        super().__init__(menuController)



        self.level = LevelBinaryTreeToPlanarTree(1)



        self.launcher = LauncherGame(GameEnum.BINARY_TREE_TO_PLANAR_TREE)

        self.launcher.levelButton.clicked.connect(self.displayLevels)

        self.launcher.beginButton.clicked.connect(self.launchLevel)

        self.launcher.demoButton.clicked.connect(self.demo)



        self.menuController.menu.displayLauncher(self.launcher)



    def launchLevel(self):
@@ -22,22 +25,6 @@ class BinaryTreeToPlanarTree: 
        self.levelGui.shortCutAction.triggered.connect(self.nextLevel)

        self.menuController.menu.displayLevel(self.levelGui)



    def displayLevels(self):

        print("voici les niveaux")

        self.launchLevel()



    def demo(self):

        print("voici la demo...")

        self.launchLevel()



    def nextLevel(self):

        self.level = self.level.nextLevel()

        self.launchLevel()



    def sameLevel(self):

        self.level.initialize()

        self.launchLevel()



    def addNode(self, index: int, nodeType: str):

        if self.level.checkTree(index, nodeType):

            self.levelGui.planarTreeView.createTree()

controller/dyckWordToBinaryTree.py

+5 −19
Original line number Diff line number Diff line 
from controller.levelController import LevelController

from model.GameEnum import GameEnum

from model.levelDyckWordToBinaryTree import LevelDyckWordToBinaryTree

from view.dyckWordToBinaryTreeGui import DyckWordToBinaryTreeGui

from view.launcherGame import LauncherGame





class DyckWordToBinaryTree:

class DyckWordToBinaryTree(LevelController):

    def __init__(self, menuController):

        self.levelGui = None

        self.menuController = menuController

        super().__init__(menuController)

        self.level = LevelDyckWordToBinaryTree(1)



        self.launcher = LauncherGame(GameEnum.DYCK_WORD_TO_BINARY_TREE)

        self.launcher.levelButton.clicked.connect(self.displayLevels)

        self.launcher.beginButton.clicked.connect(self.launchLevel)

        self.launcher.demoButton.clicked.connect(self.demo)



        self.menuController.menu.displayLauncher(self.launcher)



    def launchLevel(self):
@@ -22,22 +24,6 @@ class DyckWordToBinaryTree: 
        self.levelGui.shortCutAction.triggered.connect(self.nextLevel)

        self.menuController.menu.displayLevel(self.levelGui)



    def displayLevels(self):

        print("voici les niveaux")

        self.launchLevel()



    def demo(self):

        print("voici la demo...")

        self.launchLevel()



    def nextLevel(self):

        self.level = self.level.nextLevel()

        self.launchLevel()



    def sameLevel(self):

        self.level.initialize()

        self.launchLevel()



    def addNode(self, index: int, nodeType: str):

        if self.level.checkTree(index, nodeType):

            self.levelGui.treeView.createTree()

controller/levelController.py

0 → 100644
+26 −0
Original line number Diff line number Diff line 
class LevelController:

    def __init__(self, menuController):

        self.levelGui = None

        self.level = None

        self.menuController = menuController

        self.launcher = None



    def launchLevel(self):

        pass



    def displayLevels(self):

        print("voici les niveaux")

        self.launchLevel()



    def demo(self):

        print("voici la demo...")

        self.launchLevel()



    def nextLevel(self):

        print(self.level)

        self.level = self.level.nextLevel()

        self.launchLevel()



    def sameLevel(self):

        self.level.initialize()

        self.launchLevel()

controller/menuController.py

+2 −3
Original line number Diff line number Diff line
@@ -3,16 +3,15 @@ from controller.binaryTreeToPlanarTree import BinaryTreeToPlanarTree 
from controller.planarTreeToBinaryTree import PlanarTreeToBinaryTree

from model.GameEnum import GameEnum

from controller.dyckWordToBinaryTree import DyckWordToBinaryTree

from model.game import Game

from view.menu import Menu





class MenuController:

    def __init__(self, menu: Menu, game: Game):

    def __init__(self, menu: Menu):

        self.levelGui = None

        self.level = None

        self.menu = menu

        self.game = game

        self.game = None

        self.diaplayMenu()



    def diaplayMenu(self):