diff --git a/src/main/java/seng202/group9/Controller/App.java b/src/main/java/seng202/group9/Controller/App.java index 04a0939..fd6bfbb 100644 --- a/src/main/java/seng202/group9/Controller/App.java +++ b/src/main/java/seng202/group9/Controller/App.java @@ -49,11 +49,12 @@ public class App extends Application primaryStage.sizeToScene(); MenuController menuController = (MenuController) loader.getController(); menuController.setApp(this); - replaceSceneContent("menu.fxml");//replace this to check your fxml file + //replaceSceneContent("flight_raw_data.fxml");//replace this to check your fxml file } catch (Exception e) { e.printStackTrace(); } primaryStage.show(); + /* //testing out dataset try { currentDataset = new Dataset("test's", Dataset.getExisting); @@ -78,6 +79,7 @@ public class App extends Application } catch (DataException e) { e.printStackTrace(); } + */ } /** diff --git a/src/main/java/seng202/group9/GUI/FlightRawDataController.java b/src/main/java/seng202/group9/GUI/FlightRawDataController.java new file mode 100644 index 0000000..4eb91e3 --- /dev/null +++ b/src/main/java/seng202/group9/GUI/FlightRawDataController.java @@ -0,0 +1,24 @@ +package seng202.group9.GUI; + +import javafx.fxml.Initializable; +import seng202.group9.Controller.App; + +import java.net.URL; +import java.util.ResourceBundle; + +/** + * Created by Liam Beckett on 13/09/2016. + */ +public class FlightRawDataController implements Initializable { + + App parent; + + public void setApp(App parent){ + this.parent = parent; + } + + public void initialize(URL arg0, ResourceBundle arg1) { + // TODO Auto-generated method stub + + } +} \ No newline at end of file diff --git a/src/main/java/seng202/group9/GUI/FlightSummaryController.java b/src/main/java/seng202/group9/GUI/FlightSummaryController.java new file mode 100644 index 0000000..53d1dd7 --- /dev/null +++ b/src/main/java/seng202/group9/GUI/FlightSummaryController.java @@ -0,0 +1,25 @@ +package seng202.group9.GUI; + +import javafx.fxml.Initializable; +import seng202.group9.Controller.App; + +import java.net.URL; +import java.util.ResourceBundle; + +/** + * Created by Liam Beckett on 13/09/2016. + */ +public class FlightSummaryController implements Initializable { + + App parent; + + public void setApp(App parent){ + this.parent = parent; + } + + public void initialize(URL arg0, ResourceBundle arg1) { + // TODO Auto-generated method stub + + } +} + diff --git a/src/main/java/seng202/group9/GUI/MenuController.java b/src/main/java/seng202/group9/GUI/MenuController.java index 76aacae..dc5e05b 100644 --- a/src/main/java/seng202/group9/GUI/MenuController.java +++ b/src/main/java/seng202/group9/GUI/MenuController.java @@ -5,7 +5,6 @@ import java.util.ResourceBundle; import javax.swing.JOptionPane; -import javafx.fxml.FXML; import javafx.fxml.Initializable; import javafx.scene.Scene; import javafx.scene.layout.BorderPane; @@ -36,7 +35,7 @@ public class MenuController implements Initializable{ /** * Load Airline Raw Data Function. */ - public void loadAirlineRaw() { + public void viewAirlineRawData() { try { parent.replaceSceneContent("menu.fxml"); System.out.println("Loaded Airline Raw Data."); @@ -49,31 +48,30 @@ public class MenuController implements Initializable{ this.parent = parent; } + /** + * Load Flight Summary Function. + */ public void viewFlightSummary() { - Stage stage = new Stage(); - BorderPane root = new BorderPane(); //root panel - Scene scene = new Scene(root); - //create the Flight summary page - FlightDataSummary flightSummPage = new FlightDataSummary(); - root.setTop(flightSummPage.getFlightSummary()); - stage.setScene(scene); - stage.show(); - //seng202.group9.Controller.App.primaryStage.setScene(scene); - //seng202.group9.Controller.App.primaryStage.show(); + try { + FlightSummaryController summaryController = (FlightSummaryController) + parent.replaceSceneContent("flight_data_summary.fxml"); + summaryController.setApp(parent); + } catch (Exception e) { + e.printStackTrace(); + } } + /** + * Load Flight Raw Data Function. + */ public void viewFlightRawData() { - - Stage stage = new Stage(); - BorderPane root = new BorderPane(); //root panel - Scene scene = new Scene(root); - //create the Flight summary page - FlightRawData flightRawDataPage = new FlightRawData(); - root.setTop(flightRawDataPage.getFlightRawData()); - stage.setScene(scene); - stage.show(); - //seng202.group9.Controller.App.primaryStage.setScene(scene); - //seng202.group9.Controller.App.primaryStage.show(); + try { + FlightRawDataController rawDataController = (FlightRawDataController) + parent.replaceSceneContent("flight_raw_data.fxml"); + rawDataController.setApp(parent); + } catch (Exception e) { + e.printStackTrace(); + } } diff --git a/src/main/resources/flight_data_summary.fxml b/src/main/resources/flight_data_summary.fxml index 4e4c709..8c90246 100644 --- a/src/main/resources/flight_data_summary.fxml +++ b/src/main/resources/flight_data_summary.fxml @@ -1,111 +1,96 @@ - - - - - - - - + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - + + + - + - + - - - - - - - - - - - + - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - -