Skip to content
Snippets Groups Projects
Commit f87fbe2c authored by Hugo Debuyser's avatar Hugo Debuyser
Browse files

reset des axes fonctionne quand on charge de nouvelle donneés

parent 11b4c357
No related branches found
No related tags found
No related merge requests found
...@@ -79,7 +79,7 @@ public class LoadDataController { ...@@ -79,7 +79,7 @@ public class LoadDataController {
ClassificationModel.getClassificationModel().setType(typeChoisi); ClassificationModel.getClassificationModel().setType(typeChoisi);
try { try {
DataVisualizationView.resetAxis(); DataVisualizationView.resetEachAxis();
LoadableData.setClassificationTypeGlobal(-1); LoadableData.setClassificationTypeGlobal(-1);
ClassificationModel.getClassificationModel().loadData(file); ClassificationModel.getClassificationModel().loadData(file);
ChooseAttributesView chooseAttributesView = new ChooseAttributesView(ClassificationModel.getClassificationModel(), (Stage) stage.getOwner()); ChooseAttributesView chooseAttributesView = new ChooseAttributesView(ClassificationModel.getClassificationModel(), (Stage) stage.getOwner());
......
...@@ -8,6 +8,7 @@ import fr.univlille.sae.classification.model.LoadableData; ...@@ -8,6 +8,7 @@ import fr.univlille.sae.classification.model.LoadableData;
import fr.univlille.sae.classification.utils.Observable; import fr.univlille.sae.classification.utils.Observable;
import fr.univlille.sae.classification.utils.ViewUtil; import fr.univlille.sae.classification.utils.ViewUtil;
import javafx.scene.Node; import javafx.scene.Node;
import javafx.scene.chart.NumberAxis;
import javafx.scene.chart.ScatterChart; import javafx.scene.chart.ScatterChart;
import javafx.scene.chart.XYChart; import javafx.scene.chart.XYChart;
import javafx.scene.layout.HBox; import javafx.scene.layout.HBox;
...@@ -22,7 +23,7 @@ import java.util.*; ...@@ -22,7 +23,7 @@ import java.util.*;
*/ */
public abstract class DataVisualizationView { public abstract class DataVisualizationView {
private static Set<DataVisualizationView> views; private static Set<DataVisualizationView> views = new HashSet<DataVisualizationView>();
public DataVisualizationController controller; public DataVisualizationController controller;
...@@ -49,8 +50,18 @@ public abstract class DataVisualizationView { ...@@ -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) // 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 { ...@@ -195,8 +206,6 @@ public abstract class DataVisualizationView {
return; return;
} }
LoadableData newData = (LoadableData) data; LoadableData newData = (LoadableData) data;
if (actualX == null || actualY == null) { if (actualX == null || actualY == null) {
controller.setAxesSelected("Aucuns axes sélectionnés"); controller.setAxesSelected("Aucuns axes sélectionnés");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment