Merge branch 'matiasmennecart' into 'master'

Merge code de base

See merge request sae302/2024/H4_SAE3.3!1

pom.xml

@@ -41,12 +41,20 @@
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-controls</artifactId>
-            <version>14</version>
+            <version>17</version>
+            <!-- Pour Mac M1+ -->
+            <!-- <classifier>mac-aarch64</classifier> -->
+        </dependency>
+        <dependency>
+            <groupId>org.openjfx</groupId>
+            <artifactId>javafx</artifactId>
+            <version>17</version>
+            <type>pom</type>
         </dependency>
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-swing</artifactId>
-            <version>14</version>
+            <version>17</version>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>

res/stages/load-data-stage.fxml

+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.Scene?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.stage.Stage?>
+
+<Stage fx:id="stage" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fr.univlille.sae.classification.controller.LoadDataController">
+    <scene>
+        <Scene>
+            <AnchorPane prefHeight="143.0" prefWidth="363.0">
+            <children>
+               <VBox layoutX="-1.0" layoutY="1.0" prefHeight="151.0" prefWidth="364.0">
+                  <children>
+                     <HBox alignment="CENTER" prefHeight="91.0" prefWidth="272.0">
+                        <children>
+                           <Label fx:id="filenamelab" prefHeight="83.0" prefWidth="157.0" text="file name" />
+                           <Button mnemonicParsing="false" onAction="#openFileChooser" text="Parcourir" />
+                        </children>
+                     </HBox>
+                     <HBox alignment="CENTER" prefHeight="76.0" prefWidth="310.0">
+                        <children>
+                           <Button mnemonicParsing="false" onAction="#validate" text="Valider" />
+                        </children>
+                     </HBox>
+                  </children>
+               </VBox>
+            </children></AnchorPane>
+        </Scene>
+    </scene>
+</Stage>

res/stages/main-stage.fxml

+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.Scene?>
+<?import javafx.scene.chart.CategoryAxis?>
+<?import javafx.scene.chart.NumberAxis?>
+<?import javafx.scene.chart.ScatterChart?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Region?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.stage.Stage?>
+
+<Stage fx:id="stage" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fr.univlille.sae.classification.controller.MainStageController">
+    <scene>
+        <Scene>
+            <AnchorPane prefHeight="487.0" prefWidth="692.0">
+            <children>
+               <VBox prefHeight="488.0" prefWidth="691.0">
+                  <children>
+                     <HBox prefHeight="305.0" prefWidth="691.0">
+                        <children>
+                           <Region prefHeight="200.0" prefWidth="200.0" />
+                           <ScatterChart prefHeight="213.0" prefWidth="557.0">
+                             <xAxis>
+                               <CategoryAxis side="BOTTOM" />
+                             </xAxis>
+                             <yAxis>
+                               <NumberAxis side="LEFT" />
+                             </yAxis>
+                           </ScatterChart>
+                           <Region prefHeight="200.0" prefWidth="200.0" />
+                        </children>
+                     </HBox>
+                     <Region prefHeight="77.0" prefWidth="691.0" />
+                     <HBox prefHeight="100.0" prefWidth="200.0">
+                        <children>
+                           <Region prefHeight="101.0" prefWidth="131.0" />
+                           <Button mnemonicParsing="false" onAction="#openLoadData" prefHeight="27.0" prefWidth="122.0" text="Charger" />
+                           <Region prefHeight="101.0" prefWidth="75.0" />
+                           <Button mnemonicParsing="false" prefHeight="25.0" prefWidth="129.0" text="Classifier" />
+                           <Region prefHeight="101.0" prefWidth="70.0" />
+                           <Button mnemonicParsing="false" prefHeight="26.0" prefWidth="133.0" text="Reglages" />
+                           <Region prefHeight="101.0" prefWidth="111.0" />
+                        </children>
+                     </HBox>
+                  </children>
+               </VBox>
+            </children></AnchorPane>
+        </Scene>
+    </scene>
+</Stage>

src/main/java/fr/univlille/sae/classification/ClassificationApp.java

-package fr.univlille.sae.classification;
-
-public class ClassificationApp {
-
-    public static void main(String[] args) {
-
-    }
-
-
-}

