From 7719a91c0896fb6e341c3b76fbd749b75257904a Mon Sep 17 00:00:00 2001
From: Hugo Desmons <hugo.desmons.etu@univ-lille.fr>
Date: Fri, 29 Nov 2024 10:31:39 +0100
Subject: [PATCH] Resolution Probleme update et show
---
.../univlille/sae/classification/view/DataStageView.java | 8 +++++---
.../sae/classification/view/DataVisualizationView.java | 5 ++++-
.../univlille/sae/classification/view/MainStageView.java | 8 +++++---
3 files changed, 14 insertions(+), 7 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 cad5bfb..68d70c4 100644
--- a/src/main/java/fr/univlille/sae/classification/view/DataStageView.java
+++ b/src/main/java/fr/univlille/sae/classification/view/DataStageView.java
@@ -1,6 +1,7 @@
package fr.univlille.sae.classification.view;
import fr.univlille.sae.classification.controller.DataStageController;
+import fr.univlille.sae.classification.controller.MainStageController;
import fr.univlille.sae.classification.model.ClassificationModel;
import fr.univlille.sae.classification.model.DataType;
import fr.univlille.sae.classification.model.Iris;
@@ -33,7 +34,7 @@ import java.util.Map;
public class DataStageView extends DataVisualizationView implements Observer {
- private DataStageController controller;
+
@@ -77,8 +78,9 @@ public class DataStageView extends DataVisualizationView implements Observer {
root.setResizable(false);
root.setTitle("SAE3.3 - Logiciel de classification");
root.show();
+ controller = (MainStageController) controller;
controller = loader.getController();
- controller.setDataStageView(this);
+ ((DataStageController) controller).setDataStageView(this);
scatterChart = controller.getScatterChart();
scatterChart.setLegendVisible(false);
scatterChart.getData().addAll(series4, series1, series2, series3);
@@ -99,7 +101,7 @@ public class DataStageView extends DataVisualizationView implements Observer {
* @return contrôleur de la vue.
*/
public DataStageController getController() {
- return controller;
+ return (DataStageController) controller;
}
/**
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 ecb717c..8c1317b 100644
--- a/src/main/java/fr/univlille/sae/classification/view/DataVisualizationView.java
+++ b/src/main/java/fr/univlille/sae/classification/view/DataVisualizationView.java
@@ -1,5 +1,7 @@
package fr.univlille.sae.classification.view;
+import fr.univlille.sae.classification.controller.DataStageController;
+import fr.univlille.sae.classification.controller.DataVisualizationController;
import fr.univlille.sae.classification.controller.MainStageController;
import fr.univlille.sae.classification.model.ClassificationModel;
import fr.univlille.sae.classification.model.LoadableData;
@@ -22,6 +24,7 @@ import java.util.Map;
*/
public abstract class DataVisualizationView {
+ public DataVisualizationController controller;
private ScatterChart.Series series1;
private ScatterChart.Series series2;
private ScatterChart.Series series3;
@@ -29,7 +32,7 @@ public abstract class DataVisualizationView {
protected String actualX;
protected String actualY;
protected ScatterChart scatterChart;
- private MainStageController controller;
+
private Map<String, ScatterChart.Series<Double, Double>> serieList;
public ClassificationModel model;
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 91ea447..1b6717a 100644
--- a/src/main/java/fr/univlille/sae/classification/view/MainStageView.java
+++ b/src/main/java/fr/univlille/sae/classification/view/MainStageView.java
@@ -27,7 +27,7 @@ import java.util.*;
public class MainStageView extends DataVisualizationView implements Observer {
- private MainStageController controller;
+
private Stage root;
@@ -87,8 +87,10 @@ public class MainStageView extends DataVisualizationView implements Observer {
}
});
+
+ controller = (MainStageController) controller;
controller = loader.getController();
- controller.setMainStageView(this);
+ ((MainStageController) controller).setMainStageView(this);
scatterChart = controller.getScatterChart();
//scatterChart.getData().addAll(series1, series2, series3, series4);
controller.setAxesSelected("Aucun fichier sélectionné");
@@ -101,7 +103,7 @@ public class MainStageView extends DataVisualizationView implements Observer {
public MainStageController getController() {
- return controller;
+ return (MainStageController) controller;
}
@Override
--
GitLab