Skip to content
Snippets Groups Projects
Commit 7719a91c authored by Hugo Desmons's avatar Hugo Desmons
Browse files

Resolution Probleme update et show

parent 55af0193
No related branches found
No related tags found
No related merge requests found
package fr.univlille.sae.classification.view; package fr.univlille.sae.classification.view;
import fr.univlille.sae.classification.controller.DataStageController; 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.ClassificationModel;
import fr.univlille.sae.classification.model.DataType; import fr.univlille.sae.classification.model.DataType;
import fr.univlille.sae.classification.model.Iris; import fr.univlille.sae.classification.model.Iris;
...@@ -33,7 +34,7 @@ import java.util.Map; ...@@ -33,7 +34,7 @@ import java.util.Map;
public class DataStageView extends DataVisualizationView implements Observer { public class DataStageView extends DataVisualizationView implements Observer {
private DataStageController controller;
...@@ -77,8 +78,9 @@ public class DataStageView extends DataVisualizationView implements Observer { ...@@ -77,8 +78,9 @@ public class DataStageView extends DataVisualizationView implements Observer {
root.setResizable(false); root.setResizable(false);
root.setTitle("SAE3.3 - Logiciel de classification"); root.setTitle("SAE3.3 - Logiciel de classification");
root.show(); root.show();
controller = (MainStageController) controller;
controller = loader.getController(); controller = loader.getController();
controller.setDataStageView(this); ((DataStageController) controller).setDataStageView(this);
scatterChart = controller.getScatterChart(); scatterChart = controller.getScatterChart();
scatterChart.setLegendVisible(false); scatterChart.setLegendVisible(false);
scatterChart.getData().addAll(series4, series1, series2, series3); scatterChart.getData().addAll(series4, series1, series2, series3);
...@@ -99,7 +101,7 @@ public class DataStageView extends DataVisualizationView implements Observer { ...@@ -99,7 +101,7 @@ public class DataStageView extends DataVisualizationView implements Observer {
* @return contrôleur de la vue. * @return contrôleur de la vue.
*/ */
public DataStageController getController() { public DataStageController getController() {
return controller; return (DataStageController) controller;
} }
/** /**
......
package fr.univlille.sae.classification.view; 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.controller.MainStageController;
import fr.univlille.sae.classification.model.ClassificationModel; import fr.univlille.sae.classification.model.ClassificationModel;
import fr.univlille.sae.classification.model.LoadableData; import fr.univlille.sae.classification.model.LoadableData;
...@@ -22,6 +24,7 @@ import java.util.Map; ...@@ -22,6 +24,7 @@ import java.util.Map;
*/ */
public abstract class DataVisualizationView { public abstract class DataVisualizationView {
public DataVisualizationController controller;
private ScatterChart.Series series1; private ScatterChart.Series series1;
private ScatterChart.Series series2; private ScatterChart.Series series2;
private ScatterChart.Series series3; private ScatterChart.Series series3;
...@@ -29,7 +32,7 @@ public abstract class DataVisualizationView { ...@@ -29,7 +32,7 @@ public abstract class DataVisualizationView {
protected String actualX; protected String actualX;
protected String actualY; protected String actualY;
protected ScatterChart scatterChart; protected ScatterChart scatterChart;
private MainStageController controller;
private Map<String, ScatterChart.Series<Double, Double>> serieList; private Map<String, ScatterChart.Series<Double, Double>> serieList;
public ClassificationModel model; public ClassificationModel model;
......
...@@ -27,7 +27,7 @@ import java.util.*; ...@@ -27,7 +27,7 @@ import java.util.*;
public class MainStageView extends DataVisualizationView implements Observer { public class MainStageView extends DataVisualizationView implements Observer {
private MainStageController controller;
private Stage root; private Stage root;
...@@ -87,8 +87,10 @@ public class MainStageView extends DataVisualizationView implements Observer { ...@@ -87,8 +87,10 @@ public class MainStageView extends DataVisualizationView implements Observer {
} }
}); });
controller = (MainStageController) controller;
controller = loader.getController(); controller = loader.getController();
controller.setMainStageView(this); ((MainStageController) controller).setMainStageView(this);
scatterChart = controller.getScatterChart(); scatterChart = controller.getScatterChart();
//scatterChart.getData().addAll(series1, series2, series3, series4); //scatterChart.getData().addAll(series1, series2, series3, series4);
controller.setAxesSelected("Aucun fichier sélectionné"); controller.setAxesSelected("Aucun fichier sélectionné");
...@@ -101,7 +103,7 @@ public class MainStageView extends DataVisualizationView implements Observer { ...@@ -101,7 +103,7 @@ public class MainStageView extends DataVisualizationView implements Observer {
public MainStageController getController() { public MainStageController getController() {
return controller; return (MainStageController) controller;
} }
@Override @Override
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment