Skip to content
Snippets Groups Projects
Commit 306f6f35 authored by Matias Mennecart's avatar Matias Mennecart
Browse files

Merge remote-tracking branch 'origin/master' into matiasmennecart

# Conflicts:
#	src/main/java/fr/univlille/sae/classification/view/DataVisualizationView.java
parents 087b86af e44ea82c
Branches
Tags
No related merge requests found
......@@ -79,7 +79,7 @@ public class LoadDataController {
ClassificationModel.getClassificationModel().setType(typeChoisi);
try {
DataVisualizationView.resetAxis();
DataVisualizationView.resetEachAxis();
LoadableData.setClassificationTypeGlobal(-1);
ClassificationModel.getClassificationModel().loadData(file);
ChooseAttributesView chooseAttributesView = new ChooseAttributesView(ClassificationModel.getClassificationModel(), (Stage) stage.getOwner());
......
......@@ -8,6 +8,7 @@ import fr.univlille.sae.classification.model.LoadableData;
import fr.univlille.sae.classification.utils.Observable;
import fr.univlille.sae.classification.utils.ViewUtil;
import javafx.scene.Node;
import javafx.scene.chart.NumberAxis;
import javafx.scene.chart.ScatterChart;
import javafx.scene.chart.XYChart;
import javafx.scene.layout.HBox;
......@@ -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)
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 {
return;
}
LoadableData newData = (LoadableData) data;
if (actualX == null || actualY == null) {
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