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 cad5bfb62df756c2010d6e253751c0672b527853..68d70c468c480b1ac178c38e901cfddf6f8ee524 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 ecb717c5ce239bb41fd051a50f0886795d360b0a..8c1317b6b4c1b28511852ee37b37d6e2840f3809 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 91ea4470b4a49fa04d9932d13db0ab581c35d3f7..1b6717af3d2e63829e394cccd28f2a64a5c45d73 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