From 4eafa050c7f9eae0e53061dd031602ae3446c691 Mon Sep 17 00:00:00 2001
From: Matias Mennecart <matias.mennecart.etu@univ-lille.fr>
Date: Fri, 25 Oct 2024 16:17:51 +0200
Subject: [PATCH] Fix bugs dus au merge
---
.../sae/classification/view/DataStageView.java | 12 ++++++------
.../sae/classification/view/MainStageView.java | 6 +++---
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/java/fr/univlille/sae/classification/view/DataStageView.java b/src/main/java/fr/univlille/sae/classification/view/DataStageView.java
index 1d3c3f1..fd721c1 100644
--- a/src/main/java/fr/univlille/sae/classification/view/DataStageView.java
+++ b/src/main/java/fr/univlille/sae/classification/view/DataStageView.java
@@ -70,7 +70,6 @@ public class DataStageView extends DataVisualizationView implements Observer {
- System.out.println("DataStageView scatter chart: " +scatterChart);
controller.setAxesSelected("Aucun fichier sélectionné");
if (!model.getDatas().isEmpty()) {
@@ -89,11 +88,13 @@ public class DataStageView extends DataVisualizationView implements Observer {
return;
}
// On vide le nuage pour s'assurer qu'il est bien vide
- scatterChart.getData().clear();
+ ObservableList<XYChart.Series> series = scatterChart.getData();
+ for(XYChart.Series serie : series) {serie.getData().clear();}
- //Jalon 1: on verifie que le type de donnée est bien IRIS
+
+ //Jalon 1: on verifie que le type de donnée est bien IRIS
if(model.getType() == DataType.IRIS) {
if(actualX==null && actualY==null){
controller.setAxesSelected("Aucuns axes sélectionnés");
@@ -124,7 +125,7 @@ public class DataStageView extends DataVisualizationView implements Observer {
series3.getData().add(dataPoint);
break;
default:
- dataPoint.setNode(getForm(iris, new Rectangle(10, 10)));
+ dataPoint.setNode(ViewUtil.getForm(iris, new Rectangle(10, 10), root));
series4.getData().add(dataPoint);
break;
}
@@ -135,7 +136,6 @@ public class DataStageView extends DataVisualizationView implements Observer {
series3.setName("Virginica");
series4.setName("undefinied");
- scatterChart.getData().addAll(series1, series2, series3);
}
}
@@ -166,7 +166,7 @@ public class DataStageView extends DataVisualizationView implements Observer {
iris.getDataType(actualY)
);
- dataPoint.setNode(ViewUtil.getForm(iris, new Rectangle(10, 10)));
+ dataPoint.setNode(ViewUtil.getForm(iris, new Rectangle(10, 10), root));
if (!scatterChart.getData().isEmpty()) {
series4.getData().add(dataPoint);
}
diff --git a/src/main/java/fr/univlille/sae/classification/view/MainStageView.java b/src/main/java/fr/univlille/sae/classification/view/MainStageView.java
index daf7d8c..7452353 100644
--- a/src/main/java/fr/univlille/sae/classification/view/MainStageView.java
+++ b/src/main/java/fr/univlille/sae/classification/view/MainStageView.java
@@ -86,7 +86,7 @@ public class MainStageView extends DataVisualizationView implements Observer {
controller.setMainStageView(this);
scatterChart = controller.getScatterChart();
- scatterChart.getData().addAll(series1, series2, series3);
+ scatterChart.getData().addAll(series1, series2, series3, series4);
System.out.println("DataStageView scatter chart: " +scatterChart );
controller.setAxesSelected("Aucun fichier sélectionné");
@@ -142,6 +142,7 @@ public class MainStageView extends DataVisualizationView implements Observer {
series3.getData().add(dataPoint);
break;
default:
+ dataPoint.setNode(ViewUtil.getForm(iris, new Rectangle(10, 10), root));
series4.getData().add(dataPoint);
break;
}
@@ -182,8 +183,7 @@ public class MainStageView extends DataVisualizationView implements Observer {
dataPoint.setNode(ViewUtil.getForm(iris, new Rectangle(10, 10), root));
if (!scatterChart.getData().isEmpty()) {
- XYChart.Series series = (XYChart.Series) scatterChart.getData().get(0);
- series.getData().add(dataPoint);
+ series4.getData().add(dataPoint);
}
}
} catch (Exception e) {
--
GitLab