diff --git a/code/jeu de la vie/src/views/VueJeu.java b/code/jeu de la vie/src/views/VueJeu.java index 228f563..0cabcc0 100644 --- a/code/jeu de la vie/src/views/VueJeu.java +++ b/code/jeu de la vie/src/views/VueJeu.java @@ -4,17 +4,17 @@ import javafx.beans.property.Property; import javafx.collections.FXCollections; import javafx.event.ActionEvent; import javafx.fxml.FXML; -import javafx.scene.control.*; +import javafx.scene.control.ChoiceBox; +import javafx.scene.control.ColorPicker; +import javafx.scene.control.Label; +import javafx.scene.control.Spinner; import javafx.scene.layout.GridPane; -import javafx.scene.paint.Color; import javafx.scene.shape.Rectangle; import model.Manager; import model.Regle; import model.actualiseur.ActualiseurTourUnParUn; import model.cellule.Cellule; -import model.plateau.Plateau; -import java.util.List; import java.util.Random; /** @@ -90,13 +90,13 @@ public class VueJeu { manager = new Manager(); - // Binding bidiréctionel entre les reglès de la vue et celles du model + // Binding bidirectionel entre les regles de la vue et celles du model regleChoiceBox.valueProperty().bindBidirectional(manager.getChangeurRegle().regleEnCoursProperty()); - // Binding bidiréctionel entre la ligne de la vue et celle du model + // Binding bidirectionel entre la ligne de la vue et celle du model rowGame.getValueFactory().valueProperty().bindBidirectional((Property) manager.getActualiseurCellule().getArbitre().getPlateau().ligneProperty()); - //Binding bidiréctionel entre la colone du model et celle de la vue + //Binding bidirectionel entre la colone du model et celle de la vue colGame.getValueFactory().valueProperty().bindBidirectional((Property) manager.getActualiseurCellule().getArbitre().getPlateau().coloneProperty()); // Définition d'action lors de redimentionement @@ -111,7 +111,7 @@ public class VueJeu { color.valueProperty().bindBidirectional(Cellule.livingColorProperty()); - // Binding unidiréctionel des informations à afficher (dimentiobn de la grille et numéro de la génération + // Binding unidirectionel des informations à afficher (dimension de la grille et numéro de la génération numTour.textProperty().bind(((ActualiseurTourUnParUn)manager.getActualiseurTour()).cptTourProperty().asString()); nbColGame.textProperty().bind(manager.getActualiseurCellule().getArbitre().getPlateau().coloneProperty().asString()); nbRowGame.textProperty().bind(manager.getActualiseurCellule().getArbitre().getPlateau().ligneProperty().asString()); diff --git a/docs/bilan-competences.pdf b/docs/bilan-competences.pdf new file mode 100644 index 0000000..4cbf70a Binary files /dev/null and b/docs/bilan-competences.pdf differ diff --git a/docs/contexte.pdf b/docs/contexte.pdf new file mode 100644 index 0000000..3eb0812 Binary files /dev/null and b/docs/contexte.pdf differ diff --git a/docs/uml/use-case.mdj b/docs/uml/use-case.mdj deleted file mode 100644 index 2801ad8..0000000 --- a/docs/uml/use-case.mdj +++ /dev/null @@ -1,304 +0,0 @@ -{ - "_type": "Project", - "_id": "AAAAAAFF+h6SjaM2Hec=", - "name": "Untitled", - "ownedElements": [ - { - "_type": "UMLModel", - "_id": "AAAAAAF9f+6VWLuV3ys=", - "_parent": { - "$ref": "AAAAAAFF+h6SjaM2Hec=" - }, - "name": "use-case", - "ownedElements": [ - { - "_type": "UMLUseCaseDiagram", - "_id": "AAAAAAF9f+6VWbuWJUM=", - "_parent": { - "$ref": "AAAAAAF9f+6VWLuV3ys=" - }, - "name": "use-case", - "ownedViews": [ - { - "_type": "UMLUseCaseSubjectView", - "_id": "AAAAAAF9f+8nH7ueWwc=", - "_parent": { - "$ref": "AAAAAAF9f+6VWbuWJUM=" - }, - "model": { - "$ref": "AAAAAAF9f+8nHrucR3I=" - }, - "subViews": [ - { - "_type": "UMLNameCompartmentView", - "_id": "AAAAAAF9f+8nILuf7vA=", - "_parent": { - "$ref": "AAAAAAF9f+8nH7ueWwc=" - }, - "model": { - "$ref": "AAAAAAF9f+8nHrucR3I=" - }, - "subViews": [ - { - "_type": "LabelView", - "_id": "AAAAAAF9f+8nILugGJk=", - "_parent": { - "$ref": "AAAAAAF9f+8nILuf7vA=" - }, - "visible": false, - "font": "Arial;13;0", - "height": 13 - }, - { - "_type": "LabelView", - "_id": "AAAAAAF9f+8nILuhnTY=", - "_parent": { - "$ref": "AAAAAAF9f+8nILuf7vA=" - }, - "font": "Arial;13;1", - "left": 461, - "top": 143, - "width": 502, - "height": 13, - "text": "Jeu de la vie" - }, - { - "_type": "LabelView", - "_id": "AAAAAAF9f+8nILuiseY=", - "_parent": { - "$ref": "AAAAAAF9f+8nILuf7vA=" - }, - "visible": false, - "font": "Arial;13;0", - "width": 91.01904296875, - "height": 13, - "text": "(from use-case)" - }, - { - "_type": "LabelView", - "_id": "AAAAAAF9f+8nILujGq8=", - "_parent": { - "$ref": "AAAAAAF9f+8nILuf7vA=" - }, - "visible": false, - "font": "Arial;13;0", - "height": 13, - "horizontalAlignment": 1 - } - ], - "font": "Arial;13;0", - "left": 456, - "top": 136, - "width": 512, - "height": 25, - "stereotypeLabel": { - "$ref": "AAAAAAF9f+8nILugGJk=" - }, - "nameLabel": { - "$ref": "AAAAAAF9f+8nILuhnTY=" - }, - "namespaceLabel": { - "$ref": "AAAAAAF9f+8nILuiseY=" - }, - "propertyLabel": { - "$ref": "AAAAAAF9f+8nILujGq8=" - } - } - ], - "font": "Arial;13;0", - "left": 456, - "top": 136, - "width": 512, - "height": 536, - "nameCompartment": { - "$ref": "AAAAAAF9f+8nILuf7vA=" - } - }, - { - "_type": "UMLActorView", - "_id": "AAAAAAF9f+9CI7u4oa8=", - "_parent": { - "$ref": "AAAAAAF9f+6VWbuWJUM=" - }, - "model": { - "$ref": "AAAAAAF9f+9CI7u2rmc=" - }, - "subViews": [ - { - "_type": "UMLNameCompartmentView", - "_id": "AAAAAAF9f+9CI7u5lEI=", - "_parent": { - "$ref": "AAAAAAF9f+9CI7u4oa8=" - }, - "model": { - "$ref": "AAAAAAF9f+9CI7u2rmc=" - }, - "subViews": [ - { - "_type": "LabelView", - "_id": "AAAAAAF9f+9CI7u6Lu0=", - "_parent": { - "$ref": "AAAAAAF9f+9CI7u5lEI=" - }, - "visible": false, - "font": "Arial;13;0", - "height": 13 - }, - { - "_type": "LabelView", - "_id": "AAAAAAF9f+9CJLu72Bw=", - "_parent": { - "$ref": "AAAAAAF9f+9CI7u5lEI=" - }, - "font": "Arial;13;1", - "left": 237, - "top": 373, - "width": 43.341796875, - "height": 13, - "text": "Joueur" - }, - { - "_type": "LabelView", - "_id": "AAAAAAF9f+9CJLu8DzQ=", - "_parent": { - "$ref": "AAAAAAF9f+9CI7u5lEI=" - }, - "visible": false, - "font": "Arial;13;0", - "width": 91.01904296875, - "height": 13, - "text": "(from use-case)" - }, - { - "_type": "LabelView", - "_id": "AAAAAAF9f+9CJLu9Blo=", - "_parent": { - "$ref": "AAAAAAF9f+9CI7u5lEI=" - }, - "visible": false, - "font": "Arial;13;0", - "height": 13, - "horizontalAlignment": 1 - } - ], - "font": "Arial;13;0", - "left": 232, - "top": 366, - "width": 53.341796875, - "height": 25, - "stereotypeLabel": { - "$ref": "AAAAAAF9f+9CI7u6Lu0=" - }, - "nameLabel": { - "$ref": "AAAAAAF9f+9CJLu72Bw=" - }, - "namespaceLabel": { - "$ref": "AAAAAAF9f+9CJLu8DzQ=" - }, - "propertyLabel": { - "$ref": "AAAAAAF9f+9CJLu9Blo=" - } - }, - { - "_type": "UMLAttributeCompartmentView", - "_id": "AAAAAAF9f+9CJLu+4GY=", - "_parent": { - "$ref": "AAAAAAF9f+9CI7u4oa8=" - }, - "model": { - "$ref": "AAAAAAF9f+9CI7u2rmc=" - }, - "visible": false, - "font": "Arial;13;0", - "width": 10, - "height": 10 - }, - { - "_type": "UMLOperationCompartmentView", - "_id": "AAAAAAF9f+9CJLu/Vi0=", - "_parent": { - "$ref": "AAAAAAF9f+9CI7u4oa8=" - }, - "model": { - "$ref": "AAAAAAF9f+9CI7u2rmc=" - }, - "visible": false, - "font": "Arial;13;0", - "width": 10, - "height": 10 - }, - { - "_type": "UMLReceptionCompartmentView", - "_id": "AAAAAAF9f+9CJLvASx0=", - "_parent": { - "$ref": "AAAAAAF9f+9CI7u4oa8=" - }, - "model": { - "$ref": "AAAAAAF9f+9CI7u2rmc=" - }, - "visible": false, - "font": "Arial;13;0", - "width": 10, - "height": 10 - }, - { - "_type": "UMLTemplateParameterCompartmentView", - "_id": "AAAAAAF9f+9CJLvBdbM=", - "_parent": { - "$ref": "AAAAAAF9f+9CI7u4oa8=" - }, - "model": { - "$ref": "AAAAAAF9f+9CI7u2rmc=" - }, - "visible": false, - "font": "Arial;13;0", - "width": 10, - "height": 10 - } - ], - "font": "Arial;13;0", - "containerChangeable": true, - "left": 232, - "top": 312, - "width": 53.341796875, - "height": 80, - "nameCompartment": { - "$ref": "AAAAAAF9f+9CI7u5lEI=" - }, - "suppressAttributes": true, - "suppressOperations": true, - "attributeCompartment": { - "$ref": "AAAAAAF9f+9CJLu+4GY=" - }, - "operationCompartment": { - "$ref": "AAAAAAF9f+9CJLu/Vi0=" - }, - "receptionCompartment": { - "$ref": "AAAAAAF9f+9CJLvASx0=" - }, - "templateParameterCompartment": { - "$ref": "AAAAAAF9f+9CJLvBdbM=" - } - } - ] - }, - { - "_type": "UMLUseCaseSubject", - "_id": "AAAAAAF9f+8nHrucR3I=", - "_parent": { - "$ref": "AAAAAAF9f+6VWLuV3ys=" - }, - "name": "Jeu de la vie" - }, - { - "_type": "UMLActor", - "_id": "AAAAAAF9f+9CI7u2rmc=", - "_parent": { - "$ref": "AAAAAAF9f+6VWLuV3ys=" - }, - "name": "Joueur" - } - ] - } - ] -} \ No newline at end of file