From f87fbe2ca9cbda6174c11c4c9c378949c13ce060 Mon Sep 17 00:00:00 2001
From: "hugo.debuyser.etu" <hugo.debuyser.etu@univ-lille.fr>
Date: Fri, 29 Nov 2024 17:17:08 +0100
Subject: [PATCH] =?UTF-8?q?reset=20des=20axes=20fonctionne=20quand=20on=20?=
=?UTF-8?q?charge=20de=20nouvelle=20donne=C3=A9s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controller/LoadDataController.java | 2 +-
.../view/DataVisualizationView.java | 17 +++++++++++++----
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/src/main/java/fr/univlille/sae/classification/controller/LoadDataController.java b/src/main/java/fr/univlille/sae/classification/controller/LoadDataController.java
index ae5fd92..244e906 100644
--- a/src/main/java/fr/univlille/sae/classification/controller/LoadDataController.java
+++ b/src/main/java/fr/univlille/sae/classification/controller/LoadDataController.java
@@ -79,7 +79,7 @@ public class LoadDataController {
ClassificationModel.getClassificationModel().setType(typeChoisi);
try {
- DataVisualizationView.resetAxis();
+ DataVisualizationView.resetEachAxis();
LoadableData.setClassificationTypeGlobal(-1);
ClassificationModel.getClassificationModel().loadData(file);
ChooseAttributesView chooseAttributesView = new ChooseAttributesView(ClassificationModel.getClassificationModel(), (Stage) stage.getOwner());
diff --git a/src/main/java/fr/univlille/sae/classification/view/DataVisualizationView.java b/src/main/java/fr/univlille/sae/classification/view/DataVisualizationView.java
index 4731963..349197c 100644
--- a/src/main/java/fr/univlille/sae/classification/view/DataVisualizationView.java
+++ b/src/main/java/fr/univlille/sae/classification/view/DataVisualizationView.java
@@ -8,6 +8,7 @@ import fr.univlille.sae.classification.model.LoadableData;
import fr.univlille.sae.classification.utils.Observable;
import fr.univlille.sae.classification.utils.ViewUtil;
import javafx.scene.Node;
+import javafx.scene.chart.NumberAxis;
import javafx.scene.chart.ScatterChart;
import javafx.scene.chart.XYChart;
import javafx.scene.layout.HBox;
@@ -22,7 +23,7 @@ import java.util.*;
*/
public abstract class DataVisualizationView {
- private static Set<DataVisualizationView> views;
+ private static Set<DataVisualizationView> views = new HashSet<DataVisualizationView>();
public DataVisualizationController controller;
@@ -49,8 +50,18 @@ public abstract class DataVisualizationView {
}
- public static void resetAxis() {
+ public static void resetEachAxis() {
// call method resetAxis for each instance of DataVisualizationView (views)
+ for(DataVisualizationView view : views) {
+ view.resetAxis();
+ }
+ }
+
+ public void resetAxis(){
+ setActualY("");
+ setActualX("");
+ ((NumberAxis) scatterChart.getXAxis()).setLabel("");
+ ((NumberAxis) scatterChart.getYAxis()).setLabel("");
}
/**
@@ -195,8 +206,6 @@ public abstract class DataVisualizationView {
return;
}
-
-
LoadableData newData = (LoadableData) data;
if (actualX == null || actualY == null) {
controller.setAxesSelected("Aucuns axes sélectionnés");
--
GitLab