From ec1658834337e50d717fb9f5ec78749e46c27432 Mon Sep 17 00:00:00 2001 From: Aleksandra Smela Date: Wed, 28 Dec 2022 21:11:50 +0100 Subject: [PATCH] gui config continuation --- oolab/src/main/java/agh/ics/oop/gui/App.java | 10 +---- .../ics/oop/gui/ConfigurationController.java | 28 +++++++++++- oolab/src/main/resources/configuration.fxml | 31 +++++++------ oolab/src/main/resources/mainView.fxml | 43 ++++++++----------- 4 files changed, 62 insertions(+), 50 deletions(-) diff --git a/oolab/src/main/java/agh/ics/oop/gui/App.java b/oolab/src/main/java/agh/ics/oop/gui/App.java index b8b2efd..1443cff 100644 --- a/oolab/src/main/java/agh/ics/oop/gui/App.java +++ b/oolab/src/main/java/agh/ics/oop/gui/App.java @@ -24,17 +24,11 @@ public class App extends Application{ // } @Override public void start(Stage primaryStage) throws Exception { - FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("/mainView.fxml")); + FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("/configuration.fxml")); Scene scene = new Scene(fxmlLoader.load()); - primaryStage.setTitle("Evolution Simulator"); + primaryStage.setTitle("START"); primaryStage.setScene(scene); primaryStage.show(); - Stage stage=new Stage(); - FXMLLoader fxmlLoader2 = new FXMLLoader(getClass().getResource("/configuration.fxml")); - Scene scene2 = new Scene(fxmlLoader2.load()); - stage.setTitle("START"); - stage.setScene(scene2); - stage.show(); } } diff --git a/oolab/src/main/java/agh/ics/oop/gui/ConfigurationController.java b/oolab/src/main/java/agh/ics/oop/gui/ConfigurationController.java index a94701c..19d385d 100644 --- a/oolab/src/main/java/agh/ics/oop/gui/ConfigurationController.java +++ b/oolab/src/main/java/agh/ics/oop/gui/ConfigurationController.java @@ -1,4 +1,30 @@ package agh.ics.oop.gui; -public class ConfigurationController { +import javafx.fxml.FXML; +import javafx.fxml.Initializable; +import javafx.scene.control.Label; +import javafx.scene.control.TextField; + +import java.net.URL; +import java.util.ResourceBundle; + +public class ConfigurationController implements Initializable { + @FXML + private TextField filePath; + @FXML + private Label infoLabel; + @Override + public void initialize(URL location, ResourceBundle resources) { + infoLabel.setText("Start first simulation!"); + } + @FXML + public void startSimulation(){ + try{ + String path= filePath.getText(); + //tu trzeba spróbować wczytać plik konfiguracyjny + infoLabel.setText("Your simulation is opened in a new window. You can start another one."); + //i odpalić symulacje w nowym wątku + } + catch(Exception exception){infoLabel.setText("Wrong config file path. Try again.");} + } } diff --git a/oolab/src/main/resources/configuration.fxml b/oolab/src/main/resources/configuration.fxml index a109982..17e636c 100644 --- a/oolab/src/main/resources/configuration.fxml +++ b/oolab/src/main/resources/configuration.fxml @@ -1,34 +1,29 @@ - - - - - - - - + + + - + - - - + + + - +