diff --git a/pom.xml b/pom.xml
index 306fcf070f377886ad386c2eca9e14d901246ca5..c97d20635bf94ff888cd24a78b3c8fee1d9cde59 100644
--- a/pom.xml
+++ b/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>
diff --git a/res/stages/load-data-stage.fxml b/res/stages/load-data-stage.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..ba97c3cdf5fea292eb84c0fa814cf5542c102a64
--- /dev/null
+++ b/res/stages/load-data-stage.fxml
@@ -0,0 +1,34 @@
+<?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>
diff --git a/res/stages/main-stage.fxml b/res/stages/main-stage.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..e099e011a8ce7681c128ba314ec001f8d8aaeaeb
--- /dev/null
+++ b/res/stages/main-stage.fxml
@@ -0,0 +1,52 @@
+<?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>
diff --git a/src/main/java/fr/univlille/sae/classification/controller/LoadDataController.java b/src/main/java/fr/univlille/sae/classification/controller/LoadDataController.java
new file mode 100644
index 0000000000000000000000000000000000000000..190805880f62a128fdf49dde3a69deda50b35564
--- /dev/null
+++ b/src/main/java/fr/univlille/sae/classification/controller/LoadDataController.java
@@ -0,0 +1,54 @@
+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();
+ }
+
+
+
+}
diff --git a/src/main/java/fr/univlille/sae/classification/controller/MainStageController.java b/src/main/java/fr/univlille/sae/classification/controller/MainStageController.java
index 9b40afd67cd1af4259ce47e832520dc3a4492e09..636343a65bd217bbaad2497b3688ad8aee68b5de 100644
--- a/src/main/java/fr/univlille/sae/classification/controller/MainStageController.java
+++ b/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();
- */
+
}
diff --git a/src/main/java/fr/univlille/sae/classification/ClassificationModel.java b/src/main/java/fr/univlille/sae/classification/model/ClassificationModel.java
similarity index 92%
rename from src/main/java/fr/univlille/sae/classification/ClassificationModel.java
rename to src/main/java/fr/univlille/sae/classification/model/ClassificationModel.java
index 486fe8ec212add72fc22bfa29508d09d54238e6d..ca46239ef914f4eebeb1d3156ac9eef6d690f357 100644
--- a/src/main/java/fr/univlille/sae/classification/ClassificationModel.java
+++ b/src/main/java/fr/univlille/sae/classification/model/ClassificationModel.java
@@ -1,4 +1,4 @@
-package fr.univlille.sae.classification;
+package fr.univlille.sae.classification.model;
import java.io.File;
import java.util.ArrayList;
diff --git a/src/main/java/fr/univlille/sae/classification/Iris.java b/src/main/java/fr/univlille/sae/classification/model/Iris.java
similarity index 96%
rename from src/main/java/fr/univlille/sae/classification/Iris.java
rename to src/main/java/fr/univlille/sae/classification/model/Iris.java
index 00687563ccfa71fbfd57491fc685b22a3d8ff05f..8693e9099fe979643aa61401b77dc8c0f739fd74 100644
--- a/src/main/java/fr/univlille/sae/classification/Iris.java
+++ b/src/main/java/fr/univlille/sae/classification/model/Iris.java
@@ -1,4 +1,4 @@
-package fr.univlille.sae.classification;
+package fr.univlille.sae.classification.model;
import java.util.Set;
diff --git a/src/main/java/fr/univlille/sae/classification/LoadableData.java b/src/main/java/fr/univlille/sae/classification/model/LoadableData.java
similarity index 72%
rename from src/main/java/fr/univlille/sae/classification/LoadableData.java
rename to src/main/java/fr/univlille/sae/classification/model/LoadableData.java
index 3513577cc1c9a25ba3422e4372f01bd18e660985..c6fff317ce262e3dabb2c9e63666a67c93005ca0 100644
--- a/src/main/java/fr/univlille/sae/classification/LoadableData.java
+++ b/src/main/java/fr/univlille/sae/classification/model/LoadableData.java
@@ -1,6 +1,5 @@
-package fr.univlille.sae.classification;
+package fr.univlille.sae.classification.model;
-import java.util.List;
import java.util.Set;
public abstract class LoadableData {