From 8384b13014ea3efda3f52995d98f33d740cff257 Mon Sep 17 00:00:00 2001
From: Matisse DEKEISER <matisse.dekeiser.etu@univ-lille.fr>
Date: Thu, 24 Oct 2024 21:17:10 +0200
Subject: [PATCH] Removed useless add button and constructor
---
res/stages/data-view-stage.fxml | 3 +--
.../controller/AddDataController.java | 1 +
.../controller/DataStageController.java | 14 --------------
.../sae/classification/view/AddDataView.java | 7 -------
4 files changed, 2 insertions(+), 23 deletions(-)
diff --git a/res/stages/data-view-stage.fxml b/res/stages/data-view-stage.fxml
index 0c9adc6..7adaf2e 100644
--- a/res/stages/data-view-stage.fxml
+++ b/res/stages/data-view-stage.fxml
@@ -9,7 +9,7 @@
<?import javafx.scene.text.*?>
<?import javafx.stage.*?>
-<Stage fx:id="stage" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fr.univlille.sae.classification.controller.DataStageController">
+<Stage fx:id="stage" xmlns="http://javafx.com/javafx/17.0.12" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fr.univlille.sae.classification.controller.DataStageController">
<scene>
<Scene>
<AnchorPane prefHeight="487.0" prefWidth="692.0">
@@ -54,7 +54,6 @@
</HBox>
<HBox alignment="CENTER" prefHeight="169.0" prefWidth="691.0" spacing="50.0">
<children>
- <Button fx:id="addData" mnemonicParsing="false" onAction="#openAddData" prefHeight="26.0" prefWidth="141.0" text="Ajouter une donnée" />
<Button fx:id="classifyData" disable="true" mnemonicParsing="false" onAction="#classifyDatas" prefHeight="26.0" prefWidth="157.0" text="Classifier les données" />
</children>
</HBox>
diff --git a/src/main/java/fr/univlille/sae/classification/controller/AddDataController.java b/src/main/java/fr/univlille/sae/classification/controller/AddDataController.java
index 370a3a2..1a690a0 100644
--- a/src/main/java/fr/univlille/sae/classification/controller/AddDataController.java
+++ b/src/main/java/fr/univlille/sae/classification/controller/AddDataController.java
@@ -2,6 +2,7 @@ package fr.univlille.sae.classification.controller;
import fr.univlille.sae.classification.model.ClassificationModel;
import fr.univlille.sae.classification.model.Iris;
+import fr.univlille.sae.classification.view.DataVisualizationView;
import fr.univlille.sae.classification.view.MainStageView;
import javafx.fxml.FXML;
import javafx.scene.control.*;
diff --git a/src/main/java/fr/univlille/sae/classification/controller/DataStageController.java b/src/main/java/fr/univlille/sae/classification/controller/DataStageController.java
index 8df439c..2c561a9 100644
--- a/src/main/java/fr/univlille/sae/classification/controller/DataStageController.java
+++ b/src/main/java/fr/univlille/sae/classification/controller/DataStageController.java
@@ -28,9 +28,6 @@ public class DataStageController {
@FXML
Button loadData;
- @FXML
- Button addData;
-
@FXML
Button classifyData;
@@ -61,17 +58,6 @@ public class DataStageController {
this.dataStageView = dataStageView;
}
- /**
- * Ouvre l'interface d'ajout de donnée.
- * @throws IOException
- */
- public void openAddData() throws IOException {
- AddDataView addDataView = new AddDataView(ClassificationModel.getClassificationModel(), stage, dataStageView);
- addDataView.show();
- }
-
-
-
public void classifyDatas() {
ClassificationModel.getClassificationModel().classifierDonnees();
classifyData.setDisable(true);
diff --git a/src/main/java/fr/univlille/sae/classification/view/AddDataView.java b/src/main/java/fr/univlille/sae/classification/view/AddDataView.java
index fbc948a..8b404aa 100644
--- a/src/main/java/fr/univlille/sae/classification/view/AddDataView.java
+++ b/src/main/java/fr/univlille/sae/classification/view/AddDataView.java
@@ -17,7 +17,6 @@ public class AddDataView {
private ClassificationModel model;
private Stage owner;
private MainStageView mainStageView;
- private DataStageView dataStageView;
public AddDataView(ClassificationModel model, Stage owner, MainStageView mainStageView) {
this.model = model;
@@ -25,12 +24,6 @@ public class AddDataView {
this.mainStageView = mainStageView;
}
- public AddDataView(ClassificationModel model, Stage owner, DataStageView dataStageView) {
- this.model = model;
- this.owner = owner;
- this.dataStageView = dataStageView;
- }
-
public void show() throws IOException {
FXMLLoader loader = new FXMLLoader();
--
GitLab