diff --git a/src/main/java/fr/univlille/sae/classification/view/AddDataView.java b/src/main/java/fr/univlille/sae/classification/view/AddDataView.java index 8b404aa681e721888ea94b8df97fa13ab727f9b6..a6a495f70fdcdc5425809aa766e6e26b9568c52c 100644 --- a/src/main/java/fr/univlille/sae/classification/view/AddDataView.java +++ b/src/main/java/fr/univlille/sae/classification/view/AddDataView.java @@ -1,7 +1,6 @@ package fr.univlille.sae.classification.view; import fr.univlille.sae.classification.controller.AddDataController; -import fr.univlille.sae.classification.controller.AxesSettingsController; import fr.univlille.sae.classification.model.ClassificationModel; import javafx.fxml.FXMLLoader; import javafx.scene.control.Alert; @@ -24,40 +23,46 @@ public class AddDataView { this.mainStageView = mainStageView; } - public void show() throws IOException { - + public void show() { FXMLLoader loader = new FXMLLoader(); - URL fxmlFileUrl = new File(System.getProperty("user.dir") + File.separator + "res" + File.separator + "stages" + File.separator + "add-data-stage.fxml").toURI().toURL(); + URL fxmlFileUrl = null; + + try { + fxmlFileUrl = new File(System.getProperty("user.dir") + File.separator + "res" + File.separator + "stages" + File.separator + "add-data-stage.fxml").toURI().toURL(); + } catch (IOException e) { + System.out.println("Erreur lors de la création de l'URL du fichier FXML : " + e.getMessage()); + return; + } if (fxmlFileUrl == null) { System.out.println("Impossible de charger le fichier fxml"); System.exit(-1); } - loader.setLocation(fxmlFileUrl); - Stage root = loader.load(); - - AddDataController controller = loader.getController(); - - controller.setMainStageView(mainStageView); + loader.setLocation(fxmlFileUrl); - if(model.getDatas().isEmpty()) { - Alert alert = new Alert(Alert.AlertType.WARNING); - alert.setTitle("Erreur"); - alert.setHeaderText(null); - alert.setContentText("Veuillez d'abord charger les données avant pouvoir ajouter un point"); - alert.showAndWait(); - return; + try { + Stage root = loader.load(); + AddDataController controller = loader.getController(); + controller.setMainStageView(mainStageView); + + if (model.getDatas().isEmpty()) { + Alert alert = new Alert(Alert.AlertType.WARNING); + alert.setTitle("Erreur"); + alert.setHeaderText(null); + alert.setContentText("Veuillez d'abord charger les données avant de pouvoir ajouter un point"); + alert.showAndWait(); + return; + } + + root.setResizable(false); + root.initOwner(owner); + root.initModality(Modality.APPLICATION_MODAL); + root.setTitle("Ajout de donnée"); + + root.showAndWait(); + } catch (IOException e) { + System.out.println("Erreur lors du chargement de la scène : " + e.getMessage()); } - - - root.setResizable(false); - root.initOwner(owner); - root.initModality(Modality.APPLICATION_MODAL); - root.setTitle("Ajout de donée"); - - root.showAndWait(); - } - } diff --git a/src/main/java/fr/univlille/sae/classification/view/AxesSettingsView.java b/src/main/java/fr/univlille/sae/classification/view/AxesSettingsView.java index 2a1f23424e2d78a964eaae7a13df1d7b1f23802f..999e8176d6f3f4ce6690540134965633628646e1 100644 --- a/src/main/java/fr/univlille/sae/classification/view/AxesSettingsView.java +++ b/src/main/java/fr/univlille/sae/classification/view/AxesSettingsView.java @@ -1,8 +1,6 @@ package fr.univlille.sae.classification.view; import fr.univlille.sae.classification.controller.AxesSettingsController; -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.fxml.FXMLLoader; @@ -10,60 +8,65 @@ import javafx.scene.control.Alert; import javafx.stage.Modality; import javafx.stage.Stage; -import javax.xml.crypto.Data; import java.io.File; import java.io.IOException; import java.net.URL; public class AxesSettingsView { - private ClassificationModel model; private Stage owner; private DataVisualizationView dataVisualizationView; - public AxesSettingsView(ClassificationModel model, Stage owner, DataVisualizationView dataVisualizationView){ + public AxesSettingsView(ClassificationModel model, Stage owner, DataVisualizationView dataVisualizationView) { this.model = model; this.owner = owner; this.dataVisualizationView = dataVisualizationView; } - public void show() throws IOException { - + public void show() { FXMLLoader loader = new FXMLLoader(); - URL fxmlFileUrl = new File(System.getProperty("user.dir") + File.separator + "res" + File.separator + "stages" + File.separator + "axes-settings-stage.fxml").toURI().toURL(); + URL fxmlFileUrl = null; + + try { + fxmlFileUrl = new File(System.getProperty("user.dir") + File.separator + "res" + File.separator + "stages" + File.separator + "axes-settings-stage.fxml").toURI().toURL(); + } catch (IOException e) { + System.out.println("Erreur lors de la création de l'URL du fichier FXML : " + e.getMessage()); + return; + } if (fxmlFileUrl == null) { System.out.println("Impossible de charger le fichier fxml"); System.exit(-1); } - loader.setLocation(fxmlFileUrl); - Stage root = loader.load(); - - root.setResizable(false); - root.initOwner(owner); - root.initModality(Modality.APPLICATION_MODAL); - root.setTitle("Configuration des axes"); - AxesSettingsController controller = loader.getController(); - controller.setdataVisualizationView(dataVisualizationView); + loader.setLocation(fxmlFileUrl); - if(model.getDatas().isEmpty()) { - Alert alert = new Alert(Alert.AlertType.WARNING); - alert.setTitle("Erreur"); - alert.setHeaderText(null); - alert.setContentText("Veuillez d'abord charger les données avant de modifier les parametres"); - alert.showAndWait(); - return; + try { + Stage root = loader.load(); + root.setResizable(false); + root.initOwner(owner); + root.initModality(Modality.APPLICATION_MODAL); + root.setTitle("Configuration des axes"); + AxesSettingsController controller = loader.getController(); + controller.setdataVisualizationView(dataVisualizationView); + + if (model.getDatas().isEmpty()) { + Alert alert = new Alert(Alert.AlertType.WARNING); + alert.setTitle("Erreur"); + alert.setHeaderText(null); + alert.setContentText("Veuillez d'abord charger les données avant de modifier les paramètres"); + alert.showAndWait(); + return; + } + + LoadableData dataType = model.getDatas().get(0); + controller.setSelectAbs(dataType.getAttributesName()); + controller.setSelectOrd(dataType.getAttributesName()); + + root.showAndWait(); + } catch (IOException e) { + System.out.println("Erreur lors du chargement de la scène : " + e.getMessage()); } - - LoadableData dataType = model.getDatas().get(0); - - - controller.setSelectAbs(dataType.getAttributesName()); - controller.setSelectOrd(dataType.getAttributesName()); - - root.showAndWait(); - } } diff --git a/src/main/java/fr/univlille/sae/classification/view/DataStageView.java b/src/main/java/fr/univlille/sae/classification/view/DataStageView.java index 47f21b628872b2ffc3f95e6ea068ed60131bbb4b..57b5e6d351ad34b71bbc61145522ad2df340029f 100644 --- a/src/main/java/fr/univlille/sae/classification/view/DataStageView.java +++ b/src/main/java/fr/univlille/sae/classification/view/DataStageView.java @@ -26,8 +26,6 @@ public class DataStageView extends DataVisualizationView implements Observer { private ClassificationModel model; private DataStageController controller; private Stage root; - private ScatterChart<Double, Double> scatterChart; - private String actualX, actualY; public DataStageView(ClassificationModel model) { this.model = model; diff --git a/src/main/java/fr/univlille/sae/classification/view/LoadDataView.java b/src/main/java/fr/univlille/sae/classification/view/LoadDataView.java index 156ab380cbae143783efecbfa18969dc384dccd6..4ece4c3509f00d695926eac378c8754f9850959e 100644 --- a/src/main/java/fr/univlille/sae/classification/view/LoadDataView.java +++ b/src/main/java/fr/univlille/sae/classification/view/LoadDataView.java @@ -19,27 +19,35 @@ public class LoadDataView { this.owner = owner; } - - - public void show() throws IOException { - + public void show() { FXMLLoader loader = new FXMLLoader(); - URL fxmlFileUrl = new File(System.getProperty("user.dir") + File.separator + "res" + File.separator + "stages" + File.separator + "load-data-stage.fxml").toURI().toURL(); + URL fxmlFileUrl = null; + + try { + fxmlFileUrl = new File(System.getProperty("user.dir") + File.separator + "res" + File.separator + "stages" + File.separator + "load-data-stage.fxml").toURI().toURL(); + } catch (IOException e) { + System.out.println("Erreur lors de la création de l'URL du fichier FXML : " + e.getMessage()); + return; + } if (fxmlFileUrl == null) { System.out.println("Impossible de charger le fichier fxml"); System.exit(-1); } + loader.setLocation(fxmlFileUrl); - Stage root = loader.load(); - root.setResizable(false); - root.initOwner(owner); - root.initModality(Modality.APPLICATION_MODAL); - root.setTitle("Chargement des donées"); + try { + Stage root = loader.load(); - root.showAndWait(); + root.setResizable(false); + root.initOwner(owner); + root.initModality(Modality.APPLICATION_MODAL); + root.setTitle("Chargement des données"); + root.showAndWait(); + } catch (IOException e) { + System.out.println("Erreur lors du chargement de la scène : " + e.getMessage()); + } } - }