From eb698f17c8f037ffcee19afa2d9bcb34ae368c35 Mon Sep 17 00:00:00 2001 From: Michael Wilson Date: Sat, 17 Sep 2016 14:57:21 +1200 Subject: [PATCH] Made graph work with new formatting. --- res/session.ser | Bin 211 -> 209 bytes .../seng202/group9/Controller/SceneCode.java | 2 +- .../seng202/group9/GUI/RouteAnalyser.java | 18 ++--- .../seng202/group9/GUI/RouteRDController.java | 70 +++++++----------- src/main/resources/airport_pie.fxml | 45 +++++++++++ 5 files changed, 80 insertions(+), 55 deletions(-) create mode 100644 src/main/resources/airport_pie.fxml diff --git a/res/session.ser b/res/session.ser index 98ddf26d989515a3be7c9079dd872e162cfc2e7a..43db02659689104c8a17b2834cc2e31637c65adf 100644 GIT binary patch delta 22 dcmcc2c#(0!A%4Cf|IiTE_#nsdco)YIM*v)q2WJ2P delta 24 fcmcb}c$sm+AwdC0&mbR9KiBvm$MAR;#}G#VYFr24 diff --git a/src/main/java/seng202/group9/Controller/SceneCode.java b/src/main/java/seng202/group9/Controller/SceneCode.java index 3b2d15b..6cc916b 100644 --- a/src/main/java/seng202/group9/Controller/SceneCode.java +++ b/src/main/java/seng202/group9/Controller/SceneCode.java @@ -7,7 +7,7 @@ public enum SceneCode { INITIAL(""), AIRLINE_SUMMARY("airline_summary.fxml"), AIRLINE_RAW_DATA("airline_raw_data.fxml"), AIRPORT_SUMMARY("airport_summary.fxml"), AIRPORT_RAW_DATA("airport_raw_data.fxml"), ROUTE_SUMMARY("routes_summary.fxml"), ROUTE_RAW_DATA("route_raw_data.fxml"), FLIGHT_SUMMARY("flight_data_summary.fxml"), - FLIGHT_RAW_DATA("flight_raw_data.fxml"); + FLIGHT_RAW_DATA("flight_raw_data.fxml"), ROUTE_ANALYSER("route_analyser.fxml"); private String filePath; diff --git a/src/main/java/seng202/group9/GUI/RouteAnalyser.java b/src/main/java/seng202/group9/GUI/RouteAnalyser.java index f1e7234..4c8e7be 100644 --- a/src/main/java/seng202/group9/GUI/RouteAnalyser.java +++ b/src/main/java/seng202/group9/GUI/RouteAnalyser.java @@ -22,22 +22,17 @@ import java.util.List; /** * Created by michael on 16/09/2016. */ -public class RouteAnalyser extends MenuController { +public class RouteAnalyser extends Controller { @FXML private BarChart analyserGraph; - App parent; private ArrayList current_routes; - public void setApp(App parent){ - this.parent = parent; - } - - private Dataset Data = null; + private Dataset currentdata = null; private HashMap useddata = new HashMap(); - public void build_graph(Dataset current_data){ - current_routes = current_data.getRoutes(); + public void build_graph(){ + current_routes = currentdata.getRoutes(); datasetup(current_routes); XYChart.Series seriesArivals = new XYChart.Series(); XYChart.Series seriesDeparts = new XYChart.Series(); @@ -78,4 +73,9 @@ public class RouteAnalyser extends MenuController { } } } + + public void load() { + currentdata = getParent().getCurrentDataset(); + build_graph(); + } } diff --git a/src/main/java/seng202/group9/GUI/RouteRDController.java b/src/main/java/seng202/group9/GUI/RouteRDController.java index 9c6fbca..abf2581 100644 --- a/src/main/java/seng202/group9/GUI/RouteRDController.java +++ b/src/main/java/seng202/group9/GUI/RouteRDController.java @@ -2,19 +2,17 @@ package seng202.group9.GUI; import javafx.collections.FXCollections; import javafx.fxml.FXML; -import javafx.scene.control.Alert; -import javafx.scene.control.TableColumn; -import javafx.scene.control.TableView; -import javafx.scene.control.TextField; +import javafx.scene.control.*; import javafx.scene.control.cell.PropertyValueFactory; import seng202.group9.Controller.App; import seng202.group9.Controller.Dataset; +import seng202.group9.Controller.SceneCode; import seng202.group9.Core.Route; /** * Created by Sunguin on 2016/09/14. */ -public class RouteRDController extends MenuController { +public class RouteRDController extends Controller { @FXML private TableView tableViewRouteRD; @@ -40,60 +38,32 @@ public class RouteRDController extends MenuController { @FXML private TextField rAirlineBox; @FXML - private TextField rAirlineIDBox; - @FXML private TextField rSourceBox; @FXML - private TextField rSourceIDBox; - @FXML private TextField rDestBox; @FXML - private TextField rDestIDBox; - @FXML - private TextField rCodeshareBox; + private ComboBox rCodeshareCBox; @FXML private TextField rStopsBox; @FXML private TextField rEquipmentBox; - - App parent; - - public void setApp(App parent){ - this.parent = parent; - } - private Dataset theDataSet = null; - public void loadTables() { - rAirlineCol.setCellValueFactory(new PropertyValueFactory("Airline")); - //rAirlineIDCol.setCellValueFactory(new PropertyValueFactory("AirlineID")); - rSourceCol.setCellValueFactory(new PropertyValueFactory("DepartureAirport")); - //rSourceIDCol.setCellValueFactory(new PropertyValueFactory("SourceID")); - rDestCol.setCellValueFactory(new PropertyValueFactory("ArrivalAirport")); - //rDestIDCol.setCellValueFactory(new PropertyValueFactory("DestID")); - rCodeshareCol.setCellValueFactory(new PropertyValueFactory("Code")); - rStopsCol.setCellValueFactory(new PropertyValueFactory("Stops")); - rEquipmentCol.setCellValueFactory(new PropertyValueFactory("Equipment")); - - theDataSet = this.parent.getCurrentDataset(); - tableViewRouteRD.setItems(FXCollections.observableArrayList(theDataSet.getRoutes())); - } - public void addRouteSingle() { try { theDataSet.addRoute( rAirlineBox.getText(), rSourceBox.getText(), rDestBox.getText(), - rCodeshareBox.getText(), + rCodeshareCBox.getSelectionModel().getSelectedItem().toString(), rStopsBox.getText(), rEquipmentBox.getText() ); rAirlineBox.clear(); rSourceBox.clear(); rDestBox.clear(); - rCodeshareBox.clear(); + rCodeshareCBox.getSelectionModel().clearSelection(); rStopsBox.clear(); rEquipmentBox.clear(); tableViewRouteRD.setItems(FXCollections.observableArrayList(theDataSet.getRoutes())); @@ -105,15 +75,25 @@ public class RouteRDController extends MenuController { alert.showAndWait(); } } + + public void load() { + rAirlineCol.setCellValueFactory(new PropertyValueFactory("AirlineName")); + rAirlineIDCol.setCellValueFactory(new PropertyValueFactory("AirlineID")); + rSourceCol.setCellValueFactory(new PropertyValueFactory("DepartureAirport")); + rSourceIDCol.setCellValueFactory(new PropertyValueFactory("SourceID")); + rDestCol.setCellValueFactory(new PropertyValueFactory("ArrivalAirport")); + rDestIDCol.setCellValueFactory(new PropertyValueFactory("DestID")); + rCodeshareCol.setCellValueFactory(new PropertyValueFactory("Code")); + rStopsCol.setCellValueFactory(new PropertyValueFactory("Stops")); + rEquipmentCol.setCellValueFactory(new PropertyValueFactory("Equipment")); + + theDataSet = getParent().getCurrentDataset(); + tableViewRouteRD.setItems(FXCollections.observableArrayList(theDataSet.getRoutes())); + + rCodeshareCBox.getItems().addAll("Y", ""); + } + public void analyse_Button() { - try { - RouteAnalyser graphController = (RouteAnalyser) - parent.replaceSceneContent("route_analyser.fxml"); - graphController.setApp(parent); - graphController.build_graph(theDataSet); - } - catch (Exception e) { - e.printStackTrace(); - } + replaceSceneContent(SceneCode.ROUTE_ANALYSER); } } diff --git a/src/main/resources/airport_pie.fxml b/src/main/resources/airport_pie.fxml new file mode 100644 index 0000000..85a86f8 --- /dev/null +++ b/src/main/resources/airport_pie.fxml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +