From c2ac9410aa20be5af2587cbaf183beec098a9c62 Mon Sep 17 00:00:00 2001
From: Michael <mrw106@uclive.ac.nz>
Date: Fri, 23 Sep 2016 14:34:24 +1200
Subject: [PATCH 01/11] Built fxml files used to control graph creation
 supporting the new customizable graph builders.

---
 src/main/resources/analyser_main_page.fxml | 68 ++++++++++++++++++++
 src/main/resources/bar_graph_chooser.fxml  | 73 ++++++++++++++++++++++
 src/main/resources/pie_graph_chooser.fxml  | 73 ++++++++++++++++++++++
 3 files changed, 214 insertions(+)
 create mode 100644 src/main/resources/analyser_main_page.fxml
 create mode 100644 src/main/resources/bar_graph_chooser.fxml
 create mode 100644 src/main/resources/pie_graph_chooser.fxml

diff --git a/src/main/resources/analyser_main_page.fxml b/src/main/resources/analyser_main_page.fxml
new file mode 100644
index 0000000..4061d65
--- /dev/null
+++ b/src/main/resources/analyser_main_page.fxml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import java.lang.*?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.*?>
+<?import javafx.scene.web.*?>
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ScrollPane?>
+<?import javafx.scene.control.TableColumn?>
+<?import javafx.scene.control.TableView?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Pane?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
+<?import javafx.scene.text.Text?>
+<?import javafx.scene.web.WebView?>
+
+<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.AnalyserController">
+   <children>
+      <ScrollPane prefHeight="800.0" prefWidth="800.0">
+         <content>
+            <AnchorPane prefHeight="800.0" prefWidth="800.0">
+               <children>
+                  <HBox alignment="CENTER" prefHeight="300.0" prefWidth="583.0" AnchorPane.topAnchor="25.0">
+                     <children>
+                        <AnchorPane prefHeight="300.0" prefWidth="330.0">
+                           <children>
+                              <Pane layoutY="-6.0" prefHeight="60.0" prefWidth="330.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                                 <children>
+                                    <Text layoutX="21.0" layoutY="40.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Analyse Data">
+                                       <font>
+                                          <Font size="29.0" />
+                                       </font>
+                                    </Text>
+                                 </children>
+                              </Pane>
+                              <Button layoutX="165.0" layoutY="125.0" mnemonicParsing="false" onAction="#barGraphButton" text="Bar Graph" />
+                           </children>
+                        </AnchorPane>
+                        <AnchorPane prefHeight="300.0" prefWidth="253.0">
+                           <children>
+                              <Pane layoutY="200.0" prefHeight="100.0" prefWidth="253.0">
+                                 <padding>
+                                    <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+                                 </padding>
+                              </Pane>
+                              <Pane prefHeight="200.0" prefWidth="253.0">
+                                 <padding>
+                                    <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+                                 </padding>
+                                 <children>
+                                    <Button layoutX="191.0" layoutY="124.0" mnemonicParsing="false" onAction="#pieGraphButton" text="Pie Graph" />
+                                 </children>
+                              </Pane>
+                           </children>
+                        </AnchorPane>
+                     </children>
+                  </HBox>
+               </children>
+            </AnchorPane>
+         </content>
+      </ScrollPane>
+   </children>
+</VBox>
diff --git a/src/main/resources/bar_graph_chooser.fxml b/src/main/resources/bar_graph_chooser.fxml
new file mode 100644
index 0000000..fda0fee
--- /dev/null
+++ b/src/main/resources/bar_graph_chooser.fxml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import java.lang.*?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.*?>
+<?import javafx.scene.web.*?>
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ScrollPane?>
+<?import javafx.scene.control.TableColumn?>
+<?import javafx.scene.control.TableView?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Pane?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
+<?import javafx.scene.text.Text?>
+<?import javafx.scene.web.WebView?>
+
+<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.BarChooserController">
+   <children>
+      <ScrollPane prefHeight="800.0" prefWidth="800.0">
+         <content>
+            <AnchorPane prefHeight="800.0" prefWidth="800.0">
+               <children>
+                  <HBox alignment="CENTER" prefHeight="300.0" prefWidth="583.0" AnchorPane.topAnchor="25.0">
+                     <children>
+                        <AnchorPane prefHeight="300.0" prefWidth="330.0">
+                           <children>
+                              <Pane layoutY="-6.0" prefHeight="60.0" prefWidth="330.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                                 <children>
+                                    <Text layoutX="21.0" layoutY="40.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Bar Graph">
+                                       <font>
+                                          <Font size="29.0" />
+                                       </font>
+                                    </Text>
+                                 </children>
+                              </Pane>
+                              <ListView fx:id="graph_against" layoutX="116.0" layoutY="150.0" prefHeight="200.0" prefWidth="200.0" />
+                           </children>
+                        </AnchorPane>
+                        <AnchorPane prefHeight="300.0" prefWidth="253.0">
+                           <children>
+                              <Pane layoutY="200.0" prefHeight="100.0" prefWidth="253.0">
+                                 <padding>
+                                    <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+                                 </padding>
+                                 <children>
+                                    <ListView fx:id="graph_options" layoutX="104.0" layoutY="-50.0" prefHeight="200.0" prefWidth="200.0" />
+                                 </children>
+                              </Pane>
+                              <Pane prefHeight="200.0" prefWidth="253.0">
+                                 <padding>
+                                    <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+                                 </padding>
+                                 <children>
+                                    <ChoiceBox fx:id="datatypechooser" layoutY="14.0" prefWidth="150.0" />
+                                 </children>
+                              </Pane>
+                           </children>
+                        </AnchorPane>
+                     </children>
+                  </HBox>
+                  <Button layoutX="244.0" layoutY="400.0" mnemonicParsing="false" onAction="#buildGraph" text="Build Graph" />
+                  <Button layoutX="400.0" layoutY="400.0" mnemonicParsing="false" onAction="#returnToSelection" text="Change Graph Type" />
+               </children>
+            </AnchorPane>
+         </content>
+      </ScrollPane>
+   </children>
+</VBox>
diff --git a/src/main/resources/pie_graph_chooser.fxml b/src/main/resources/pie_graph_chooser.fxml
new file mode 100644
index 0000000..f0834d6
--- /dev/null
+++ b/src/main/resources/pie_graph_chooser.fxml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import java.lang.*?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.*?>
+<?import javafx.scene.web.*?>
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ScrollPane?>
+<?import javafx.scene.control.TableColumn?>
+<?import javafx.scene.control.TableView?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Pane?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
+<?import javafx.scene.text.Text?>
+<?import javafx.scene.web.WebView?>
+
+<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.PieChooserController">
+   <children>
+      <ScrollPane prefHeight="800.0" prefWidth="800.0">
+         <content>
+            <AnchorPane prefHeight="800.0" prefWidth="800.0">
+               <children>
+                  <HBox alignment="CENTER" prefHeight="300.0" prefWidth="583.0" AnchorPane.topAnchor="25.0">
+                     <children>
+                        <AnchorPane prefHeight="300.0" prefWidth="330.0">
+                           <children>
+                              <Pane layoutY="-6.0" prefHeight="60.0" prefWidth="330.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                                 <children>
+                                    <Text layoutX="21.0" layoutY="40.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Pie Graph">
+                                       <font>
+                                          <Font size="29.0" />
+                                       </font>
+                                    </Text>
+                                 </children>
+                              </Pane>
+                              <ListView fx:id="graph_against" layoutX="116.0" layoutY="150.0" prefHeight="200.0" prefWidth="200.0" />
+                           </children>
+                        </AnchorPane>
+                        <AnchorPane prefHeight="300.0" prefWidth="253.0">
+                           <children>
+                              <Pane layoutY="200.0" prefHeight="100.0" prefWidth="253.0">
+                                 <padding>
+                                    <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+                                 </padding>
+                                 <children>
+                                    <ListView fx:id="graph_options" layoutX="104.0" layoutY="-50.0" prefHeight="200.0" prefWidth="200.0" />
+                                 </children>
+                              </Pane>
+                              <Pane prefHeight="200.0" prefWidth="253.0">
+                                 <padding>
+                                    <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+                                 </padding>
+                                 <children>
+                                    <ChoiceBox fx:id="datatypechooser" layoutY="14.0" prefWidth="150.0" />
+                                 </children>
+                              </Pane>
+                           </children>
+                        </AnchorPane>
+                     </children>
+                  </HBox>
+                  <Button layoutX="244.0" layoutY="400.0" mnemonicParsing="false" onAction="#buildGraph" text="Build Graph" />
+                  <Button layoutX="400.0" layoutY="400.0" mnemonicParsing="false" onAction="#returnToSelection" text="Change Graph Type" />
+               </children>
+            </AnchorPane>
+         </content>
+      </ScrollPane>
+   </children>
+</VBox>

From d8057352f0ad8ac9cf21282b6831610d75d04b1a Mon Sep 17 00:00:00 2001
From: Michael Wilson <mrw106@uclive.ac.nz>
Date: Sat, 24 Sep 2016 11:38:18 +1200
Subject: [PATCH 02/11] Added controllers for the chart option chooser menus
 and linked it to the rest of the app.

---
 .../seng202/group9/Controller/SceneCode.java  |  3 +-
 .../group9/GUI/AnalyserController.java        | 19 ++++++
 .../group9/GUI/BarChooserController.java      | 66 +++++++++++++++++++
 .../seng202/group9/GUI/MenuController.java    |  2 +
 .../group9/GUI/PieChooserController.java      | 62 +++++++++++++++++
 .../seng202/group9/GUI/RouteAnalyser.java     |  1 -
 src/main/resources/bar_graph_chooser.fxml     | 13 +---
 src/main/resources/menu.fxml                  |  2 +-
 src/main/resources/pie_graph_chooser.fxml     | 20 ++----
 9 files changed, 161 insertions(+), 27 deletions(-)
 create mode 100644 src/main/java/seng202/group9/GUI/AnalyserController.java
 create mode 100644 src/main/java/seng202/group9/GUI/BarChooserController.java
 create mode 100644 src/main/java/seng202/group9/GUI/PieChooserController.java

diff --git a/src/main/java/seng202/group9/Controller/SceneCode.java b/src/main/java/seng202/group9/Controller/SceneCode.java
index de69752..af9b4b9 100644
--- a/src/main/java/seng202/group9/Controller/SceneCode.java
+++ b/src/main/java/seng202/group9/Controller/SceneCode.java
@@ -9,7 +9,8 @@ public enum SceneCode {
     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"), AIRPORT_ANALYSER("airport_analyser.fxml"), ROUTE_ANALYSER("route_analyser.fxml"),
-    AIRPORT_DIST_CALC("airport_dist_calc.fxml");
+    AIRPORT_DIST_CALC("airport_dist_calc.fxml"), ANALYSER_TAB("analyser_main_page.fxml"),
+    BAR_GRAPH_CHOOSER("bar_graph_chooser.fxml"), PIE_GRAPH_CHOOSER("pie_graph_chooser.fxml");
 
     private String filePath;
 
diff --git a/src/main/java/seng202/group9/GUI/AnalyserController.java b/src/main/java/seng202/group9/GUI/AnalyserController.java
new file mode 100644
index 0000000..671547c
--- /dev/null
+++ b/src/main/java/seng202/group9/GUI/AnalyserController.java
@@ -0,0 +1,19 @@
+package seng202.group9.GUI;
+
+import seng202.group9.Controller.SceneCode;
+
+/**
+ * Created by michael on 24/09/2016.
+ */
+public class AnalyserController extends Controller{
+
+    public void barGraphButton(){
+        replaceSceneContent(SceneCode.BAR_GRAPH_CHOOSER);
+    }
+
+    public void pieGraphButton(){
+        replaceSceneContent(SceneCode.PIE_GRAPH_CHOOSER);
+    }
+
+    public void load() {}
+}
diff --git a/src/main/java/seng202/group9/GUI/BarChooserController.java b/src/main/java/seng202/group9/GUI/BarChooserController.java
new file mode 100644
index 0000000..8d9085b
--- /dev/null
+++ b/src/main/java/seng202/group9/GUI/BarChooserController.java
@@ -0,0 +1,66 @@
+package seng202.group9.GUI;
+
+import javafx.beans.Observable;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.fxml.FXML;
+import javafx.scene.control.ChoiceBox;
+import javafx.scene.control.ListView;
+import javafx.scene.control.SelectionMode;
+import seng202.group9.Controller.SceneCode;
+
+import java.util.ArrayList;
+
+/**
+ * Created by michael on 24/09/2016.
+ */
+public class BarChooserController extends Controller{
+
+    @FXML
+    ChoiceBox datatypechooser;
+    @FXML
+    ListView graph_against;
+    @FXML
+    ListView graph_options;
+
+    ObservableList airportOptions = FXCollections.observableArrayList("ID", "Name", "ICAO", "IATA FFA", "Altitude",
+            "Latitude", "Longitude", "City", "Country");
+
+    ObservableList airlineOptions = FXCollections.observableArrayList("ID", "Name", "ICAO", "IATA", "Alias",
+            "Call Sign", "Active", "Country");
+
+    ObservableList routeOptions = FXCollections.observableArrayList("ID", "Stops", "Codeshare", "Equipment", "Airline",
+            "Departure Airport", "Arival airport");
+
+    ArrayList<ObservableList> allOptions = new ArrayList<ObservableList>();
+
+    public void buildGraph() {
+
+    }
+
+    public void returnToSelection(){replaceSceneContent(SceneCode.ANALYSER_TAB);}
+
+    public void changeTables(){
+        int temp = datatypechooser.getSelectionModel().getSelectedIndex();
+        graph_against.setItems(allOptions.get(temp));
+        graph_options.setItems(allOptions.get(temp));
+    }
+
+    public void load(){
+        datatypechooser.setItems(FXCollections.observableArrayList("Airports","Airlines","Routes"));
+        datatypechooser.getSelectionModel().selectFirst();
+        datatypechooser.getSelectionModel().selectedIndexProperty().addListener(new ChangeListener<Number>() {
+            public void changed(ObservableValue<? extends Number> observable, Number oldValue, Number newValue) {
+                changeTables();
+            }
+        });
+        graph_against.setItems(airportOptions);
+        graph_options.setItems(airportOptions);
+        graph_options.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
+        allOptions.add(airportOptions);
+        allOptions.add(airlineOptions);
+        allOptions.add(routeOptions);
+    }
+}
diff --git a/src/main/java/seng202/group9/GUI/MenuController.java b/src/main/java/seng202/group9/GUI/MenuController.java
index f530c9e..3dd1df1 100644
--- a/src/main/java/seng202/group9/GUI/MenuController.java
+++ b/src/main/java/seng202/group9/GUI/MenuController.java
@@ -60,6 +60,8 @@ public class MenuController extends Controller{
 		replaceSceneContent(SceneCode.ROUTE_SUMMARY);
 	}
 
+	public void viewAnalyserMain() { replaceSceneContent(SceneCode.ANALYSER_TAB);}
+
 	/**
 	 * Load Flight Summary Function.
 	 */
diff --git a/src/main/java/seng202/group9/GUI/PieChooserController.java b/src/main/java/seng202/group9/GUI/PieChooserController.java
new file mode 100644
index 0000000..7cdcaf6
--- /dev/null
+++ b/src/main/java/seng202/group9/GUI/PieChooserController.java
@@ -0,0 +1,62 @@
+package seng202.group9.GUI;
+
+import javafx.beans.Observable;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.fxml.FXML;
+import javafx.scene.control.ChoiceBox;
+import javafx.scene.control.ListView;
+import javafx.scene.control.SelectionMode;
+import seng202.group9.Controller.SceneCode;
+
+import java.util.ArrayList;
+
+/**
+ * Created by michael on 24/09/2016.
+ */
+public class PieChooserController extends Controller{
+
+    @FXML
+    ChoiceBox datatypechooser;
+    @FXML
+    ListView graph_options;
+
+    ObservableList airportOptions = FXCollections.observableArrayList("ID", "Name", "ICAO", "IATA FFA", "Altitude",
+            "Latitude", "Longitude", "City", "Country");
+
+    ObservableList airlineOptions = FXCollections.observableArrayList("ID", "Name", "ICAO", "IATA", "Alias",
+            "Call Sign", "Active", "Country");
+
+    ObservableList routeOptions = FXCollections.observableArrayList("ID", "Stops", "Codeshare", "Equipment", "Airline",
+            "Departure Airport", "Arival airport");
+
+    ArrayList<ObservableList> allOptions = new ArrayList<ObservableList>();
+
+    public void buildGraph() {
+
+    }
+
+    public void returnToSelection(){replaceSceneContent(SceneCode.ANALYSER_TAB);}
+
+    public void changeTables(){
+        int temp = datatypechooser.getSelectionModel().getSelectedIndex();
+        graph_options.setItems(allOptions.get(temp));
+    }
+
+    public void load(){
+        datatypechooser.setItems(FXCollections.observableArrayList("Airports","Airlines","Routes"));
+        datatypechooser.getSelectionModel().selectFirst();
+        datatypechooser.getSelectionModel().selectedIndexProperty().addListener(new ChangeListener<Number>() {
+            public void changed(ObservableValue<? extends Number> observable, Number oldValue, Number newValue) {
+                changeTables();
+            }
+        });
+
+        graph_options.setItems(airportOptions);
+        allOptions.add(airportOptions);
+        allOptions.add(airlineOptions);
+        allOptions.add(routeOptions);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/seng202/group9/GUI/RouteAnalyser.java b/src/main/java/seng202/group9/GUI/RouteAnalyser.java
index 241768b..9a07a06 100644
--- a/src/main/java/seng202/group9/GUI/RouteAnalyser.java
+++ b/src/main/java/seng202/group9/GUI/RouteAnalyser.java
@@ -38,7 +38,6 @@ public class RouteAnalyser extends Controller {
         XYChart.Series seriesDeparts = new XYChart.Series();
         seriesArivals.setName("Arriving routes");
         seriesDeparts.setName("Departs routes");
-        System.out.println(useddata.keySet().size());
         for (String airport : useddata.keySet()){
             ArrayList<Integer> temp = useddata.get(airport);
             seriesArivals.getData().add(new XYChart.Data(airport,temp.get(0)));
diff --git a/src/main/resources/bar_graph_chooser.fxml b/src/main/resources/bar_graph_chooser.fxml
index fda0fee..1ba723d 100644
--- a/src/main/resources/bar_graph_chooser.fxml
+++ b/src/main/resources/bar_graph_chooser.fxml
@@ -1,25 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
-<?import javafx.geometry.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-<?import javafx.scene.text.*?>
-<?import javafx.scene.web.*?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ChoiceBox?>
+<?import javafx.scene.control.ListView?>
 <?import javafx.scene.control.ScrollPane?>
-<?import javafx.scene.control.TableColumn?>
-<?import javafx.scene.control.TableView?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 <?import javafx.scene.text.Text?>
-<?import javafx.scene.web.WebView?>
 
-<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.BarChooserController">
+<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.45" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.BarChooserController">
    <children>
       <ScrollPane prefHeight="800.0" prefWidth="800.0">
          <content>
diff --git a/src/main/resources/menu.fxml b/src/main/resources/menu.fxml
index e6d61d5..f06aa5e 100644
--- a/src/main/resources/menu.fxml
+++ b/src/main/resources/menu.fxml
@@ -3,7 +3,6 @@
 <?import javafx.scene.control.Menu?>
 <?import javafx.scene.control.MenuBar?>
 <?import javafx.scene.control.MenuItem?>
-<?import javafx.scene.control.SeparatorMenuItem?>
 <?import javafx.scene.layout.VBox?>
 
 <VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.45" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.MenuController">
@@ -47,6 +46,7 @@
                </items></Menu>
             <Menu mnemonicParsing="false" text="Analysis">
                <items>
+                  <MenuItem mnemonicParsing="false" onAction="#viewAnalyserMain" text="Graphs" />
                   <MenuItem mnemonicParsing="false" onAction="#veiwDistCalc" text="Calculate distance between Airports" />
                </items></Menu>
         </menus>
diff --git a/src/main/resources/pie_graph_chooser.fxml b/src/main/resources/pie_graph_chooser.fxml
index f0834d6..ff35807 100644
--- a/src/main/resources/pie_graph_chooser.fxml
+++ b/src/main/resources/pie_graph_chooser.fxml
@@ -1,25 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
-<?import javafx.geometry.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-<?import javafx.scene.text.*?>
-<?import javafx.scene.web.*?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ChoiceBox?>
+<?import javafx.scene.control.ListView?>
 <?import javafx.scene.control.ScrollPane?>
-<?import javafx.scene.control.TableColumn?>
-<?import javafx.scene.control.TableView?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 <?import javafx.scene.text.Text?>
-<?import javafx.scene.web.WebView?>
 
-<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.PieChooserController">
+<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.45" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.PieChooserController">
    <children>
       <ScrollPane prefHeight="800.0" prefWidth="800.0">
          <content>
@@ -38,7 +31,6 @@
                                     </Text>
                                  </children>
                               </Pane>
-                              <ListView fx:id="graph_against" layoutX="116.0" layoutY="150.0" prefHeight="200.0" prefWidth="200.0" />
                            </children>
                         </AnchorPane>
                         <AnchorPane prefHeight="300.0" prefWidth="253.0">
@@ -48,7 +40,7 @@
                                     <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
                                  </padding>
                                  <children>
-                                    <ListView fx:id="graph_options" layoutX="104.0" layoutY="-50.0" prefHeight="200.0" prefWidth="200.0" />
+                                    <ListView fx:id="graph_options" layoutX="-35.0" layoutY="-50.0" prefHeight="200.0" prefWidth="200.0" />
                                  </children>
                               </Pane>
                               <Pane prefHeight="200.0" prefWidth="253.0">
@@ -63,8 +55,8 @@
                         </AnchorPane>
                      </children>
                   </HBox>
-                  <Button layoutX="244.0" layoutY="400.0" mnemonicParsing="false" onAction="#buildGraph" text="Build Graph" />
-                  <Button layoutX="400.0" layoutY="400.0" mnemonicParsing="false" onAction="#returnToSelection" text="Change Graph Type" />
+                  <Button layoutX="234.0" layoutY="413.0" mnemonicParsing="false" onAction="#buildGraph" text="Build Graph" />
+                  <Button layoutX="462.0" layoutY="413.0" mnemonicParsing="false" onAction="#returnToSelection" text="Change Graph Type" />
                </children>
             </AnchorPane>
          </content>

From f6696e1859d8ef4f7fd41b18dc9a3370c497914b Mon Sep 17 00:00:00 2001
From: Michael <mrw106@uclive.ac.nz>
Date: Sat, 24 Sep 2016 15:28:38 +1200
Subject: [PATCH 03/11] Added backend controllers which pass the selected
 options to their respected graphs when creating the graph.

---
 .../seng202/group9/Controller/SceneCode.java  |  2 +-
 .../seng202/group9/Controller/Session.java    | 32 ++++++++++++++++++-
 .../group9/GUI/BarChooserController.java      | 15 +++++++--
 .../group9/GUI/PieChooserController.java      | 16 ++++++++--
 .../seng202/group9/GUI/RouteAnalyser.java     |  1 +
 src/main/resources/bar_graph_chooser.fxml     |  8 ++++-
 src/main/resources/pie_graph_chooser.fxml     | 12 +++++--
 7 files changed, 76 insertions(+), 10 deletions(-)

diff --git a/src/main/java/seng202/group9/Controller/SceneCode.java b/src/main/java/seng202/group9/Controller/SceneCode.java
index 3493d78..a8c3d17 100644
--- a/src/main/java/seng202/group9/Controller/SceneCode.java
+++ b/src/main/java/seng202/group9/Controller/SceneCode.java
@@ -11,7 +11,7 @@ public enum SceneCode {
     FLIGHT_RAW_DATA("flight_raw_data.fxml"), AIRPORT_ANALYSER("airport_analyser.fxml"), ROUTE_ANALYSER("route_analyser.fxml"),
     AIRPORT_DIST_CALC("airport_dist_calc.fxml"), AIRLINE_ADD("airline_add_form.fxml"), AIRLINE_FILTER("airline_filter_form.fxml"),
     AIRPORT_ADD("airport_add_form.fxml"), AIRPORT_FILTER("airport_filter_form.fxml"), ROUTE_ADD("route_add_form.fxml"),
-    ROUTE_FILTER("route_filter_form.fxml"),AIRPORT_DIST_CALC("airport_dist_calc.fxml"), ANALYSER_TAB("analyser_main_page.fxml"),
+    ROUTE_FILTER("route_filter_form.fxml"),ANALYSER_TAB("analyser_main_page.fxml"),
     BAR_GRAPH_CHOOSER("bar_graph_chooser.fxml"), PIE_GRAPH_CHOOSER("pie_graph_chooser.fxml");
 
     private String filePath;
diff --git a/src/main/java/seng202/group9/Controller/Session.java b/src/main/java/seng202/group9/Controller/Session.java
index c63461d..100fc9d 100644
--- a/src/main/java/seng202/group9/Controller/Session.java
+++ b/src/main/java/seng202/group9/Controller/Session.java
@@ -1,9 +1,10 @@
 package seng202.group9.Controller;
 
-import javafx.collections.ObservableList;
+
 import seng202.group9.Core.Airline;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.HashMap;
 
 /**
@@ -11,10 +12,38 @@ import java.util.HashMap;
  * Users last session state is store here.
  */
 public class Session implements Serializable {
+
     private SceneCode sceneDisplayed;
     private HashMap<Integer, String> filteredAirlines;
     private HashMap<Integer, String> filteredAirports;
     private HashMap<Integer, String> filteredRoutes;
+    private String selectedgraphagainst;
+    private ArrayList<String> selectedgraphoptions;
+    private Boolean usefilter;
+
+    public String getSelectedgraphagainst() {
+        return selectedgraphagainst;
+    }
+
+    public void setSelectedgraphagainst(String selectedgraphagainst) {
+        this.selectedgraphagainst = selectedgraphagainst;
+    }
+
+    public ArrayList<String> getSelectedgraphoptions() {
+        return selectedgraphoptions;
+    }
+
+    public void setSelectedgraphoptions(ArrayList<String> selectedgraphoptions) {
+        this.selectedgraphoptions = selectedgraphoptions;
+    }
+
+    public Boolean getUsefilter() {
+        return usefilter;
+    }
+
+    public void setUsefilter(Boolean usefilter) {
+        this.usefilter = usefilter;
+    }
 
     /**
      * Constructor for a new session
@@ -71,4 +100,5 @@ public class Session implements Serializable {
     public HashMap<Integer, String> getFilteredRoutes() {
         return filteredRoutes;
     }
+
 }
diff --git a/src/main/java/seng202/group9/GUI/BarChooserController.java b/src/main/java/seng202/group9/GUI/BarChooserController.java
index 8d9085b..cb5f1d0 100644
--- a/src/main/java/seng202/group9/GUI/BarChooserController.java
+++ b/src/main/java/seng202/group9/GUI/BarChooserController.java
@@ -6,10 +6,12 @@ import javafx.beans.value.ObservableValue;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
+import javafx.scene.control.CheckBox;
 import javafx.scene.control.ChoiceBox;
 import javafx.scene.control.ListView;
 import javafx.scene.control.SelectionMode;
 import seng202.group9.Controller.SceneCode;
+import seng202.group9.Controller.Session;
 
 import java.util.ArrayList;
 
@@ -24,6 +26,8 @@ public class BarChooserController extends Controller{
     ListView graph_against;
     @FXML
     ListView graph_options;
+    @FXML
+    CheckBox usefilter;
 
     ObservableList airportOptions = FXCollections.observableArrayList("ID", "Name", "ICAO", "IATA FFA", "Altitude",
             "Latitude", "Longitude", "City", "Country");
@@ -37,10 +41,17 @@ public class BarChooserController extends Controller{
     ArrayList<ObservableList> allOptions = new ArrayList<ObservableList>();
 
     public void buildGraph() {
-
+        Session currentsession = this.getParent().getSession();
+        ArrayList<String> temp = new ArrayList<String>();
+        temp.addAll(graph_options.getSelectionModel().getSelectedItems());
+        currentsession.setSelectedgraphoptions(temp);
+        currentsession.setUsefilter(usefilter.isSelected());
+        currentsession.setSelectedgraphagainst(graph_options.getSelectionModel().getSelectedItem().toString());
+        currentsession.setUsefilter(usefilter.isSelected());
+        replaceSceneContent(SceneCode.ROUTE_ANALYSER);
     }
 
-    public void returnToSelection(){replaceSceneContent(SceneCode.ANALYSER_TAB);}
+    public void returnToSelection(){replaceSceneContent(SceneCode.PIE_GRAPH_CHOOSER);}
 
     public void changeTables(){
         int temp = datatypechooser.getSelectionModel().getSelectedIndex();
diff --git a/src/main/java/seng202/group9/GUI/PieChooserController.java b/src/main/java/seng202/group9/GUI/PieChooserController.java
index 7cdcaf6..88b0c4d 100644
--- a/src/main/java/seng202/group9/GUI/PieChooserController.java
+++ b/src/main/java/seng202/group9/GUI/PieChooserController.java
@@ -6,10 +6,12 @@ import javafx.beans.value.ObservableValue;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
+import javafx.scene.control.CheckBox;
 import javafx.scene.control.ChoiceBox;
 import javafx.scene.control.ListView;
 import javafx.scene.control.SelectionMode;
 import seng202.group9.Controller.SceneCode;
+import seng202.group9.Controller.Session;
 
 import java.util.ArrayList;
 
@@ -22,6 +24,9 @@ public class PieChooserController extends Controller{
     ChoiceBox datatypechooser;
     @FXML
     ListView graph_options;
+    @FXML
+    CheckBox usefilter;
+
 
     ObservableList airportOptions = FXCollections.observableArrayList("ID", "Name", "ICAO", "IATA FFA", "Altitude",
             "Latitude", "Longitude", "City", "Country");
@@ -34,11 +39,16 @@ public class PieChooserController extends Controller{
 
     ArrayList<ObservableList> allOptions = new ArrayList<ObservableList>();
 
-    public void buildGraph() {
 
-    }
+    public void toBarGraphChooser(){replaceSceneContent(SceneCode.BAR_GRAPH_CHOOSER);}
 
-    public void returnToSelection(){replaceSceneContent(SceneCode.ANALYSER_TAB);}
+    public void buildGraph() {
+        Session currentsession = this.getParent().getSession();
+        ArrayList<String> temp = new ArrayList<String>();
+        currentsession.setSelectedgraphagainst(graph_options.getSelectionModel().getSelectedItem().toString());
+        currentsession.setUsefilter(usefilter.isSelected());
+        replaceSceneContent(SceneCode.AIRPORT_ANALYSER);
+    }
 
     public void changeTables(){
         int temp = datatypechooser.getSelectionModel().getSelectedIndex();
diff --git a/src/main/java/seng202/group9/GUI/RouteAnalyser.java b/src/main/java/seng202/group9/GUI/RouteAnalyser.java
index 9a07a06..2d66c79 100644
--- a/src/main/java/seng202/group9/GUI/RouteAnalyser.java
+++ b/src/main/java/seng202/group9/GUI/RouteAnalyser.java
@@ -43,6 +43,7 @@ public class RouteAnalyser extends Controller {
             seriesArivals.getData().add(new XYChart.Data(airport,temp.get(0)));
             seriesDeparts.getData().add(new XYChart.Data(airport,temp.get(1)));
         }
+        System.out.println(useddata.keySet().size());
         //Gives the formatted data to the graph.
         analyserGraph.getData().addAll(seriesArivals,seriesDeparts);
     }
diff --git a/src/main/resources/bar_graph_chooser.fxml b/src/main/resources/bar_graph_chooser.fxml
index 1ba723d..f7581f5 100644
--- a/src/main/resources/bar_graph_chooser.fxml
+++ b/src/main/resources/bar_graph_chooser.fxml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import java.lang.*?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.*?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ChoiceBox?>
@@ -12,7 +17,7 @@
 <?import javafx.scene.text.Font?>
 <?import javafx.scene.text.Text?>
 
-<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.45" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.BarChooserController">
+<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.BarChooserController">
    <children>
       <ScrollPane prefHeight="800.0" prefWidth="800.0">
          <content>
@@ -58,6 +63,7 @@
                   </HBox>
                   <Button layoutX="244.0" layoutY="400.0" mnemonicParsing="false" onAction="#buildGraph" text="Build Graph" />
                   <Button layoutX="400.0" layoutY="400.0" mnemonicParsing="false" onAction="#returnToSelection" text="Change Graph Type" />
+                  <CheckBox fx:id="usefilter" layoutX="277.0" layoutY="449.0" mnemonicParsing="false" text="Use filters from Raw Data or here." />
                </children>
             </AnchorPane>
          </content>
diff --git a/src/main/resources/pie_graph_chooser.fxml b/src/main/resources/pie_graph_chooser.fxml
index ff35807..7f57044 100644
--- a/src/main/resources/pie_graph_chooser.fxml
+++ b/src/main/resources/pie_graph_chooser.fxml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import java.lang.*?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.*?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ChoiceBox?>
@@ -12,7 +17,7 @@
 <?import javafx.scene.text.Font?>
 <?import javafx.scene.text.Text?>
 
-<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.45" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.PieChooserController">
+<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.PieChooserController">
    <children>
       <ScrollPane prefHeight="800.0" prefWidth="800.0">
          <content>
@@ -49,6 +54,8 @@
                                  </padding>
                                  <children>
                                     <ChoiceBox fx:id="datatypechooser" layoutY="14.0" prefWidth="150.0" />
+                                    <Label layoutX="-6.0" layoutY="120.0" text="Values to be Graphed." />
+                                    <Label layoutX="15.0" layoutY="-7.0" text="Data Type Used" />
                                  </children>
                               </Pane>
                            </children>
@@ -56,7 +63,8 @@
                      </children>
                   </HBox>
                   <Button layoutX="234.0" layoutY="413.0" mnemonicParsing="false" onAction="#buildGraph" text="Build Graph" />
-                  <Button layoutX="462.0" layoutY="413.0" mnemonicParsing="false" onAction="#returnToSelection" text="Change Graph Type" />
+                  <Button layoutX="462.0" layoutY="413.0" mnemonicParsing="false" onAction="#toBarGraphChooser" text="Change Graph Type" />
+                  <CheckBox fx:id="usefilter" layoutX="356.0" layoutY="464.0" mnemonicParsing="false" text="Use filters from Raw Data" />
                </children>
             </AnchorPane>
          </content>

From 810cd0a94fdddc90f8cdfa44a013cc0187df13f4 Mon Sep 17 00:00:00 2001
From: Michael <mrw106@uclive.ac.nz>
Date: Sat, 24 Sep 2016 15:39:15 +1200
Subject: [PATCH 04/11] Minor bug fix.

---
 src/main/java/seng202/group9/GUI/BarChooserController.java | 2 ++
 src/main/java/seng202/group9/GUI/PieChooserController.java | 1 +
 2 files changed, 3 insertions(+)

diff --git a/src/main/java/seng202/group9/GUI/BarChooserController.java b/src/main/java/seng202/group9/GUI/BarChooserController.java
index cb5f1d0..362d994 100644
--- a/src/main/java/seng202/group9/GUI/BarChooserController.java
+++ b/src/main/java/seng202/group9/GUI/BarChooserController.java
@@ -68,8 +68,10 @@ public class BarChooserController extends Controller{
             }
         });
         graph_against.setItems(airportOptions);
+        graph_against.getSelectionModel().selectFirst();
         graph_options.setItems(airportOptions);
         graph_options.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
+        graph_options.getSelectionModel().selectFirst();
         allOptions.add(airportOptions);
         allOptions.add(airlineOptions);
         allOptions.add(routeOptions);
diff --git a/src/main/java/seng202/group9/GUI/PieChooserController.java b/src/main/java/seng202/group9/GUI/PieChooserController.java
index 88b0c4d..2293ffc 100644
--- a/src/main/java/seng202/group9/GUI/PieChooserController.java
+++ b/src/main/java/seng202/group9/GUI/PieChooserController.java
@@ -65,6 +65,7 @@ public class PieChooserController extends Controller{
         });
 
         graph_options.setItems(airportOptions);
+        graph_options.getSelectionModel().selectFirst();
         allOptions.add(airportOptions);
         allOptions.add(airlineOptions);
         allOptions.add(routeOptions);

From 8ac6606b76a6cf52de5732fe0716d02c87d7b24a Mon Sep 17 00:00:00 2001
From: Michael Wilson <mrw106@uclive.ac.nz>
Date: Sat, 1 Oct 2016 20:07:13 +1300
Subject: [PATCH 05/11] Pie graph fully hooked up.

---
 .../seng202/group9/Controller/Session.java    |   9 +
 .../seng202/group9/GUI/AirportAnalyser.java   |  78 --------
 .../group9/GUI/AirportRDController.java       |   3 +-
 .../group9/GUI/PieChooserController.java      |  11 +-
 .../group9/GUI/PieGraphController.java        | 176 ++++++++++++++++++
 src/main/resources/airport_analyser.fxml      |   2 +-
 6 files changed, 192 insertions(+), 87 deletions(-)
 delete mode 100644 src/main/java/seng202/group9/GUI/AirportAnalyser.java
 create mode 100644 src/main/java/seng202/group9/GUI/PieGraphController.java

diff --git a/src/main/java/seng202/group9/Controller/Session.java b/src/main/java/seng202/group9/Controller/Session.java
index 100fc9d..baa1719 100644
--- a/src/main/java/seng202/group9/Controller/Session.java
+++ b/src/main/java/seng202/group9/Controller/Session.java
@@ -20,6 +20,15 @@ public class Session implements Serializable {
     private String selectedgraphagainst;
     private ArrayList<String> selectedgraphoptions;
     private Boolean usefilter;
+    private String selectedDataToGraph;
+
+    public String getSelectedDataToGraph() {
+        return selectedDataToGraph;
+    }
+
+    public void setSelectedDataToGraph(String selectedDataToGraph) {
+        this.selectedDataToGraph = selectedDataToGraph;
+    }
 
     public String getSelectedgraphagainst() {
         return selectedgraphagainst;
diff --git a/src/main/java/seng202/group9/GUI/AirportAnalyser.java b/src/main/java/seng202/group9/GUI/AirportAnalyser.java
deleted file mode 100644
index 47f7116..0000000
--- a/src/main/java/seng202/group9/GUI/AirportAnalyser.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package seng202.group9.GUI;
-
-import javafx.fxml.FXML;
-import javafx.scene.chart.BarChart;
-import javafx.scene.chart.PieChart;
-import javafx.scene.chart.XYChart;
-import seng202.group9.Controller.App;
-import seng202.group9.Controller.Dataset;
-import seng202.group9.Core.Airline;
-import java.util.ArrayList;
-import java.util.HashMap;
-import javafx.application.Application;
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
-import javafx.scene.chart.*;
-import javafx.scene.Group;
-import seng202.group9.Core.Airport;
-
-/**
- * Gui controller class currently for creating the bar graph of routes arriving and departing from airports.
- * Extend the class. {@link Controller}
- * Created by michael on 17/09/2016.
- */
-public class AirportAnalyser extends Controller {
-    //links fxml parts to the controller.
-    @FXML
-    PieChart pieGraph;
-
-    //Used to store the data needed for making the graph.
-    private Dataset currentdata = null;
-    private HashMap<String, Integer> useddata = new HashMap<String, Integer>();
-    private ArrayList<Airport> current_routes;
-
-    /**
-     * Takes data from the current dataset and places it into the displayed pie graph.
-     */
-    public void build_graph(){
-        //Takes Airports from the full dataset.
-        current_routes = currentdata.getAirports();
-        datasetup(current_routes);
-        //Turns the data into a usable list.
-        ObservableList<PieChart.Data> pieChartData = FXCollections.observableArrayList();
-        System.out.println(useddata.keySet().size());
-        for (String airport : useddata.keySet()){
-            Integer temp = useddata.get(airport);
-            pieChartData.add(new PieChart.Data(airport,temp));
-        }
-        //Gives the data to the graph.
-        pieGraph.setData(pieChartData);
-    }
-
-    /**
-     * Takes the raw list of routes and fills the used data dictionary with the appropriate data to be displayed
-     * @param current_air_ports
-     */
-    private void datasetup(ArrayList<Airport> current_air_ports){
-        //Takes out the specified field  then adds to the used data dict.
-        for (Airport entry : current_air_ports){
-            String name = entry.getCountryName();
-            if (useddata.containsKey(name)){
-                int temp = useddata.get(name);
-                useddata.replace(name,temp+1);
-            }else {
-                Integer temp = 1;
-                useddata.put(name,temp);
-            }
-        }
-    }
-
-    /**
-     * Takes the current dataset then loads the data to the graph using build graph.
-     */
-    public void load() {
-        currentdata = getParent().getCurrentDataset();
-        build_graph();
-    }
-
-}
diff --git a/src/main/java/seng202/group9/GUI/AirportRDController.java b/src/main/java/seng202/group9/GUI/AirportRDController.java
index c0f3651..59af18c 100644
--- a/src/main/java/seng202/group9/GUI/AirportRDController.java
+++ b/src/main/java/seng202/group9/GUI/AirportRDController.java
@@ -5,7 +5,6 @@ import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
 import javafx.scene.control.cell.PropertyValueFactory;
-import seng202.group9.Controller.AirportFilter;
 import seng202.group9.Controller.Dataset;
 import seng202.group9.Controller.SceneCode;
 import seng202.group9.Controller.Session;
@@ -130,7 +129,7 @@ public class AirportRDController extends Controller{
 
     /**
      * Analyses the current data and creates a graph based on the data.
-     * @see AirportAnalyser
+     * @see PieGraphController
      */
     public void analyse_Button(){ replaceSceneContent(SceneCode.AIRPORT_ANALYSER);}
 
diff --git a/src/main/java/seng202/group9/GUI/PieChooserController.java b/src/main/java/seng202/group9/GUI/PieChooserController.java
index 2293ffc..6525511 100644
--- a/src/main/java/seng202/group9/GUI/PieChooserController.java
+++ b/src/main/java/seng202/group9/GUI/PieChooserController.java
@@ -28,13 +28,12 @@ public class PieChooserController extends Controller{
     CheckBox usefilter;
 
 
-    ObservableList airportOptions = FXCollections.observableArrayList("ID", "Name", "ICAO", "IATA FFA", "Altitude",
-            "Latitude", "Longitude", "City", "Country");
+    ObservableList airportOptions = FXCollections.observableArrayList("Name", "ICAO", "IATA FFA", "Altitude",
+            "City", "Country");
 
-    ObservableList airlineOptions = FXCollections.observableArrayList("ID", "Name", "ICAO", "IATA", "Alias",
-            "Call Sign", "Active", "Country");
+    ObservableList airlineOptions = FXCollections.observableArrayList("Name", "ICAO", "IATA", "Active", "Country");
 
-    ObservableList routeOptions = FXCollections.observableArrayList("ID", "Stops", "Codeshare", "Equipment", "Airline",
+    ObservableList routeOptions = FXCollections.observableArrayList("Stops", "Codeshare", "Equipment", "Airline",
             "Departure Airport", "Arival airport");
 
     ArrayList<ObservableList> allOptions = new ArrayList<ObservableList>();
@@ -45,6 +44,7 @@ public class PieChooserController extends Controller{
     public void buildGraph() {
         Session currentsession = this.getParent().getSession();
         ArrayList<String> temp = new ArrayList<String>();
+        currentsession.setSelectedDataToGraph(datatypechooser.getSelectionModel().getSelectedItem().toString());
         currentsession.setSelectedgraphagainst(graph_options.getSelectionModel().getSelectedItem().toString());
         currentsession.setUsefilter(usefilter.isSelected());
         replaceSceneContent(SceneCode.AIRPORT_ANALYSER);
@@ -63,7 +63,6 @@ public class PieChooserController extends Controller{
                 changeTables();
             }
         });
-
         graph_options.setItems(airportOptions);
         graph_options.getSelectionModel().selectFirst();
         allOptions.add(airportOptions);
diff --git a/src/main/java/seng202/group9/GUI/PieGraphController.java b/src/main/java/seng202/group9/GUI/PieGraphController.java
new file mode 100644
index 0000000..dc81823
--- /dev/null
+++ b/src/main/java/seng202/group9/GUI/PieGraphController.java
@@ -0,0 +1,176 @@
+package seng202.group9.GUI;
+
+import javafx.fxml.FXML;
+import javafx.scene.chart.BarChart;
+import javafx.scene.chart.PieChart;
+import javafx.scene.chart.XYChart;
+import seng202.group9.Controller.*;
+import seng202.group9.Core.Airline;
+import java.util.ArrayList;
+import java.util.HashMap;
+import javafx.application.Application;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.scene.chart.*;
+import javafx.scene.Group;
+import seng202.group9.Core.Airport;
+import seng202.group9.Core.Route;
+
+/**
+ * Gui controller class currently for creating the bar graph of routes arriving and departing from airports.
+ * Extend the class. {@link Controller}
+ * Created by michael on 17/09/2016.
+ */
+public class PieGraphController extends Controller {
+    //links fxml parts to the controller.
+    @FXML
+    PieChart pieGraph;
+
+    //Used to store the data needed for making the graph.
+    private Dataset currentdata = null;
+    private HashMap<String, Integer> useddata = new HashMap<String, Integer>();
+    private ArrayList<Airport> current_routes;
+    private Session currentsession;
+
+
+    /**
+     * Takes data from the current dataset and places it into the displayed pie graph.
+     */
+    public void build_graph(){
+        //Turns the data into a usable list.
+        ObservableList<PieChart.Data> pieChartData = FXCollections.observableArrayList();
+        System.out.println(useddata.keySet().size());
+        for (String airport : useddata.keySet()){
+            Integer temp = useddata.get(airport);
+            pieChartData.add(new PieChart.Data(airport,temp));
+        }
+        //Gives the data to the graph.
+        pieGraph.setData(pieChartData);
+    }
+
+    /**
+     * Takes the raw list of routes and fills the used data dictionary with the appropriate data to be displayed
+     * @param current_air_ports
+     */
+    private void datasetupCustomarAirport(ArrayList<Airport> current_air_ports){
+        //Takes out the specified field  then adds to the used data dict.
+        for (Airport entry : current_air_ports){
+            String name = "Error";
+            if (currentsession.getSelectedgraphagainst() == "Name") {
+                name = entry.getName();
+            }
+            else if (currentsession.getSelectedgraphagainst() == "ICAO") {
+                name = entry.getICAO();
+            }
+            else if (currentsession.getSelectedgraphagainst() == "IATA_FFA") {
+                name = entry.getIATA_FFA();
+            }
+            else if (currentsession.getSelectedgraphagainst() == "City") {
+                name = entry.getCityName();
+            }
+            else if (currentsession.getSelectedgraphagainst() == "Country") {
+                name = entry.getCountryName();
+            }
+            if (useddata.containsKey(name)){
+                int temp = useddata.get(name);
+                useddata.replace(name,temp+1);
+            }else {
+                Integer temp = 1;
+                useddata.put(name,temp);
+            }
+        }
+    }
+
+
+    private void datasetupCustomarAirline(ArrayList<Airline> current_air_ports){
+        //Takes out the specified field  then adds to the used data dict.
+        for (Airline entry : current_air_ports){
+            String name = "Error";
+            if (currentsession.getSelectedgraphagainst() == "Name") {
+                name = entry.getName();
+            }
+            else if (currentsession.getSelectedgraphagainst() == "ICAO") {
+                name = entry.getICAO();
+            }
+            else if (currentsession.getSelectedgraphagainst() == "IATA") {
+                name = entry.getIATA();
+            }
+            else if (currentsession.getSelectedgraphagainst() == "Country") {
+                name = entry.getCountryName();
+            }
+            else if (currentsession.getSelectedgraphagainst() == "Active") {
+                name = entry.getActive();
+            }
+            if (useddata.containsKey(name)){
+                int temp = useddata.get(name);
+                useddata.replace(name,temp+1);
+            }else {
+                Integer temp = 1;
+                useddata.put(name,temp);
+            }
+        }
+        int size = useddata.size();
+        while (size > 50){
+
+            size = useddata.size();
+        }
+    }
+
+
+    private void datasetupCustomRoute(ArrayList<Route> current_air_ports){
+        //Takes out the specified field  then adds to the used data dict.
+        for (Route entry : current_air_ports){
+            String name = "Error";
+            if (currentsession.getSelectedgraphagainst() == "Stops") {
+                name = String.valueOf(entry.getStops());
+            }
+            else if (currentsession.getSelectedgraphagainst() == "Codeshare") {
+                name = entry.getCode();
+            }
+            else if (currentsession.getSelectedgraphagainst() == "Equipment") {
+                name = entry.getEquipment();
+            }
+            else if (currentsession.getSelectedgraphagainst() == "Airline") {
+                name = entry.getAirlineName();
+            }
+            else if (currentsession.getSelectedgraphagainst() == "Departure Airport") {
+                name = entry.getDepartureAirport();
+            }
+            else if (currentsession.getSelectedgraphagainst() == "Arival airport") {
+                name = entry.getArrivalAirport();
+            }
+            if (useddata.containsKey(name)){
+                int temp = useddata.get(name);
+                useddata.replace(name,temp+1);
+            }else {
+                Integer temp = 1;
+                useddata.put(name,temp);
+            }
+        }
+        int size = useddata.size();
+        while (size > 50){
+
+            size = useddata.size();
+        }
+    }
+
+    /**
+     * Takes the current dataset then loads the data to the graph using build graph.
+     */
+    public void load() {
+        currentdata = getParent().getCurrentDataset();
+        currentsession = this.getParent().getSession();
+        String temp = currentsession.getSelectedDataToGraph();
+        if (temp == "Airports") {
+            datasetupCustomarAirport(currentdata.getAirports());
+        }
+        else if (temp == "Airlines"){
+            datasetupCustomarAirline(currentdata.getAirlines());
+        }
+        else if (temp == "Routes") {
+            datasetupCustomRoute(currentdata.getRoutes());
+        }
+        build_graph();
+    }
+
+}
diff --git a/src/main/resources/airport_analyser.fxml b/src/main/resources/airport_analyser.fxml
index a811436..7b6485c 100644
--- a/src/main/resources/airport_analyser.fxml
+++ b/src/main/resources/airport_analyser.fxml
@@ -8,7 +8,7 @@
 <?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.AirportAnalyser">
+<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.PieGraphController">
   <columnConstraints>
     <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
     <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />

From 9141f5abf3d08cd15b06f409371a44a799010780 Mon Sep 17 00:00:00 2001
From: Michael Wilson <mrw106@uclive.ac.nz>
Date: Sun, 2 Oct 2016 13:41:07 +1300
Subject: [PATCH 06/11] Error handling added.

---
 .../seng202/group9/Controller/SceneCode.java  |   2 +-
 .../seng202/group9/Controller/Session.java    |  15 +-
 .../group9/GUI/BarChartErrorController.java   |  23 +++
 .../group9/GUI/BarChooserController.java      |  10 +-
 .../group9/GUI/BarGraphController.java        | 184 ++++++++++++++++++
 .../group9/GUI/PieChartErrorController.java   |  23 +++
 .../group9/GUI/PieChooserController.java      |  13 ++
 .../group9/GUI/PieGraphController.java        |  82 +++++---
 .../seng202/group9/GUI/RouteAnalyser.java     |  91 ---------
 .../seng202/group9/GUI/RouteRDController.java |   3 +-
 src/main/resources/pie_graph_chooser.fxml     |  10 +-
 src/main/resources/route_analyser.fxml        |   2 +-
 src/main/resources/too_many_options_bar.fxml  |  58 ++++++
 src/main/resources/too_many_options_pie.fxml  |  58 ++++++
 14 files changed, 436 insertions(+), 138 deletions(-)
 create mode 100644 src/main/java/seng202/group9/GUI/BarChartErrorController.java
 create mode 100644 src/main/java/seng202/group9/GUI/BarGraphController.java
 create mode 100644 src/main/java/seng202/group9/GUI/PieChartErrorController.java
 delete mode 100644 src/main/java/seng202/group9/GUI/RouteAnalyser.java
 create mode 100644 src/main/resources/too_many_options_bar.fxml
 create mode 100644 src/main/resources/too_many_options_pie.fxml

diff --git a/src/main/java/seng202/group9/Controller/SceneCode.java b/src/main/java/seng202/group9/Controller/SceneCode.java
index a8c3d17..56fd07c 100644
--- a/src/main/java/seng202/group9/Controller/SceneCode.java
+++ b/src/main/java/seng202/group9/Controller/SceneCode.java
@@ -11,7 +11,7 @@ public enum SceneCode {
     FLIGHT_RAW_DATA("flight_raw_data.fxml"), AIRPORT_ANALYSER("airport_analyser.fxml"), ROUTE_ANALYSER("route_analyser.fxml"),
     AIRPORT_DIST_CALC("airport_dist_calc.fxml"), AIRLINE_ADD("airline_add_form.fxml"), AIRLINE_FILTER("airline_filter_form.fxml"),
     AIRPORT_ADD("airport_add_form.fxml"), AIRPORT_FILTER("airport_filter_form.fxml"), ROUTE_ADD("route_add_form.fxml"),
-    ROUTE_FILTER("route_filter_form.fxml"),ANALYSER_TAB("analyser_main_page.fxml"),
+    ROUTE_FILTER("route_filter_form.fxml"),ANALYSER_TAB("analyser_main_page.fxml"), CHART_ERROR("too_many_options_pie.fxml"),
     BAR_GRAPH_CHOOSER("bar_graph_chooser.fxml"), PIE_GRAPH_CHOOSER("pie_graph_chooser.fxml");
 
     private String filePath;
diff --git a/src/main/java/seng202/group9/Controller/Session.java b/src/main/java/seng202/group9/Controller/Session.java
index baa1719..7e2c018 100644
--- a/src/main/java/seng202/group9/Controller/Session.java
+++ b/src/main/java/seng202/group9/Controller/Session.java
@@ -18,10 +18,19 @@ public class Session implements Serializable {
     private HashMap<Integer, String> filteredAirports;
     private HashMap<Integer, String> filteredRoutes;
     private String selectedgraphagainst;
-    private ArrayList<String> selectedgraphoptions;
+    private String selectedgraphoptions;
     private Boolean usefilter;
+    private Boolean forceGraph;
     private String selectedDataToGraph;
 
+    public Boolean getForceGraph() {
+        return forceGraph;
+    }
+
+    public void setForceGraph(Boolean forceGraph) {
+        this.forceGraph = forceGraph;
+    }
+
     public String getSelectedDataToGraph() {
         return selectedDataToGraph;
     }
@@ -38,11 +47,11 @@ public class Session implements Serializable {
         this.selectedgraphagainst = selectedgraphagainst;
     }
 
-    public ArrayList<String> getSelectedgraphoptions() {
+    public String getSelectedgraphoptions() {
         return selectedgraphoptions;
     }
 
-    public void setSelectedgraphoptions(ArrayList<String> selectedgraphoptions) {
+    public void setSelectedgraphoptions(String selectedgraphoptions) {
         this.selectedgraphoptions = selectedgraphoptions;
     }
 
diff --git a/src/main/java/seng202/group9/GUI/BarChartErrorController.java b/src/main/java/seng202/group9/GUI/BarChartErrorController.java
new file mode 100644
index 0000000..52d2498
--- /dev/null
+++ b/src/main/java/seng202/group9/GUI/BarChartErrorController.java
@@ -0,0 +1,23 @@
+package seng202.group9.GUI;
+
+import seng202.group9.Controller.SceneCode;
+import seng202.group9.Controller.Session;
+
+/**
+ * Created by michael on 2/10/2016.
+ */
+public class BarChartErrorController extends Controller {
+    private Session currentSession;
+
+    public void load(){
+        currentSession = this.getParent().getSession();
+    }
+
+    public void ignoredWarning() {
+        currentSession.setForceGraph(Boolean.TRUE);
+        replaceSceneContent(SceneCode.ROUTE_ANALYSER);
+    }
+    public void backToSafety(){
+        replaceSceneContent(SceneCode.BAR_GRAPH_CHOOSER);
+    }
+}
diff --git a/src/main/java/seng202/group9/GUI/BarChooserController.java b/src/main/java/seng202/group9/GUI/BarChooserController.java
index 362d994..c7441b9 100644
--- a/src/main/java/seng202/group9/GUI/BarChooserController.java
+++ b/src/main/java/seng202/group9/GUI/BarChooserController.java
@@ -29,8 +29,8 @@ public class BarChooserController extends Controller{
     @FXML
     CheckBox usefilter;
 
-    ObservableList airportOptions = FXCollections.observableArrayList("ID", "Name", "ICAO", "IATA FFA", "Altitude",
-            "Latitude", "Longitude", "City", "Country");
+    ObservableList airportOptions = FXCollections.observableArrayList("Name", "ICAO", "IATA FFA", "Altitude",
+            "City", "Country");
 
     ObservableList airlineOptions = FXCollections.observableArrayList("ID", "Name", "ICAO", "IATA", "Alias",
             "Call Sign", "Active", "Country");
@@ -42,12 +42,10 @@ public class BarChooserController extends Controller{
 
     public void buildGraph() {
         Session currentsession = this.getParent().getSession();
-        ArrayList<String> temp = new ArrayList<String>();
-        temp.addAll(graph_options.getSelectionModel().getSelectedItems());
-        currentsession.setSelectedgraphoptions(temp);
-        currentsession.setUsefilter(usefilter.isSelected());
+        currentsession.setSelectedgraphoptions(graph_against.getSelectionModel().getSelectedItem().toString());
         currentsession.setSelectedgraphagainst(graph_options.getSelectionModel().getSelectedItem().toString());
         currentsession.setUsefilter(usefilter.isSelected());
+        currentsession.setForceGraph(Boolean.FALSE);
         replaceSceneContent(SceneCode.ROUTE_ANALYSER);
     }
 
diff --git a/src/main/java/seng202/group9/GUI/BarGraphController.java b/src/main/java/seng202/group9/GUI/BarGraphController.java
new file mode 100644
index 0000000..c151226
--- /dev/null
+++ b/src/main/java/seng202/group9/GUI/BarGraphController.java
@@ -0,0 +1,184 @@
+package seng202.group9.GUI;
+
+
+import javafx.fxml.FXML;
+import javafx.scene.chart.BarChart;
+import javafx.scene.chart.XYChart;
+import seng202.group9.Controller.App;
+import seng202.group9.Controller.Dataset;
+import seng202.group9.Controller.Session;
+import seng202.group9.Core.Airline;
+import seng202.group9.Core.Airport;
+import seng202.group9.Core.Route;
+import java.util.ArrayList;
+import java.util.HashMap;
+
+
+/**
+ * Gui controller class currently for creating the bar graph of routes arriving and departing from airports.
+ * Extend the class. {@link Controller}
+ * Created by michael on 16/09/2016.
+ */
+public class BarGraphController extends Controller {
+    //Links fxml to the controller.
+    @FXML
+    private BarChart analyserGraph;
+
+    //Used to store the data needed for making the tables.
+    private ArrayList<Route> current_routes;
+    private Dataset currentdata = null;
+    private HashMap<String, ArrayList> useddata = new HashMap<String, ArrayList>();
+    private Session currentsession;
+
+    /**
+     * Takes data from the current dataset and places it into the displayed bar graph.
+     */
+    public void build_graph(){
+        //Takes routes from the full dataset.
+        current_routes = currentdata.getRoutes();
+        datasetup(current_routes);
+        //Builds series needed for the graph.
+        XYChart.Series seriesArivals = new XYChart.Series();
+        XYChart.Series seriesDeparts = new XYChart.Series();
+        seriesArivals.setName("Arriving routes");
+        seriesDeparts.setName("Departs routes");
+        for (String airport : useddata.keySet()){
+            ArrayList<Integer> temp = useddata.get(airport);
+            seriesArivals.getData().add(new XYChart.Data(airport,temp.get(0)));
+            seriesDeparts.getData().add(new XYChart.Data(airport,temp.get(1)));
+        }
+        //Gives the formatted data to the graph.
+        analyserGraph.getData().addAll(seriesArivals,seriesDeparts);
+    }
+
+    /**
+     * Takes the raw list of routes and fills the used data dictionary with the appropriate data to be displayed
+     * @param current_routes
+     */
+
+    private int stops;
+    private String codeShare;
+    private String equipment;
+    private String airlineName;
+    private String departureAirport;
+    private String arrivalAirport;
+
+    private void datasetupCustomarAirport(ArrayList<Airport> current_air_ports){
+        //Takes out the specified field  then adds to the used data dict.
+        for (Airport entry : current_air_ports){
+            String name = "Error";
+            if (currentsession.getSelectedgraphagainst() == "Name") {
+                name = entry.getName();
+            }
+            else if (currentsession.getSelectedgraphagainst() == "ICAO") {
+                name = entry.getICAO();
+            }
+            else if (currentsession.getSelectedgraphagainst() == "IATA_FFA") {
+                name = entry.getIATA_FFA();
+            }
+            else if (currentsession.getSelectedgraphagainst() == "City") {
+                name = entry.getCityName();
+            }
+            else if (currentsession.getSelectedgraphagainst() == "Country") {
+                name = entry.getCountryName();
+            }
+            if (useddata.containsKey(name)){
+                int temp = useddata.get(name);
+                useddata.replace(name,temp+1);
+            }else {
+                Integer temp = 1;
+                useddata.put(name,temp);
+            }
+        }
+    }
+
+
+    private void datasetupCustomRoute(ArrayList<Route> current_routes){
+        //Takes out the specified field (Currently departure airport and arrival airport) then adds to the used data dict.
+        if(currentsession.getSelectedgraphagainst() = ""){
+
+        }
+    }
+
+
+            for (Route entry : current_routes){
+        String departs = entry.getDepartureAirport();
+        String arives = entry.getArrivalAirport();
+        if (useddata.containsKey(departs)){
+            ArrayList<Integer> temp = useddata.get(departs);
+            temp.add(1,temp.get(1)+1);
+            useddata.replace(departs,temp);
+        }else {
+            ArrayList<Integer> temp = new ArrayList<Integer>(2);
+            temp.add(0);
+            temp.add(1);
+            useddata.put(departs,temp);
+        }
+        if (useddata.containsKey(arives)){
+            ArrayList<Integer> temp = useddata.get(arives);
+            temp.add(0,temp.get(0)+1);
+            useddata.replace(arives,temp);
+        }else {
+            ArrayList<Integer> temp = new ArrayList<Integer>(2);
+            temp.add(1);
+            temp.add(0);
+            useddata.put(arives,temp);
+        }
+    }
+
+    /**
+     * Takes the current dataset then loads the data to the graph using build graph.
+     */
+    public void load() {
+        currentdata = getParent().getCurrentDataset();
+        currentsession = this.getParent().getSession();
+        String temp = currentsession.getSelectedDataToGraph();
+        if (temp == "Airports") {
+            ArrayList<Airport> d = new ArrayList();
+            if (currentsession.getUsefilter()){
+                for(int i = 0; i < currentdata.getAirports().size(); i++) {
+                    if (currentsession.getFilteredAirports().containsValue(currentdata.getAirports().get(i).getName())
+                            && currentsession.getFilteredAirports().containsKey(i)) {
+                        d.add(currentdata.getAirports().get(i));
+                    }
+                }
+            }
+            else{
+                d = currentdata.getAirports();
+            }
+            datasetupCustomarAirport(d);
+        }
+        else if (temp == "Airlines"){
+            ArrayList<Airline> d = new ArrayList();
+            if (currentsession.getUsefilter()){
+                for(int i = 0; i < currentdata.getAirports().size(); i++) {
+                    if (currentsession.getFilteredAirlines().containsValue(currentdata.getAirlines().get(i).getName())
+                            && currentsession.getFilteredAirlines().containsKey(i)) {
+                        d.add(currentdata.getAirlines().get(i));
+                    }
+                }
+            }
+            else{
+                d = currentdata.getAirlines();
+            }
+            datasetupCustomarAirline(d);
+        }
+        else if (temp == "Routes") {
+            ArrayList<Route> d = new ArrayList();
+            if (currentsession.getUsefilter()){
+                for(int i = 0; i < currentdata.getRoutes().size(); i++) {
+                    if (currentsession.getFilteredRoutes().containsValue(currentdata.getRoutes().get(i).getAirlineName())
+                            && currentsession.getFilteredRoutes().containsKey(i)) {
+                        d.add(currentdata.getRoutes().get(i));
+                    }
+                }
+            }
+            else{
+                d = currentdata.getRoutes();
+            }
+            datasetupCustomRoute(d);
+        }
+        build_graph();
+    }
+
+}
diff --git a/src/main/java/seng202/group9/GUI/PieChartErrorController.java b/src/main/java/seng202/group9/GUI/PieChartErrorController.java
new file mode 100644
index 0000000..3b2c89a
--- /dev/null
+++ b/src/main/java/seng202/group9/GUI/PieChartErrorController.java
@@ -0,0 +1,23 @@
+package seng202.group9.GUI;
+
+import seng202.group9.Controller.SceneCode;
+import seng202.group9.Controller.Session;
+
+/**
+ * Created by michael on 2/10/2016.
+ */
+public class PieChartErrorController extends Controller {
+    private Session currentSession;
+
+    public void load(){
+        currentSession = this.getParent().getSession();
+    }
+
+    public void ignoredWarning() {
+        currentSession.setForceGraph(Boolean.TRUE);
+        replaceSceneContent(SceneCode.AIRPORT_ANALYSER);
+    }
+    public void backToSafety(){
+        replaceSceneContent(SceneCode.PIE_GRAPH_CHOOSER);
+    }
+}
diff --git a/src/main/java/seng202/group9/GUI/PieChooserController.java b/src/main/java/seng202/group9/GUI/PieChooserController.java
index 6525511..b6be1d7 100644
--- a/src/main/java/seng202/group9/GUI/PieChooserController.java
+++ b/src/main/java/seng202/group9/GUI/PieChooserController.java
@@ -47,6 +47,7 @@ public class PieChooserController extends Controller{
         currentsession.setSelectedDataToGraph(datatypechooser.getSelectionModel().getSelectedItem().toString());
         currentsession.setSelectedgraphagainst(graph_options.getSelectionModel().getSelectedItem().toString());
         currentsession.setUsefilter(usefilter.isSelected());
+        currentsession.setForceGraph(Boolean.FALSE);
         replaceSceneContent(SceneCode.AIRPORT_ANALYSER);
     }
 
@@ -69,4 +70,16 @@ public class PieChooserController extends Controller{
         allOptions.add(airlineOptions);
         allOptions.add(routeOptions);
     }
+
+    public void newFilter(){
+        if (datatypechooser.getSelectionModel().getSelectedItem().toString() == "Airports"){
+            createPopUpStage(SceneCode.AIRPORT_FILTER, 600, 330);
+        }
+        else if (datatypechooser.getSelectionModel().getSelectedItem().toString() == "Airlines"){
+            createPopUpStage(SceneCode.AIRLINE_FILTER, 600, 330);
+        }
+        else if (datatypechooser.getSelectionModel().getSelectedItem().toString() == "Routes"){
+            createPopUpStage(SceneCode.ROUTE_FILTER, 600, 330);
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/seng202/group9/GUI/PieGraphController.java b/src/main/java/seng202/group9/GUI/PieGraphController.java
index dc81823..eb80465 100644
--- a/src/main/java/seng202/group9/GUI/PieGraphController.java
+++ b/src/main/java/seng202/group9/GUI/PieGraphController.java
@@ -29,7 +29,6 @@ public class PieGraphController extends Controller {
     //Used to store the data needed for making the graph.
     private Dataset currentdata = null;
     private HashMap<String, Integer> useddata = new HashMap<String, Integer>();
-    private ArrayList<Airport> current_routes;
     private Session currentsession;
 
 
@@ -45,7 +44,12 @@ public class PieGraphController extends Controller {
             pieChartData.add(new PieChart.Data(airport,temp));
         }
         //Gives the data to the graph.
-        pieGraph.setData(pieChartData);
+        if (useddata.keySet().size() > 50 && currentsession.getForceGraph()){
+            replaceSceneContent(SceneCode.CHART_ERROR);
+        }
+        else{
+            pieGraph.setData(pieChartData);
+        }
     }
 
     /**
@@ -84,36 +88,27 @@ public class PieGraphController extends Controller {
 
     private void datasetupCustomarAirline(ArrayList<Airline> current_air_ports){
         //Takes out the specified field  then adds to the used data dict.
-        for (Airline entry : current_air_ports){
+        for (Airline entry : current_air_ports) {
             String name = "Error";
             if (currentsession.getSelectedgraphagainst() == "Name") {
                 name = entry.getName();
-            }
-            else if (currentsession.getSelectedgraphagainst() == "ICAO") {
+            } else if (currentsession.getSelectedgraphagainst() == "ICAO") {
                 name = entry.getICAO();
-            }
-            else if (currentsession.getSelectedgraphagainst() == "IATA") {
+            } else if (currentsession.getSelectedgraphagainst() == "IATA") {
                 name = entry.getIATA();
-            }
-            else if (currentsession.getSelectedgraphagainst() == "Country") {
+            } else if (currentsession.getSelectedgraphagainst() == "Country") {
                 name = entry.getCountryName();
-            }
-            else if (currentsession.getSelectedgraphagainst() == "Active") {
+            } else if (currentsession.getSelectedgraphagainst() == "Active") {
                 name = entry.getActive();
             }
-            if (useddata.containsKey(name)){
+            if (useddata.containsKey(name)) {
                 int temp = useddata.get(name);
-                useddata.replace(name,temp+1);
-            }else {
+                useddata.replace(name, temp + 1);
+            } else {
                 Integer temp = 1;
-                useddata.put(name,temp);
+                useddata.put(name, temp);
             }
         }
-        int size = useddata.size();
-        while (size > 50){
-
-            size = useddata.size();
-        }
     }
 
 
@@ -147,11 +142,6 @@ public class PieGraphController extends Controller {
                 useddata.put(name,temp);
             }
         }
-        int size = useddata.size();
-        while (size > 50){
-
-            size = useddata.size();
-        }
     }
 
     /**
@@ -162,13 +152,49 @@ public class PieGraphController extends Controller {
         currentsession = this.getParent().getSession();
         String temp = currentsession.getSelectedDataToGraph();
         if (temp == "Airports") {
-            datasetupCustomarAirport(currentdata.getAirports());
+            ArrayList<Airport> d = new ArrayList();
+            if (currentsession.getUsefilter()){
+                for(int i = 0; i < currentdata.getAirports().size(); i++) {
+                    if (currentsession.getFilteredAirports().containsValue(currentdata.getAirports().get(i).getName())
+                            && currentsession.getFilteredAirports().containsKey(i)) {
+                        d.add(currentdata.getAirports().get(i));
+                    }
+                }
+            }
+            else{
+                d = currentdata.getAirports();
+            }
+            datasetupCustomarAirport(d);
         }
         else if (temp == "Airlines"){
-            datasetupCustomarAirline(currentdata.getAirlines());
+            ArrayList<Airline> d = new ArrayList();
+            if (currentsession.getUsefilter()){
+                for(int i = 0; i < currentdata.getAirports().size(); i++) {
+                    if (currentsession.getFilteredAirlines().containsValue(currentdata.getAirlines().get(i).getName())
+                            && currentsession.getFilteredAirlines().containsKey(i)) {
+                        d.add(currentdata.getAirlines().get(i));
+                    }
+                }
+            }
+            else{
+                d = currentdata.getAirlines();
+            }
+            datasetupCustomarAirline(d);
         }
         else if (temp == "Routes") {
-            datasetupCustomRoute(currentdata.getRoutes());
+            ArrayList<Route> d = new ArrayList();
+            if (currentsession.getUsefilter()){
+                for(int i = 0; i < currentdata.getRoutes().size(); i++) {
+                    if (currentsession.getFilteredRoutes().containsValue(currentdata.getRoutes().get(i).getAirlineName())
+                            && currentsession.getFilteredRoutes().containsKey(i)) {
+                        d.add(currentdata.getRoutes().get(i));
+                    }
+                }
+            }
+            else{
+                d = currentdata.getRoutes();
+            }
+            datasetupCustomRoute(d);
         }
         build_graph();
     }
diff --git a/src/main/java/seng202/group9/GUI/RouteAnalyser.java b/src/main/java/seng202/group9/GUI/RouteAnalyser.java
deleted file mode 100644
index 2d66c79..0000000
--- a/src/main/java/seng202/group9/GUI/RouteAnalyser.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package seng202.group9.GUI;
-
-
-import javafx.fxml.FXML;
-import javafx.scene.chart.BarChart;
-import javafx.scene.chart.XYChart;
-import seng202.group9.Controller.App;
-import seng202.group9.Controller.Dataset;
-import seng202.group9.Core.Route;
-import java.util.ArrayList;
-import java.util.HashMap;
-
-
-/**
- * Gui controller class currently for creating the bar graph of routes arriving and departing from airports.
- * Extend the class. {@link Controller}
- * Created by michael on 16/09/2016.
- */
-public class RouteAnalyser extends Controller {
-    //Links fxml to the controller.
-    @FXML
-    private BarChart analyserGraph;
-
-    //Used to store the data needed for making the tables.
-    private ArrayList<Route> current_routes;
-    private Dataset currentdata = null;
-    private HashMap<String, ArrayList> useddata = new HashMap<String, ArrayList>();
-
-    /**
-     * Takes data from the current dataset and places it into the displayed bar graph.
-     */
-    public void build_graph(){
-        //Takes routes from the full dataset.
-        current_routes = currentdata.getRoutes();
-        datasetup(current_routes);
-        //Builds series needed for the graph.
-        XYChart.Series seriesArivals = new XYChart.Series();
-        XYChart.Series seriesDeparts = new XYChart.Series();
-        seriesArivals.setName("Arriving routes");
-        seriesDeparts.setName("Departs routes");
-        for (String airport : useddata.keySet()){
-            ArrayList<Integer> temp = useddata.get(airport);
-            seriesArivals.getData().add(new XYChart.Data(airport,temp.get(0)));
-            seriesDeparts.getData().add(new XYChart.Data(airport,temp.get(1)));
-        }
-        System.out.println(useddata.keySet().size());
-        //Gives the formatted data to the graph.
-        analyserGraph.getData().addAll(seriesArivals,seriesDeparts);
-    }
-
-    /**
-     * Takes the raw list of routes and fills the used data dictionary with the appropriate data to be displayed
-     * @param current_routes
-     */
-
-    private void datasetup(ArrayList<Route> current_routes){
-        //Takes out the specified field (Currently departure airport and arrival airport) then adds to the used data dict.
-        for (Route entry : current_routes){
-            String departs = entry.getDepartureAirport();
-            String arives = entry.getArrivalAirport();
-            if (useddata.containsKey(departs)){
-                ArrayList<Integer> temp = useddata.get(departs);
-                temp.add(1,temp.get(1)+1);
-                useddata.replace(departs,temp);
-            }else {
-                ArrayList<Integer> temp = new ArrayList<Integer>(2);
-                temp.add(0);
-                temp.add(1);
-                useddata.put(departs,temp);
-            }
-            if (useddata.containsKey(arives)){
-                ArrayList<Integer> temp = useddata.get(arives);
-                temp.add(0,temp.get(0)+1);
-                useddata.replace(arives,temp);
-            }else {
-                ArrayList<Integer> temp = new ArrayList<Integer>(2);
-                temp.add(1);
-                temp.add(0);
-                useddata.put(arives,temp);
-            }
-        }
-    }
-
-    /**
-     * Takes the current dataset then loads the data to the graph using build graph.
-     */
-    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 45b1b29..0a352b6 100644
--- a/src/main/java/seng202/group9/GUI/RouteRDController.java
+++ b/src/main/java/seng202/group9/GUI/RouteRDController.java
@@ -7,7 +7,6 @@ import javafx.scene.control.*;
 import javafx.scene.control.cell.PropertyValueFactory;
 import seng202.group9.Controller.Dataset;
 import seng202.group9.Controller.SceneCode;
-import seng202.group9.Controller.RouteFilter;
 import seng202.group9.Controller.Session;
 import seng202.group9.Core.Route;
 
@@ -115,7 +114,7 @@ public class RouteRDController extends Controller {
 
     /**
      * Analyses the current data and creates a graph based on the data.
-     * @see RouteAnalyser
+     * @see BarGraphController
      */
     public void analyse_Button() {
         replaceSceneContent(SceneCode.ROUTE_ANALYSER);
diff --git a/src/main/resources/pie_graph_chooser.fxml b/src/main/resources/pie_graph_chooser.fxml
index 7f57044..843111d 100644
--- a/src/main/resources/pie_graph_chooser.fxml
+++ b/src/main/resources/pie_graph_chooser.fxml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
-<?import javafx.geometry.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-<?import javafx.scene.text.*?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
+<?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.control.ChoiceBox?>
+<?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ListView?>
 <?import javafx.scene.control.ScrollPane?>
 <?import javafx.scene.layout.AnchorPane?>
@@ -17,7 +14,7 @@
 <?import javafx.scene.text.Font?>
 <?import javafx.scene.text.Text?>
 
-<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.PieChooserController">
+<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.45" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.PieChooserController">
    <children>
       <ScrollPane prefHeight="800.0" prefWidth="800.0">
          <content>
@@ -63,6 +60,7 @@
                      </children>
                   </HBox>
                   <Button layoutX="234.0" layoutY="413.0" mnemonicParsing="false" onAction="#buildGraph" text="Build Graph" />
+                  <Button layoutX="346.0" layoutY="413.0" mnemonicParsing="false" onAction="#newFilter" text="New Filter" />
                   <Button layoutX="462.0" layoutY="413.0" mnemonicParsing="false" onAction="#toBarGraphChooser" text="Change Graph Type" />
                   <CheckBox fx:id="usefilter" layoutX="356.0" layoutY="464.0" mnemonicParsing="false" text="Use filters from Raw Data" />
                </children>
diff --git a/src/main/resources/route_analyser.fxml b/src/main/resources/route_analyser.fxml
index 85a86f8..7d1ad30 100644
--- a/src/main/resources/route_analyser.fxml
+++ b/src/main/resources/route_analyser.fxml
@@ -10,7 +10,7 @@
 <?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">
+<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.BarGraphController">
   <columnConstraints>
     <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
     <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
diff --git a/src/main/resources/too_many_options_bar.fxml b/src/main/resources/too_many_options_bar.fxml
new file mode 100644
index 0000000..7013c1d
--- /dev/null
+++ b/src/main/resources/too_many_options_bar.fxml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ScrollPane?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Pane?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
+<?import javafx.scene.text.Text?>
+
+<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.45" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.BarChartErrorController">
+   <children>
+      <ScrollPane prefHeight="800.0" prefWidth="800.0">
+         <content>
+            <AnchorPane prefHeight="800.0" prefWidth="800.0">
+               <children>
+                  <HBox alignment="CENTER" prefHeight="300.0" prefWidth="583.0" AnchorPane.topAnchor="25.0">
+                     <children>
+                        <AnchorPane prefHeight="300.0" prefWidth="330.0">
+                           <children>
+                              <Pane layoutY="-6.0" prefHeight="60.0" prefWidth="330.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                                 <children>
+                                    <Text layoutX="21.0" layoutY="40.0" strokeType="OUTSIDE" strokeWidth="0.0" text="You have entered too many options for our graph to safely handle. ">
+                                       <font>
+                                          <Font size="24.0" />
+                                       </font></Text>
+                                 </children>
+                              </Pane>
+                              <Button layoutX="100.0" layoutY="125.0" mnemonicParsing="false" onAction="#ignoredWarning" text="Continue? (May cause slowdown and display issues" />
+                           </children>
+                        </AnchorPane>
+                        <AnchorPane prefHeight="300.0" prefWidth="253.0">
+                           <children>
+                              <Pane layoutY="200.0" prefHeight="100.0" prefWidth="253.0">
+                                 <padding>
+                                    <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+                                 </padding>
+                              </Pane>
+                              <Pane prefHeight="200.0" prefWidth="253.0">
+                                 <padding>
+                                    <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+                                 </padding>
+                                 <children>
+                                    <Button layoutX="100.0" layoutY="124.0" mnemonicParsing="false" onAction="#backToSafety" text="Abort (Add more filters to fix.)" />
+                                 </children>
+                              </Pane>
+                           </children>
+                        </AnchorPane>
+                     </children>
+                  </HBox>
+               </children>
+            </AnchorPane>
+         </content>
+      </ScrollPane>
+   </children>
+</VBox>
diff --git a/src/main/resources/too_many_options_pie.fxml b/src/main/resources/too_many_options_pie.fxml
new file mode 100644
index 0000000..c6b8e86
--- /dev/null
+++ b/src/main/resources/too_many_options_pie.fxml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ScrollPane?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Pane?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
+<?import javafx.scene.text.Text?>
+
+<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.45" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.PieChartErrorController">
+   <children>
+      <ScrollPane prefHeight="800.0" prefWidth="800.0">
+         <content>
+            <AnchorPane prefHeight="800.0" prefWidth="800.0">
+               <children>
+                  <HBox alignment="CENTER" prefHeight="300.0" prefWidth="583.0" AnchorPane.topAnchor="25.0">
+                     <children>
+                        <AnchorPane prefHeight="300.0" prefWidth="330.0">
+                           <children>
+                              <Pane layoutY="-6.0" prefHeight="60.0" prefWidth="330.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                                 <children>
+                                    <Text layoutX="21.0" layoutY="40.0" strokeType="OUTSIDE" strokeWidth="0.0" text="You have entered too many options for our graph to safely handle. ">
+                                       <font>
+                                          <Font size="24.0" />
+                                       </font></Text>
+                                 </children>
+                              </Pane>
+                              <Button layoutX="100.0" layoutY="125.0" mnemonicParsing="false" onAction="#ignoredWarning" text="Continue? (May cause slowdown and display issues" />
+                           </children>
+                        </AnchorPane>
+                        <AnchorPane prefHeight="300.0" prefWidth="253.0">
+                           <children>
+                              <Pane layoutY="200.0" prefHeight="100.0" prefWidth="253.0">
+                                 <padding>
+                                    <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+                                 </padding>
+                              </Pane>
+                              <Pane prefHeight="200.0" prefWidth="253.0">
+                                 <padding>
+                                    <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+                                 </padding>
+                                 <children>
+                                    <Button layoutX="100.0" layoutY="124.0" mnemonicParsing="false" onAction="#backToSafety" text="Abort (Add more filters to fix.)" />
+                                 </children>
+                              </Pane>
+                           </children>
+                        </AnchorPane>
+                     </children>
+                  </HBox>
+               </children>
+            </AnchorPane>
+         </content>
+      </ScrollPane>
+   </children>
+</VBox>

From c0ab7981232647afb5998046aa52deb95c3b8d71 Mon Sep 17 00:00:00 2001
From: Michael <mrw106@uclive.ac.nz>
Date: Sun, 2 Oct 2016 15:49:37 +1300
Subject: [PATCH 07/11] Minor bug fixes.

---
 .../group9/GUI/BarGraphController.java        | 18 ++--
 .../group9/GUI/PieChartErrorController.java   |  2 +-
 .../group9/GUI/PieChooserController.java      |  3 +-
 .../group9/GUI/PieGraphController.java        |  4 +-
 src/main/resources/pie_graph_chooser.fxml     | 82 +++++++++----------
 5 files changed, 52 insertions(+), 57 deletions(-)

diff --git a/src/main/java/seng202/group9/GUI/BarGraphController.java b/src/main/java/seng202/group9/GUI/BarGraphController.java
index c151226..14cd66a 100644
--- a/src/main/java/seng202/group9/GUI/BarGraphController.java
+++ b/src/main/java/seng202/group9/GUI/BarGraphController.java
@@ -36,7 +36,7 @@ public class BarGraphController extends Controller {
     public void build_graph(){
         //Takes routes from the full dataset.
         current_routes = currentdata.getRoutes();
-        datasetup(current_routes);
+        //datasetup(current_routes);
         //Builds series needed for the graph.
         XYChart.Series seriesArivals = new XYChart.Series();
         XYChart.Series seriesDeparts = new XYChart.Series();
@@ -83,11 +83,11 @@ public class BarGraphController extends Controller {
                 name = entry.getCountryName();
             }
             if (useddata.containsKey(name)){
-                int temp = useddata.get(name);
-                useddata.replace(name,temp+1);
+                //int temp = useddata.get(name);
+                //useddata.replace(name,temp+1);
             }else {
                 Integer temp = 1;
-                useddata.put(name,temp);
+                //useddata.put(name,temp);
             }
         }
     }
@@ -95,12 +95,12 @@ public class BarGraphController extends Controller {
 
     private void datasetupCustomRoute(ArrayList<Route> current_routes){
         //Takes out the specified field (Currently departure airport and arrival airport) then adds to the used data dict.
-        if(currentsession.getSelectedgraphagainst() = ""){
+        //if(currentsession.getSelectedgraphagainst() = ""){
 
-        }
+        //}
     }
 
-
+/**
             for (Route entry : current_routes){
         String departs = entry.getDepartureAirport();
         String arives = entry.getArrivalAirport();
@@ -125,7 +125,7 @@ public class BarGraphController extends Controller {
             useddata.put(arives,temp);
         }
     }
-
+*/
     /**
      * Takes the current dataset then loads the data to the graph using build graph.
      */
@@ -161,7 +161,7 @@ public class BarGraphController extends Controller {
             else{
                 d = currentdata.getAirlines();
             }
-            datasetupCustomarAirline(d);
+            //datasetupCustomarAirline(d);
         }
         else if (temp == "Routes") {
             ArrayList<Route> d = new ArrayList();
diff --git a/src/main/java/seng202/group9/GUI/PieChartErrorController.java b/src/main/java/seng202/group9/GUI/PieChartErrorController.java
index 3b2c89a..33f9547 100644
--- a/src/main/java/seng202/group9/GUI/PieChartErrorController.java
+++ b/src/main/java/seng202/group9/GUI/PieChartErrorController.java
@@ -14,7 +14,7 @@ public class PieChartErrorController extends Controller {
     }
 
     public void ignoredWarning() {
-        currentSession.setForceGraph(Boolean.TRUE);
+        currentSession.setForceGraph(true);
         replaceSceneContent(SceneCode.AIRPORT_ANALYSER);
     }
     public void backToSafety(){
diff --git a/src/main/java/seng202/group9/GUI/PieChooserController.java b/src/main/java/seng202/group9/GUI/PieChooserController.java
index b6be1d7..72254a4 100644
--- a/src/main/java/seng202/group9/GUI/PieChooserController.java
+++ b/src/main/java/seng202/group9/GUI/PieChooserController.java
@@ -47,7 +47,7 @@ public class PieChooserController extends Controller{
         currentsession.setSelectedDataToGraph(datatypechooser.getSelectionModel().getSelectedItem().toString());
         currentsession.setSelectedgraphagainst(graph_options.getSelectionModel().getSelectedItem().toString());
         currentsession.setUsefilter(usefilter.isSelected());
-        currentsession.setForceGraph(Boolean.FALSE);
+        currentsession.setForceGraph(false);
         replaceSceneContent(SceneCode.AIRPORT_ANALYSER);
     }
 
@@ -64,6 +64,7 @@ public class PieChooserController extends Controller{
                 changeTables();
             }
         });
+
         graph_options.setItems(airportOptions);
         graph_options.getSelectionModel().selectFirst();
         allOptions.add(airportOptions);
diff --git a/src/main/java/seng202/group9/GUI/PieGraphController.java b/src/main/java/seng202/group9/GUI/PieGraphController.java
index eb80465..75c82c8 100644
--- a/src/main/java/seng202/group9/GUI/PieGraphController.java
+++ b/src/main/java/seng202/group9/GUI/PieGraphController.java
@@ -44,7 +44,7 @@ public class PieGraphController extends Controller {
             pieChartData.add(new PieChart.Data(airport,temp));
         }
         //Gives the data to the graph.
-        if (useddata.keySet().size() > 50 && currentsession.getForceGraph()){
+        if (useddata.keySet().size() > 250 && currentsession.getForceGraph()){
             replaceSceneContent(SceneCode.CHART_ERROR);
         }
         else{
@@ -66,7 +66,7 @@ public class PieGraphController extends Controller {
             else if (currentsession.getSelectedgraphagainst() == "ICAO") {
                 name = entry.getICAO();
             }
-            else if (currentsession.getSelectedgraphagainst() == "IATA_FFA") {
+            else if (currentsession.getSelectedgraphagainst() == "IATA FFA") {
                 name = entry.getIATA_FFA();
             }
             else if (currentsession.getSelectedgraphagainst() == "City") {
diff --git a/src/main/resources/pie_graph_chooser.fxml b/src/main/resources/pie_graph_chooser.fxml
index 843111d..e2fd2f4 100644
--- a/src/main/resources/pie_graph_chooser.fxml
+++ b/src/main/resources/pie_graph_chooser.fxml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import java.lang.*?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.*?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.CheckBox?>
@@ -14,58 +19,47 @@
 <?import javafx.scene.text.Font?>
 <?import javafx.scene.text.Text?>
 
-<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.45" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.PieChooserController">
+<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.PieChooserController">
    <children>
-      <ScrollPane prefHeight="800.0" prefWidth="800.0">
-         <content>
-            <AnchorPane prefHeight="800.0" prefWidth="800.0">
+      <AnchorPane prefHeight="800.0" prefWidth="800.0">
+         <children>
+            <HBox alignment="CENTER" prefHeight="300.0" prefWidth="583.0" AnchorPane.topAnchor="25.0">
                <children>
-                  <HBox alignment="CENTER" prefHeight="300.0" prefWidth="583.0" AnchorPane.topAnchor="25.0">
+                  <AnchorPane prefHeight="300.0" prefWidth="330.0">
                      <children>
-                        <AnchorPane prefHeight="300.0" prefWidth="330.0">
+                        <Pane layoutY="-6.0" prefHeight="60.0" prefWidth="330.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                            <children>
-                              <Pane layoutY="-6.0" prefHeight="60.0" prefWidth="330.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                                 <children>
-                                    <Text layoutX="21.0" layoutY="40.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Pie Graph">
-                                       <font>
-                                          <Font size="29.0" />
-                                       </font>
-                                    </Text>
-                                 </children>
-                              </Pane>
+                              <Text layoutX="21.0" layoutY="40.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Pie Graph">
+                                 <font>
+                                    <Font size="29.0" />
+                                 </font>
+                              </Text>
                            </children>
-                        </AnchorPane>
-                        <AnchorPane prefHeight="300.0" prefWidth="253.0">
+                        </Pane>
+                     </children>
+                  </AnchorPane>
+                  <AnchorPane prefHeight="300.0" prefWidth="253.0">
+                     <children>
+                        <Pane prefHeight="200.0" prefWidth="253.0">
+                           <padding>
+                              <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+                           </padding>
                            <children>
-                              <Pane layoutY="200.0" prefHeight="100.0" prefWidth="253.0">
-                                 <padding>
-                                    <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
-                                 </padding>
-                                 <children>
-                                    <ListView fx:id="graph_options" layoutX="-35.0" layoutY="-50.0" prefHeight="200.0" prefWidth="200.0" />
-                                 </children>
-                              </Pane>
-                              <Pane prefHeight="200.0" prefWidth="253.0">
-                                 <padding>
-                                    <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
-                                 </padding>
-                                 <children>
-                                    <ChoiceBox fx:id="datatypechooser" layoutY="14.0" prefWidth="150.0" />
-                                    <Label layoutX="-6.0" layoutY="120.0" text="Values to be Graphed." />
-                                    <Label layoutX="15.0" layoutY="-7.0" text="Data Type Used" />
-                                 </children>
-                              </Pane>
+                              <ChoiceBox fx:id="datatypechooser" layoutY="14.0" prefWidth="150.0" />
+                              <Label layoutX="-6.0" layoutY="120.0" text="Values to be Graphed." />
+                              <Label layoutX="15.0" layoutY="-7.0" text="Data Type Used" />
                            </children>
-                        </AnchorPane>
+                        </Pane>
+                        <ListView fx:id="graph_options" layoutY="155.0" prefHeight="200.0" prefWidth="200.0" />
                      </children>
-                  </HBox>
-                  <Button layoutX="234.0" layoutY="413.0" mnemonicParsing="false" onAction="#buildGraph" text="Build Graph" />
-                  <Button layoutX="346.0" layoutY="413.0" mnemonicParsing="false" onAction="#newFilter" text="New Filter" />
-                  <Button layoutX="462.0" layoutY="413.0" mnemonicParsing="false" onAction="#toBarGraphChooser" text="Change Graph Type" />
-                  <CheckBox fx:id="usefilter" layoutX="356.0" layoutY="464.0" mnemonicParsing="false" text="Use filters from Raw Data" />
+                  </AnchorPane>
                </children>
-            </AnchorPane>
-         </content>
-      </ScrollPane>
+            </HBox>
+            <Button layoutX="234.0" layoutY="413.0" mnemonicParsing="false" onAction="#buildGraph" text="Build Graph" />
+            <Button layoutX="346.0" layoutY="413.0" mnemonicParsing="false" onAction="#newFilter" text="New Filter" />
+            <Button layoutX="462.0" layoutY="413.0" mnemonicParsing="false" onAction="#toBarGraphChooser" text="Change Graph Type" />
+            <CheckBox fx:id="usefilter" layoutX="356.0" layoutY="464.0" mnemonicParsing="false" text="Use filters from Raw Data" />
+         </children>
+      </AnchorPane>
    </children>
 </VBox>

From 028ea2dcce425c4bee91151c3a87030a8a883776 Mon Sep 17 00:00:00 2001
From: Michael <mrw106@uclive.ac.nz>
Date: Sun, 2 Oct 2016 16:00:38 +1300
Subject: [PATCH 08/11] Trying to make merge official.

---
 src/main/java/seng202/group9/GUI/PieGraphController.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/seng202/group9/GUI/PieGraphController.java b/src/main/java/seng202/group9/GUI/PieGraphController.java
index 75c82c8..62b9b65 100644
--- a/src/main/java/seng202/group9/GUI/PieGraphController.java
+++ b/src/main/java/seng202/group9/GUI/PieGraphController.java
@@ -46,6 +46,7 @@ public class PieGraphController extends Controller {
         //Gives the data to the graph.
         if (useddata.keySet().size() > 250 && currentsession.getForceGraph()){
             replaceSceneContent(SceneCode.CHART_ERROR);
+
         }
         else{
             pieGraph.setData(pieChartData);

From 2404c18d51cf549bb31a7b99d8146791d40a2292 Mon Sep 17 00:00:00 2001
From: Sunguin Peng <spe76@uclive.ac.nz>
Date: Sun, 2 Oct 2016 16:11:52 +1300
Subject: [PATCH 09/11] Changed JSwing component in new flight path.

---
 res/userdb.db                                 | Bin 8387584 -> 8387584 bytes
 .../seng202/group9/Controller/SceneCode.java  |   3 +-
 .../group9/GUI/FlightRDController.java        |  32 +-------
 .../seng202/group9/GUI/NewPathController.java |  58 ++++++++++++++
 .../java/seng202/group9/GUI/NewPathPopUp.java |  75 ------------------
 src/main/resources/new_flight_path.fxml       |  50 ++++++++++++
 6 files changed, 113 insertions(+), 105 deletions(-)
 create mode 100644 src/main/java/seng202/group9/GUI/NewPathController.java
 delete mode 100644 src/main/java/seng202/group9/GUI/NewPathPopUp.java
 create mode 100644 src/main/resources/new_flight_path.fxml

diff --git a/res/userdb.db b/res/userdb.db
index 475b3444f6f3a237d98f3897694db685fa4d7949..ec4da796782f0ae0a32ba4a05c1cc90f14c6e99d 100644
GIT binary patch
delta 749
zcmW;KJ5v*37{&4T-3_u4BW#upMnHo%yv87ch__%Aji`WPOyVU3NC=9G?s~r@js+GL
zT5Y8>egr4QS~!E9pTJJL%xGmp3OoHT&&;nmGta3`<?lbWg17B*>0L)cE`6FDG{W^z
zgW4nQf@ODGx#9V_*^-?b%iAUWRn=Im8WIXr_|Sk=XoLnoR-*}P5WreAqXjyG@VZ*v
zs$rS~0o^A|)0!z3Evry)zmJ%0K1J8vKcnV*pZx8<nK1LRsV?e52u&=DWoKbp-@X`0
znFyf`>k!6zw4(!^*no|QpbML@8C$Rw+t3ZKZwGc_7j|P0qS%WVdaw_@*pEK+;{XP5
z5Q8{`!#IMYIEFZea2yGoz)1|_6iy?FGZ?{HoWpsHVhrQBfQy*GC8Tf}X=ISa6<ozN
zTt^O*$YToAm_Y$W%%X%j+`vuD;}&k?4i<11_h7-seLTQJJi=o<!BafLbG&dPsq!z`
zrKn%kiW-+c)kfu;{Ghy6l5$GvlyMo9K~WPmXZ&;Gi&IONqfzsv9gwC72t)JEuY0@b
w?T^W{2(9GJE4ik7n~6E`OgSw3oNT82!w{lX8hkPoO%wi>WMaroX3Or!{~c}T2LJ#7

delta 742
zcmWm6%~KL_9LMqf?V_$0C~b?8SZELQNSaw@4=$k;SqVZQ^njoymi7epU=PrEu!Dy>
z?WtzCbn4P@*bW`K^%r!jE-};1>DZyk-h5|XxA*5;{<E%>@v1{qUVDO~@?mmNbFaA?
zlwMJsDHMH$OlW>?Hebv{vc<e(xvH&HH31n4Y-m6unxLW?E!cpKu)~2?w84o@sQ=n*
zRW)57usdv$u1Aw2<AK<4$oe{}x7%cg!&)2D-`K=&Yc;NCh1s8Twwa4l&K)b>gbo+l
zu?22yMF%|S#5Qb)7hUK^eY+F8up2(?!CvgcejLC-_;Cn5=*405;RyP16vr@t;~2yV
zoWv=d#t;kya0WpPV+0|b#W{p=9;3K`i@1a_L=eR|Vu<515=deKDWq`)S8)y3k-;Rg
z$YBc8n86LqB9A%T#4XHY0k?4ncX1E*Q9u!kcz}m^gvVII6FkK;Jh!}w(l5~^DW8?H
zVu<fbll(=zm0!wXk&`=xA$-z5sV3FT=*QqEvo=xk`vZYU+z9-fPJ7;~Ms{`R-H*RZ
z-L4l4cA-m}B&m|BN}@3ti^T}nO(Ruui#{`*Dt*&jBzAkNTEFI&deUQs(<Q6&AM5n%
AvH$=8

diff --git a/src/main/java/seng202/group9/Controller/SceneCode.java b/src/main/java/seng202/group9/Controller/SceneCode.java
index 205465d..e921a0e 100644
--- a/src/main/java/seng202/group9/Controller/SceneCode.java
+++ b/src/main/java/seng202/group9/Controller/SceneCode.java
@@ -13,7 +13,8 @@ public enum SceneCode {
     AIRPORT_ADD("airport_add_form.fxml"), AIRPORT_FILTER("airport_filter_form.fxml"), ROUTE_ADD("route_add_form.fxml"),
     ROUTE_FILTER("route_filter_form.fxml"), AIRLINE_EDIT("airline_edit_form.fxml"), AIRPORT_EDIT("airport_edit_form.fxml"),
     ROUTE_EDIT("route_edit_form.fxml"), FLIGHT_EDITOR("flight_editor_form.fxml"), DATASET_CONTROLLER("dataset_editor.fxml"), HELP("help.fxml"),
-    FLIGHT_ADD("flight_add_form.fxml"), ROUTE_BY_AIRPORT("airport_map_routes.fxml"), ROUTE_BY_EQUIP("route_by_equip.fxml");
+    FLIGHT_ADD("flight_add_form.fxml"), ROUTE_BY_AIRPORT("airport_map_routes.fxml"), ROUTE_BY_EQUIP("route_by_equip.fxml"),
+    FLIGHT_PATH_ADD("new_flight_path.fxml");
 
 
     private String filePath;
diff --git a/src/main/java/seng202/group9/GUI/FlightRDController.java b/src/main/java/seng202/group9/GUI/FlightRDController.java
index e85c131..399dfdd 100644
--- a/src/main/java/seng202/group9/GUI/FlightRDController.java
+++ b/src/main/java/seng202/group9/GUI/FlightRDController.java
@@ -56,25 +56,6 @@ public class FlightRDController extends Controller {
     ListView<String> flightPathListView;
     private ObservableList<String> flightList = FXCollections.observableArrayList();
 
-//    @FXML
-//    private TextField flightNameBox;
-//    @FXML
-//    private TextField flightTypeBox;
-//    @FXML
-//    private TextField flightViaBox;
-//    @FXML
-//    private TextField flightAltitudeBox;
-//    @FXML
-//    private TextField flightLatitudeBox;
-//    @FXML
-//    private TextField flightLongitudeBox;
-//    @FXML
-//    private TextField flightHeadingBox;
-//    @FXML
-//    private TextField flightLegDistBox;
-//    @FXML
-//    private TextField flightTotDistBox;
-
     /**
      * Loads the Flight paths into the List View and waits for a mouse clicked event for which it will update the table
      * to display the selected Flight paths points. Called from the MenuController.
@@ -166,16 +147,9 @@ public class FlightRDController extends Controller {
      * Creates a pop up dialog which prompts the user for two ICAO airport codes which will use when creating a new path.
      */
     public void newPath() {
-        NewPathPopUp dialogBox = new NewPathPopUp();
-        dialogBox.display();
-        String destAirport = dialogBox.getDestinationAirport();
-        String sourceAirport = dialogBox.getSourceAirport();
-
-        if (destAirport != null && sourceAirport != null){
-            theDataSet.addFlightPath(sourceAirport, destAirport);
-            flightPathListView.getItems().clear();
-            flightPathListView();
-        }
+        createPopUpStage(SceneCode.FLIGHT_PATH_ADD, 500, 240);
+        flightPathListView.getItems().clear();
+        flightPathListView();
     }
     /**
      *  Removes the selected point from the table and database.
diff --git a/src/main/java/seng202/group9/GUI/NewPathController.java b/src/main/java/seng202/group9/GUI/NewPathController.java
new file mode 100644
index 0000000..0395f6a
--- /dev/null
+++ b/src/main/java/seng202/group9/GUI/NewPathController.java
@@ -0,0 +1,58 @@
+package seng202.group9.GUI;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.Alert;
+import javafx.scene.control.Button;
+import javafx.scene.control.TextField;
+import javafx.stage.Stage;
+import seng202.group9.Controller.Dataset;
+import seng202.group9.Controller.EntryParser;
+
+/**
+ * The controller class for new_flight_path.fxml.
+ * Created by Sunguin.
+ */
+public class NewPathController extends Controller {
+    @FXML
+    private TextField sourceAirport;
+    @FXML
+    private TextField destinationAirport;
+    @FXML
+    private Button addButton;
+
+    private Dataset theDataSet = null;
+
+    public void load() {
+        theDataSet = getParent().getCurrentDataset();
+    }
+
+    /**
+     * Attempts to add a new flight path. First uses the entry parser to check for valid ICAO codes.
+     */
+    public void addPath() {
+        EntryParser airportCheck = new EntryParser();
+        try {
+            airportCheck.parsePointName(sourceAirport.getText());
+            airportCheck.parsePointName(destinationAirport.getText());
+            theDataSet.addFlightPath(sourceAirport.getText(), destinationAirport.getText());
+
+            //Saying to the user that the flight path has successfully added.
+            Alert alert = new Alert(Alert.AlertType.INFORMATION);
+            alert.setTitle("Flight Path Add Successful");
+            alert.setHeaderText("New Flight Path added!");
+            alert.setContentText("Your new flight path has been successfully added into the database.");
+            alert.showAndWait();
+
+            //Closes the add form.
+            Stage stage = (Stage) addButton.getScene().getWindow();
+            stage.close();
+        } catch (Exception e) {
+            //Tells the user what and where the error is.
+            Alert alert = new Alert(Alert.AlertType.ERROR);
+            alert.setTitle("Flight Path Data Error");
+            alert.setHeaderText("Error adding a custom flight path entry.");
+            alert.setContentText(e.getMessage());
+            alert.showAndWait();
+        }
+    }
+}
diff --git a/src/main/java/seng202/group9/GUI/NewPathPopUp.java b/src/main/java/seng202/group9/GUI/NewPathPopUp.java
deleted file mode 100644
index a219a9d..0000000
--- a/src/main/java/seng202/group9/GUI/NewPathPopUp.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package seng202.group9.GUI;
-
-import javafx.scene.control.Alert;
-import seng202.group9.Controller.DataException;
-import seng202.group9.Controller.EntryParser;
-import seng202.group9.Core.FlightPoint;
-
-import javax.swing.*;
-import java.awt.*;
-
-import static java.awt.Color.red;
-
-/**
- * Creates the pop up box where the user will enter the Source and Destination airports for the path name, will reject
- * empty strings, strings of length 4 and characters that are not A-Z. Will convert lowercase to uppercase.
- * Created by Liam Beckett on 17/09/2016.
- */
-public class NewPathPopUp {
-
-    private String sourceAirport = null;
-    private String destinationAirport = null;
-    // Creates and displays the pop up box for the user to input data.
-    public void display() {
-        JTextField field1 = new JTextField();
-        JTextField field2 = new JTextField();
-        JPanel panel = new JPanel(new GridLayout(0, 1));
-        panel.add(new JLabel("Source Airport ICAO Code" ));
-        panel.add(field1);
-        panel.add(new JLabel("Destination Airport ICAO Code: "));
-        panel.add(field2);
-        int result = JOptionPane.showConfirmDialog(null, panel, "Test",
-                JOptionPane.OK_CANCEL_OPTION, JOptionPane.PLAIN_MESSAGE);
-        if (result == JOptionPane.OK_OPTION) {
-                sourceAirport = field1.getText().toUpperCase();
-                destinationAirport = field2.getText().toUpperCase();
-            try{
-                EntryParser parser = new EntryParser();
-                parser.parsePointName(sourceAirport);
-            }catch (DataException e){
-                sourceAirport = null;
-                destinationAirport = null;
-                Alert alert = new Alert(Alert.AlertType.ERROR);
-                alert.setTitle("Flight Path Name Error");
-                alert.setHeaderText("Error adding the Source airport ICAO code.");
-                alert.setContentText(e.getMessage());
-                alert.showAndWait();
-            }
-            try{
-                EntryParser parser = new EntryParser();
-                parser.parsePointName(destinationAirport);
-            }catch (DataException e){
-                sourceAirport = null;
-                destinationAirport = null;
-                Alert alert = new Alert(Alert.AlertType.ERROR);
-                alert.setTitle("Flight Path Name Error");
-                alert.setHeaderText("Error adding the Destination airport ICAO code.");
-                alert.setContentText(e.getMessage());
-                alert.showAndWait();
-            }
-        } else {
-            sourceAirport = null;
-            destinationAirport = null;
-        }
-    }
-
-    public String getSourceAirport() {
-        return sourceAirport;
-    }
-
-    public String getDestinationAirport() {
-        return destinationAirport;
-    }
-}
-
-
diff --git a/src/main/resources/new_flight_path.fxml b/src/main/resources/new_flight_path.fxml
new file mode 100644
index 0000000..a9c0f08
--- /dev/null
+++ b/src/main/resources/new_flight_path.fxml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.text.Font?>
+<?import javafx.scene.text.Text?>
+
+<GridPane hgap="10.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="240.0" prefWidth="500.0" vgap="10.0" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/8.0.60" fx:controller="seng202.group9.GUI.NewPathController">
+  <columnConstraints>
+    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="250.0" />
+    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="250.0" />
+  </columnConstraints>
+  <rowConstraints>
+    <RowConstraints minHeight="10.0" prefHeight="60.0" vgrow="SOMETIMES" />
+    <RowConstraints minHeight="10.0" prefHeight="60.0" vgrow="SOMETIMES" />
+    <RowConstraints minHeight="10.0" prefHeight="60.0" vgrow="SOMETIMES" />
+      <RowConstraints minHeight="10.0" prefHeight="60.0" vgrow="SOMETIMES" />
+  </rowConstraints>
+   <children>
+      <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Add New Flight Path" textAlignment="CENTER" GridPane.columnSpan="2" GridPane.halignment="CENTER" GridPane.valignment="CENTER">
+         <font>
+            <Font size="18.0" />
+         </font>
+         <GridPane.margin>
+            <Insets />
+         </GridPane.margin>
+      </Text>
+      <Label text="Source Airport ICAO Code" GridPane.rowIndex="1">
+         <GridPane.margin>
+            <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
+         </GridPane.margin>
+      </Label>
+      <Label text="Desination Airport ICAO Code" GridPane.rowIndex="2">
+         <GridPane.margin>
+            <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
+         </GridPane.margin>
+      </Label>
+      <TextField fx:id="sourceAirport" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+      <TextField fx:id="destinationAirport" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+      <Button fx:id="addButton" mnemonicParsing="false" onAction="#addPath" text="Add New Flight Path" GridPane.columnIndex="1" GridPane.halignment="RIGHT" GridPane.rowIndex="3" />
+   </children>
+   <padding>
+      <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+   </padding>
+</GridPane>

From 7f42e7f59b39e2c66c9dc3aa0118b6342c1284f6 Mon Sep 17 00:00:00 2001
From: Sunguin Peng <spe76@uclive.ac.nz>
Date: Sun, 2 Oct 2016 16:22:30 +1300
Subject: [PATCH 10/11] Fixed success message in airport filter

---
 res/userdb.db                                 | Bin 8387584 -> 8387584 bytes
 .../group9/GUI/AirportFilterController.java   |   8 +++-----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/res/userdb.db b/res/userdb.db
index ec4da796782f0ae0a32ba4a05c1cc90f14c6e99d..d59f6896c499b7fa3e28a2fe8b5e0dc367d087fc 100644
GIT binary patch
delta 544
zcmWNNIa5<n07mb9FPInsgZkVc2yVFGz8jTjP=X>ZiE@bBHH!Pb?}^3zhEl6^&hR6g
zv@#Yp{sqSdXKZX73&ut>-<;yioa(Di{|l=P-nHAw_Z>Mq`PO-7y$iexy^DF*<lPMK
z;@%~^o9SKByII~fd)MM!t9P@#OL^Dk-5l@cdN=Q*izWtQ;cpYvoAS}GFfzupM$vF7
zmmet<3dx2B;h%bZDEb?ZhY8bXr%kP^xhGT06{CKesE-$;YLIGVDf6Q-V-jY{Ox3=Q
zwfz*4m@gKHg<_FdEZRkfNQ+LfM0AO6u~aM*%f$+@QuK&bVzpQ!){0)SPOKLj#7416
zY!+L@R<TWN7dymGu}kb08L>y~75hY=$cp{qfXIn{aZnr*10pX5#bI$o42h#+SR50_
z#R+jz6hu*+5~sz8K#Yo#I3v!AbK<<XAe^`;%Hoo^EXKqYaaCLs*ToHSQ`{1_#T{{1
z+!Oc31MyHi5|70b@l-q$&&3PzQoItc#hcESAZ?PiY{E}rHO$&?VLbR^KLq2!pe@^M
Zy^~7D+H|cnTKODn{N7vdE>*ry{0Hq~yRQHM

delta 532
zcmWm3M^jT_97gfH_XeXeQ6gR&MX+J-*rE~)N>Id-D2LeoQtZ9=gvI*|OI>B>3?IVD
z5@%ev_5(OBT<e-~qqsPW-<;~q->^E{`(`)&p(XF8C(N7k7I+K2#l1Cno8v9vZLYU@
z-jd$tdrNssdt2abp|?hF8E=ccHF;b7$)c&gcq|qR>kWnIR~V&|@mLfMmh*+7VzHR~
zf5PAO#6a{Xk(fn~n~BxhQ=Qpbz7+Mk#`<I_ss^>(XeO$C8_)a{kys*@ie+NCSRtB4
zi)a;XVx?#o9b%POE!K#&Vx8y|>%|7KQEU>M#TKzuY!lnX4zW}061zp0*dz9eePX{j
zAhP11I3x~>Zjlo`;)uwLUU5_$6Mdo}`o(c^LJWwLVo;nCr^Oj@Run}^oD=88kU$KJ
zvbZ2Fic8|MxFSqk6(eF)jEQk^O<Wf@#7%Ka+!lAlU2#v`7Z1ck@kl%tPsCI4OgtAa
z#7pr?ycTc7Tk)<f?TDpZE(kw|)iCG2hl${;`xs0H{ca>^t+!FhI@eVz4_Cg#n<mE6
K^^S7o$J9Tps<}=8

diff --git a/src/main/java/seng202/group9/GUI/AirportFilterController.java b/src/main/java/seng202/group9/GUI/AirportFilterController.java
index bb99f0f..f54236b 100644
--- a/src/main/java/seng202/group9/GUI/AirportFilterController.java
+++ b/src/main/java/seng202/group9/GUI/AirportFilterController.java
@@ -92,13 +92,11 @@ public class AirportFilterController extends Controller {
             filter.filterOlson(airpTzFilter.getText());
         }
         Alert alert = new Alert(Alert.AlertType.INFORMATION);
-        alert.setTitle("Airline Filter Successful");
-        alert.setHeaderText("Airline data filtered!");
-        alert.setContentText("Your airline data has been successfully filtered.");
+        alert.setTitle("Airport Filter Successful");
+        alert.setHeaderText("Airport data filtered!");
+        alert.setContentText("Your airport data has been successfully filtered.");
         alert.showAndWait();
 
-        //currentSession.setFilteredAirlines(FXCollections.observableArrayList(filter.getFilteredData()));
-
         HashMap<Integer, String> airportsHM = new HashMap<Integer, String>();
         ArrayList<Airport> airports = filter.getFilteredData();
         for (int index = 0; index < airports.size(); index++) {

From 85c1389557541849059efa24907eb9e0502d27a8 Mon Sep 17 00:00:00 2001
From: Michael <mrw106@uclive.ac.nz>
Date: Sun, 2 Oct 2016 16:24:39 +1300
Subject: [PATCH 11/11] Made error message report correctly.

---
 pom.xml                                       |  4 +-
 .../group9/GUI/BarChooserController.java      |  3 +
 .../group9/GUI/BarGraphController.java        | 62 +++++--------------
 .../group9/GUI/PieChooserController.java      |  7 ++-
 .../group9/GUI/PieGraphController.java        |  9 ++-
 src/main/java/seng202/group9/Map/Map.java     |  2 +-
 6 files changed, 34 insertions(+), 53 deletions(-)

diff --git a/pom.xml b/pom.xml
index 471603b..cc6b58c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,8 +55,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
+					<source>1.7</source>
+					<target>1.7</target>
 				</configuration>
 			</plugin>
 		</plugins>
diff --git a/src/main/java/seng202/group9/GUI/BarChooserController.java b/src/main/java/seng202/group9/GUI/BarChooserController.java
index c7441b9..19089cf 100644
--- a/src/main/java/seng202/group9/GUI/BarChooserController.java
+++ b/src/main/java/seng202/group9/GUI/BarChooserController.java
@@ -58,6 +58,9 @@ public class BarChooserController extends Controller{
     }
 
     public void load(){
+        if (!checkDataset()){
+            return;
+        }
         datatypechooser.setItems(FXCollections.observableArrayList("Airports","Airlines","Routes"));
         datatypechooser.getSelectionModel().selectFirst();
         datatypechooser.getSelectionModel().selectedIndexProperty().addListener(new ChangeListener<Number>() {
diff --git a/src/main/java/seng202/group9/GUI/BarGraphController.java b/src/main/java/seng202/group9/GUI/BarGraphController.java
index 14cd66a..ea75d83 100644
--- a/src/main/java/seng202/group9/GUI/BarGraphController.java
+++ b/src/main/java/seng202/group9/GUI/BarGraphController.java
@@ -30,6 +30,7 @@ public class BarGraphController extends Controller {
     private HashMap<String, ArrayList> useddata = new HashMap<String, ArrayList>();
     private Session currentsession;
 
+
     /**
      * Takes data from the current dataset and places it into the displayed bar graph.
      */
@@ -63,35 +64,30 @@ public class BarGraphController extends Controller {
     private String departureAirport;
     private String arrivalAirport;
 
-    private void datasetupCustomarAirport(ArrayList<Airport> current_air_ports){
+/**    private void datasetupCustomarAirport(ArrayList<Airport> current_air_ports){
         //Takes out the specified field  then adds to the used data dict.
         for (Airport entry : current_air_ports){
-            String name = "Error";
-            if (currentsession.getSelectedgraphagainst() == "Name") {
-                name = entry.getName();
-            }
-            else if (currentsession.getSelectedgraphagainst() == "ICAO") {
+            currentsession.getSelectedgraphagainst() == "Name";
+            name = entry.getName();
+            currentsession.getSelectedgraphagainst() == "ICAO";
                 name = entry.getICAO();
-            }
-            else if (currentsession.getSelectedgraphagainst() == "IATA_FFA") {
+            currentsession.getSelectedgraphagainst() == "IATA_FFA"
                 name = entry.getIATA_FFA();
-            }
-            else if (currentsession.getSelectedgraphagainst() == "City") {
-                name = entry.getCityName();
-            }
-            else if (currentsession.getSelectedgraphagainst() == "Country") {
-                name = entry.getCountryName();
-            }
+            currentsession.getSelectedgraphagainst() == "City"
+
+            currentsession.getSelectedgraphagainst() == "Country"
+            name = entry.getCountryName();
+
             if (useddata.containsKey(name)){
-                //int temp = useddata.get(name);
-                //useddata.replace(name,temp+1);
+                int temp = useddata.get(name);
+                useddata.replace(name,temp+1);
             }else {
                 Integer temp = 1;
-                //useddata.put(name,temp);
+                useddata.put(name,temp);
             }
         }
     }
-
+*/
 
     private void datasetupCustomRoute(ArrayList<Route> current_routes){
         //Takes out the specified field (Currently departure airport and arrival airport) then adds to the used data dict.
@@ -100,32 +96,6 @@ public class BarGraphController extends Controller {
         //}
     }
 
-/**
-            for (Route entry : current_routes){
-        String departs = entry.getDepartureAirport();
-        String arives = entry.getArrivalAirport();
-        if (useddata.containsKey(departs)){
-            ArrayList<Integer> temp = useddata.get(departs);
-            temp.add(1,temp.get(1)+1);
-            useddata.replace(departs,temp);
-        }else {
-            ArrayList<Integer> temp = new ArrayList<Integer>(2);
-            temp.add(0);
-            temp.add(1);
-            useddata.put(departs,temp);
-        }
-        if (useddata.containsKey(arives)){
-            ArrayList<Integer> temp = useddata.get(arives);
-            temp.add(0,temp.get(0)+1);
-            useddata.replace(arives,temp);
-        }else {
-            ArrayList<Integer> temp = new ArrayList<Integer>(2);
-            temp.add(1);
-            temp.add(0);
-            useddata.put(arives,temp);
-        }
-    }
-*/
     /**
      * Takes the current dataset then loads the data to the graph using build graph.
      */
@@ -146,7 +116,7 @@ public class BarGraphController extends Controller {
             else{
                 d = currentdata.getAirports();
             }
-            datasetupCustomarAirport(d);
+            //datasetupCustomarAirport(d);
         }
         else if (temp == "Airlines"){
             ArrayList<Airline> d = new ArrayList();
diff --git a/src/main/java/seng202/group9/GUI/PieChooserController.java b/src/main/java/seng202/group9/GUI/PieChooserController.java
index 72254a4..8cc6db8 100644
--- a/src/main/java/seng202/group9/GUI/PieChooserController.java
+++ b/src/main/java/seng202/group9/GUI/PieChooserController.java
@@ -57,6 +57,9 @@ public class PieChooserController extends Controller{
     }
 
     public void load(){
+        if (!checkDataset()){
+            return;
+        }
         datatypechooser.setItems(FXCollections.observableArrayList("Airports","Airlines","Routes"));
         datatypechooser.getSelectionModel().selectFirst();
         datatypechooser.getSelectionModel().selectedIndexProperty().addListener(new ChangeListener<Number>() {
@@ -74,10 +77,10 @@ public class PieChooserController extends Controller{
 
     public void newFilter(){
         if (datatypechooser.getSelectionModel().getSelectedItem().toString() == "Airports"){
-            createPopUpStage(SceneCode.AIRPORT_FILTER, 600, 330);
+            createPopUpStage(SceneCode.AIRPORT_FILTER, 600, 480);
         }
         else if (datatypechooser.getSelectionModel().getSelectedItem().toString() == "Airlines"){
-            createPopUpStage(SceneCode.AIRLINE_FILTER, 600, 330);
+            createPopUpStage(SceneCode.AIRLINE_FILTER, 600, 370);
         }
         else if (datatypechooser.getSelectionModel().getSelectedItem().toString() == "Routes"){
             createPopUpStage(SceneCode.ROUTE_FILTER, 600, 330);
diff --git a/src/main/java/seng202/group9/GUI/PieGraphController.java b/src/main/java/seng202/group9/GUI/PieGraphController.java
index 62b9b65..34357e9 100644
--- a/src/main/java/seng202/group9/GUI/PieGraphController.java
+++ b/src/main/java/seng202/group9/GUI/PieGraphController.java
@@ -44,9 +44,8 @@ public class PieGraphController extends Controller {
             pieChartData.add(new PieChart.Data(airport,temp));
         }
         //Gives the data to the graph.
-        if (useddata.keySet().size() > 250 && currentsession.getForceGraph()){
+        if (useddata.keySet().size() > 250 && !currentsession.getForceGraph()){
             replaceSceneContent(SceneCode.CHART_ERROR);
-
         }
         else{
             pieGraph.setData(pieChartData);
@@ -70,6 +69,9 @@ public class PieGraphController extends Controller {
             else if (currentsession.getSelectedgraphagainst() == "IATA FFA") {
                 name = entry.getIATA_FFA();
             }
+            else if (currentsession.getSelectedgraphagainst() == "Altitude") {
+                name = String.valueOf(entry.getAltitude());
+            }
             else if (currentsession.getSelectedgraphagainst() == "City") {
                 name = entry.getCityName();
             }
@@ -149,6 +151,9 @@ public class PieGraphController extends Controller {
      * Takes the current dataset then loads the data to the graph using build graph.
      */
     public void load() {
+        if (!checkDataset()){
+            return;
+        }
         currentdata = getParent().getCurrentDataset();
         currentsession = this.getParent().getSession();
         String temp = currentsession.getSelectedDataToGraph();
diff --git a/src/main/java/seng202/group9/Map/Map.java b/src/main/java/seng202/group9/Map/Map.java
index 177c11d..a7cca17 100644
--- a/src/main/java/seng202/group9/Map/Map.java
+++ b/src/main/java/seng202/group9/Map/Map.java
@@ -35,7 +35,7 @@ public class Map {
             });
     }
 
-    public Map(WebView webView, final RoutePath newRoute, TableView table){
+    public Map(WebView webView, final RoutePath newRoute, final TableView table){
         this.webView = webView;
         webEngine = webView.getEngine();
         initMap();