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

# Conflicts:
#	src/main/java/fr/univlille/sae/classification/view/DataVisualizationView.java

src/main/java/fr/univlille/sae/classification/controller/LoadDataController.java

@@ -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());

src/main/java/fr/univlille/sae/classification/view/DataVisualizationView.java

@@ -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");