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

Probleme merge request

parent 9a94abed
Branches
Tags
No related merge requests found
......@@ -8,6 +8,7 @@ import javafx.scene.chart.NumberAxis;
import javafx.scene.chart.ScatterChart;
import javafx.scene.control.Label;
import javafx.scene.layout.HBox;
import javafx.scene.layout.VBox;
import javafx.stage.Stage;
public abstract class DataVisualizationController {
......@@ -147,7 +148,7 @@ public abstract class DataVisualizationController {
public void loadLegend(HBox hbox) {
public void loadLegend(VBox hbox) {
this.legend.getChildren().clear();
this.legend.getChildren().addAll(hbox.getChildren());
}
......
......@@ -2,19 +2,14 @@ package fr.univlille.sae.classification.utils;
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.LoadableData;
import javafx.scene.chart.ScatterChart;
import javafx.scene.chart.XYChart;
import javafx.scene.control.ContextMenu;
import javafx.scene.control.Label;
import javafx.scene.control.MenuItem;
import javafx.scene.layout.HBox;
import javafx.scene.layout.VBox;
import javafx.scene.paint.Color;
import javafx.scene.shape.Circle;
import javafx.scene.shape.Rectangle;
import javafx.scene.shape.Shape;
import javafx.stage.Stage;
import java.util.HashMap;
import java.util.Map;
......@@ -56,7 +51,7 @@ public class ViewUtil {
}
public static HBox loadLegend() {
public static VBox loadLegend() {
//Color
Map<String, Color> colors = new HashMap<>(Map.copyOf(LoadableData.getClassifications()));
......
......@@ -11,6 +11,7 @@ import javafx.scene.Node;
import javafx.scene.chart.ScatterChart;
import javafx.scene.chart.XYChart;
import javafx.scene.layout.HBox;
import javafx.scene.layout.VBox;
import javafx.scene.shape.*;
import java.util.ArrayList;
......@@ -166,8 +167,8 @@ public abstract class DataVisualizationView {
scatterChart.getData().addAll(serieList.values());
HBox hBox = ViewUtil.loadLegend();
controller.loadLegend(hBox);
VBox vBox = ViewUtil.loadLegend();
controller.loadLegend(vBox);
}
......
......@@ -27,7 +27,7 @@ public class KNNView {
}
/**
* Affiche la fenêtre de chargement des données.
*
*/
public void show() {
FXMLLoader loader = new FXMLLoader();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment