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

Merge remote-tracking branch 'origin/hugodebuyser' into hugodebuyser

# Conflicts:
#	src/main/java/fr/univlille/sae/classification/controller/MainStageController.java
parents 4c748099 a89e2f10
No related branches found
No related tags found
No related merge requests found
...@@ -5,6 +5,7 @@ import fr.univlille.sae.classification.view.AxesSettingsView; ...@@ -5,6 +5,7 @@ import fr.univlille.sae.classification.view.AxesSettingsView;
import fr.univlille.sae.classification.view.LoadDataView; import fr.univlille.sae.classification.view.LoadDataView;
import fr.univlille.sae.classification.view.MainStageView; import fr.univlille.sae.classification.view.MainStageView;
import fr.univlille.sae.classification.view.AddDataView; import fr.univlille.sae.classification.view.AddDataView;
import fr.univlille.sae.classification.view.MainStageView;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.chart.*; import javafx.scene.chart.*;
...@@ -76,6 +77,7 @@ public class MainStageController { ...@@ -76,6 +77,7 @@ public class MainStageController {
AddDataView addDataView = new AddDataView(ClassificationModel.getClassificationModel(), stage); AddDataView addDataView = new AddDataView(ClassificationModel.getClassificationModel(), stage);
addDataView.show(); addDataView.show();
}
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment