Made graph work with new formatting.

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;
 

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<Route> current_routes;
 
-    public void setApp(App parent){
-        this.parent = parent;
-    }
-
-    private Dataset Data = null;
+    private Dataset currentdata = null;
     private HashMap<String, ArrayList> useddata = new HashMap<String, ArrayList>();
 
-    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();
+    }
 }

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<Route> 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<String> 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<Route, String>("Airline"));
-        //rAirlineIDCol.setCellValueFactory(new PropertyValueFactory<Route, String>("AirlineID"));
-        rSourceCol.setCellValueFactory(new PropertyValueFactory<Route, String>("DepartureAirport"));
-        //rSourceIDCol.setCellValueFactory(new PropertyValueFactory<Route, String>("SourceID"));
-        rDestCol.setCellValueFactory(new PropertyValueFactory<Route, String>("ArrivalAirport"));
-        //rDestIDCol.setCellValueFactory(new PropertyValueFactory<Route, String>("DestID"));
-        rCodeshareCol.setCellValueFactory(new PropertyValueFactory<Route, String>("Code"));
-        rStopsCol.setCellValueFactory(new PropertyValueFactory<Route, String>("Stops"));
-        rEquipmentCol.setCellValueFactory(new PropertyValueFactory<Route, String>("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<Route, String>("AirlineName"));
+        rAirlineIDCol.setCellValueFactory(new PropertyValueFactory<Route, String>("AirlineID"));
+        rSourceCol.setCellValueFactory(new PropertyValueFactory<Route, String>("DepartureAirport"));
+        rSourceIDCol.setCellValueFactory(new PropertyValueFactory<Route, String>("SourceID"));
+        rDestCol.setCellValueFactory(new PropertyValueFactory<Route, String>("ArrivalAirport"));
+        rDestIDCol.setCellValueFactory(new PropertyValueFactory<Route, String>("DestID"));
+        rCodeshareCol.setCellValueFactory(new PropertyValueFactory<Route, String>("Code"));
+        rStopsCol.setCellValueFactory(new PropertyValueFactory<Route, String>("Stops"));
+        rEquipmentCol.setCellValueFactory(new PropertyValueFactory<Route, String>("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);
     }
 }

src/main/resources/airport_pie.fxml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.chart.BarChart?>
+<?import javafx.scene.chart.CategoryAxis?>
+<?import javafx.scene.chart.NumberAxis?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.Pane?>
+<?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.text.Font?>
+
+<GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="568.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.45" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.RouteAnalyser">
+  <columnConstraints>
+    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+  </columnConstraints>
+  <rowConstraints>
+    <RowConstraints maxHeight="457.0" minHeight="10.0" prefHeight="403.0" vgrow="SOMETIMES" />
+      <RowConstraints maxHeight="457.0" minHeight="10.0" prefHeight="403.0" vgrow="SOMETIMES" />
+  </rowConstraints>
+   <children>
+      <Pane prefHeight="510.0" prefWidth="800.0" GridPane.columnSpan="2" GridPane.rowSpan="2">
+         <children>
+            <Label layoutX="14.0" layoutY="14.0" text="Route Analyser">
+               <font>
+                  <Font size="29.0" />
+               </font>
+            </Label>
+            <Pane layoutX="16.0" layoutY="53.0" prefHeight="403.0" prefWidth="765.0">
+               <children>
+                  <BarChart fx:id="analyserGraph" prefHeight="403.0" prefWidth="740.0" title="Routes Arriving at or Departing from each Airport">
+                    <xAxis>
+                      <CategoryAxis label="Airports" side="BOTTOM" />
+                    </xAxis>
+                    <yAxis>
+                      <NumberAxis label="Number" side="LEFT" />
+                    </yAxis>
+                  </BarChart>
+               </children>
+            </Pane>
+         </children>
+      </Pane>
+   </children>
+</GridPane>