diff --git a/src/main/java/fr/univlille/sae/classification/controller/DataVisualizationController.java b/src/main/java/fr/univlille/sae/classification/controller/DataVisualizationController.java index b0e8c0630c318b8edd5160cd52e72280cbdd791f..31ace1cf8e0f0d659a02f57e13ab024e84dda1f9 100644 --- a/src/main/java/fr/univlille/sae/classification/controller/DataVisualizationController.java +++ b/src/main/java/fr/univlille/sae/classification/controller/DataVisualizationController.java @@ -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()); } diff --git a/src/main/java/fr/univlille/sae/classification/utils/ViewUtil.java b/src/main/java/fr/univlille/sae/classification/utils/ViewUtil.java index a0e92fd646fa93b58c4df0fe537e13a53da3292b..af5d23f1affcb28ba4a9f675e89a7432cfcf6315 100644 --- a/src/main/java/fr/univlille/sae/classification/utils/ViewUtil.java +++ b/src/main/java/fr/univlille/sae/classification/utils/ViewUtil.java @@ -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())); diff --git a/src/main/java/fr/univlille/sae/classification/view/DataVisualizationView.java b/src/main/java/fr/univlille/sae/classification/view/DataVisualizationView.java index 0b3662a5bfd6775073600f6db962694b2e176eb3..0ee1a0140fd6e25ea2dba391e677ffcafbe6679a 100644 --- a/src/main/java/fr/univlille/sae/classification/view/DataVisualizationView.java +++ b/src/main/java/fr/univlille/sae/classification/view/DataVisualizationView.java @@ -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); } diff --git a/src/main/java/fr/univlille/sae/classification/view/KNNView.java b/src/main/java/fr/univlille/sae/classification/view/KNNView.java index 890522f209599c570a5f20c1190788abcc2ef8a5..5df40577e89bfd2bda585d59c9f94ab00fe2e2cb 100644 --- a/src/main/java/fr/univlille/sae/classification/view/KNNView.java +++ b/src/main/java/fr/univlille/sae/classification/view/KNNView.java @@ -27,7 +27,7 @@ public class KNNView { } /** - * Affiche la fenĂȘtre de chargement des donnĂ©es. + * */ public void show() { FXMLLoader loader = new FXMLLoader();