src/main/java/fr/univlille/sae/classification/Main.java

+package fr.univlille.sae.classification;
+
+import fr.univlille.sae.classification.model.ClassificationModel;
+import fr.univlille.sae.classification.view.MainStageView;
+import javafx.application.Application;
+import javafx.fxml.FXMLLoader;
+import javafx.stage.Stage;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+
+public class Main extends Application {
+
+
+    public void start(Stage stage) throws IOException {
+            ClassificationModel model = new ClassificationModel();
+            MainStageView view = new MainStageView(model);
+
+            view.show();
+    }
+
+    // Ouvre l'application
+    public static void main(String[] args) {
+        Application.launch(args);
+    }
+
+
+
+
+}

src/main/java/fr/univlille/sae/classification/controller/LoadDataController.java

+package fr.univlille.sae.classification.controller;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.Label;
+import javafx.stage.FileChooser;
+import javafx.stage.Stage;
+
+import java.io.File;
+
+public class LoadDataController {
+
+
+    @FXML
+    Stage stage;
+
+    @FXML
+    Label filenamelab;
+
+    File file;
+
+
+    public void loadData() {
+
+        System.out.println("Loading data");
+        stage.close();
+
+    }
+
+
+    public void openFileChooser() {
+
+        FileChooser fileChooser = new FileChooser();
+        fileChooser.setTitle("Choisissez le fichier à importer");
+         this.file = fileChooser.showOpenDialog(stage);
+
+        if(file != null) {
+            filenamelab.setText(file.getName());
+        }
+
+    }
+
+    public void validate() {
+
+        if (file == null) {
+            stage.close();
+            //throw exception
+        }
+
+        loadData();
+    }
+
+
+
+}

src/main/java/fr/univlille/sae/classification/controller/MainStageController.java

@@ -27,9 +27,9 @@ public class MainStageController {
     public void openLoadData() throws IOException {
 
 
-        /*
+
         FXMLLoader loader = new FXMLLoader();
-        URL fxmlFileUrl = new File(System.getProperty("user.dir") + File.separator + "res" + File.separator + "stages" + File.separator + "main-stage.fxml").toURI().toURL();
+        URL fxmlFileUrl = new File(System.getProperty("user.dir") + File.separator + "res" + File.separator + "stages" + File.separator + "load-data-stage.fxml").toURI().toURL();
 
         if (fxmlFileUrl == null) {
             System.out.println("Impossible de charger le fichier fxml");
@@ -44,7 +44,7 @@ public class MainStageController {
         loadStage.setTitle("Chargement des donées");
 
         loadStage.showAndWait();
-        */
+
 
     }
 

src/main/java/fr/univlille/sae/classification/model/ClassificationModel.java

+package fr.univlille.sae.classification.model;
+
+import fr.univlille.sae.classification.utils.Observable;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+import java.util.Set;
+
+public class ClassificationModel extends Observable {
+
+
+    private List<LoadableData> datas;
+    private List<LoadableData> dataToClass;
+
+    public ClassificationModel() {
+        this.datas = new ArrayList<>();
+
+    }
+
+    /**
+     * TODO
+     * @param x
+     * @param y
+     */
+    private void ajouterDonnee(double x, double y) {
+
+    }
+
+
+    /**
+     * TODO
+     * @param file
+     */
+    private void loadData(File file) {
+
+    }
+
+    /**
+     * TODO
+     * @param data
+     */
+    private void classifierDonnee(LoadableData data) {
+
+        List<String> classes = new ArrayList<>(data.getClassificationTypes());
+        Random rdm = new Random();
+        data.setClassification(classes.get(rdm.nextInt(classes.size())));
+
+    }
+
+
+}

src/main/java/fr/univlille/sae/classification/model/Iris.java

+package fr.univlille.sae.classification.model;
+
+import java.util.Set;
+
+public class Iris extends LoadableData{
+
+
+    private double sepalWidth;
+    private double sepalLength;
+    private double petalWidth;
+    private double petalLength;
+
+
+
+
+    public Iris(double sepalWidth, double sepalLength, double petalWidth, double petalLength) {
+        this(sepalWidth, sepalLength, petalWidth, petalLength, "undefined");
+    }
+
+    public Iris(double sepalWidth, double sepalLength, double petalWidth, double petalLength, String classification) {
+        super();
+        this.sepalWidth = sepalWidth;
+        this.sepalLength = sepalLength;
+        this.petalWidth = petalWidth;
+        this.petalLength = petalLength;
+    }
+
+
+
+
+    public double getSepalWidth() {
+        return sepalWidth;
+    }
+
+    public double getSepalLength() {
+        return sepalLength;
+    }
+
+    public double getPetalWidth() {
+        return petalWidth;
+    }
+
+    public double getPetalLength() {
+        return petalLength;
+    }
+}

src/main/java/fr/univlille/sae/classification/model/LoadableData.java

+package fr.univlille.sae.classification.model;
+
+import java.util.Set;
+
+public class LoadableData {
+
+    private static Set<String> classificationTypes;
+
+    private String classification;
+
+
+    public LoadableData() {
+
+    }
+    public String getClassification() {
+        return this.classification;
+    }
+    Set<String> getClassificationTypes() {
+        return classificationTypes;
+    }
+    void setClassification(String classification) {
+        this.classification = classification;
+    }
+
+}

src/main/java/fr/univlille/sae/classification/utils/Observable.java

+package fr.univlille.sae.classification.utils;
+
+import java.util.Collection;
+import java.util.HashSet;
+
+public abstract class Observable {
+
+
+    protected Collection<Observer> attached = new HashSet<>();
+    protected Collection<Observer> toDetach = new HashSet<>();
+
+    public void attach(Observer obs) {
+        attached.add(obs);
+    }
+
+    public void detach(Observer obs) {
+        this.toDetach.add(obs);
+    }
+
+    protected void notifyObservers() {
+        this.updateList();
+        for (Observer o : attached) {
+            o.update(this);
+        }
+    }
+
+    protected void notifyObservers(Object data) {
+        this.updateList();
+        for (Observer o : attached) {
+            o.update(this, data);
+        }
+    }
+
+    private void updateList() {
+        this.attached.removeAll(toDetach);
+        this.toDetach.clear();
+    }
+
+}

src/main/java/fr/univlille/sae/classification/utils/Observer.java

+package fr.univlille.sae.classification.utils;
+
+public interface Observer {
+
+
+    void update(Observable observable);
+    void update(Observable observable, Object data);
+
+
+}

src/main/java/fr/univlille/sae/classification/view/LoadDataView.java

+package fr.univlille.sae.classification.view;
+
+public class LoadDataView {
+
+
+}

src/main/java/fr/univlille/sae/classification/view/MainStage.java → src/main/java/fr/univlille/sae/classification/view/MainStageView.java

 package fr.univlille.sae.classification.view;
 
+import fr.univlille.sae.classification.model.ClassificationModel;
+import fr.univlille.sae.classification.utils.Observable;
+import fr.univlille.sae.classification.utils.Observer;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.stage.Stage;
@@ -8,10 +11,18 @@ import java.io.File;
 import java.io.IOException;
 import java.net.URL;
 
-public class MainStage extends Application {
+public class MainStageView implements Observer {
 
 
-    public void start(Stage stage) throws IOException {
+    private ClassificationModel model;
+
+    public MainStageView(ClassificationModel model) {
+        this.model = model;
+        model.attach(this);
+    }
+
+
+    public void show() throws IOException {
         FXMLLoader loader = new FXMLLoader();
 
         URL fxmlFileUrl = new File(System.getProperty("user.dir") + File.separator + "res" + File.separator + "stages" + File.separator + "main-stage.fxml").toURI().toURL();
@@ -25,15 +36,16 @@ public class MainStage extends Application {
         root.setResizable(false);
         root.setTitle("SAE3.3 - Logiciel de classification");
         root.show();
-
     }
 
-    // Ouvre l'application
-    public static void main(String[] args) {
-        Application.launch(args);
-    }
 
+    @Override
+    public void update(Observable observable) {
 
+    }
 
+    @Override
+    public void update(Observable observable, Object data) {
 
     }
+}