Merge remote-tracking branch 'remotes/origin/master' into WIP_Update_list

src/main/java/seng202/group9/Controller/SceneCode.java

@@ -7,7 +7,7 @@ public enum SceneCode {
     INITIAL(""), AIRLINE_SUMMARY("airline_summary.fxml"), AIRLINE_RAW_DATA("airline_raw_data.fxml"),
     AIRPORT_SUMMARY("airport_summary.fxml"), AIRPORT_RAW_DATA("airport_raw_data.fxml"),
     ROUTE_SUMMARY("routes_summary.fxml"), ROUTE_RAW_DATA("route_raw_data.fxml"), FLIGHT_SUMMARY("flight_data_summary.fxml"),
-    FLIGHT_RAW_DATA("flight_raw_data.fxml"), ROUTE_ANALYSER("route_analyser.fxml");
+    FLIGHT_RAW_DATA("flight_raw_data.fxml"), AIRPORT_ANALYSER("airport_analyser.fxml"), ROUTE_ANALYSER("route_analyser.fxml");;
 
     private String filePath;
 

src/main/java/seng202/group9/GUI/AirportAnalyser.java

@@ -0,0 +1,59 @@
+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;
+
+/**
+ * Created by michael on 17/09/2016.
+ */
+public class AirportAnalyser extends Controller {
+    @FXML
+    PieChart pieGraph;
+
+    private Dataset currentdata = null;
+    private HashMap<String, Integer> useddata = new HashMap<String, Integer>();
+
+    private ArrayList<Airline> current_routes;
+    public void build_graph(){
+        current_routes = currentdata.getAirlines();
+        datasetup(current_routes);
+        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));
+        }
+        pieGraph.setData(pieChartData);
+    }
+
+    private void datasetup(ArrayList<Airline> current_routes){
+        for (Airline entry : current_routes){
+            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);
+            }
+        }
+    }
+
+    public void load() {
+        currentdata = getParent().getCurrentDataset();
+        build_graph();
+    }
+
+}

src/main/java/seng202/group9/GUI/AirportRDController.java

@@ -14,6 +14,7 @@ import javafx.scene.control.cell.PropertyValueFactory;
 import javafx.util.Callback;
 import seng202.group9.Controller.App;
 import seng202.group9.Controller.Dataset;
+import seng202.group9.Controller.SceneCode;
 import seng202.group9.Core.Airport;
 import seng202.group9.Core.City;
 import seng202.group9.Core.Country;
@@ -146,5 +147,7 @@ public class AirportRDController extends Controller{
             alert.showAndWait();
         }
     }
-
+    public void airportAnalyserButton(){
+        replaceSceneContent(SceneCode.AIRPORT_ANALYSER);
+    }
 }

src/main/java/seng202/group9/GUI/RouteAnalyser.java

@@ -1,23 +1,15 @@
 package seng202.group9.GUI;
 
-import javafx.collections.FXCollections;
+
 import javafx.fxml.FXML;
 import javafx.scene.chart.BarChart;
-import javafx.scene.chart.CategoryAxis;
-import javafx.scene.chart.NumberAxis;
 import javafx.scene.chart.XYChart;
-import javafx.scene.control.Alert;
-import javafx.scene.control.TableColumn;
-import javafx.scene.control.TableView;
-import javafx.scene.control.TextField;
-import javafx.scene.control.cell.PropertyValueFactory;
 import seng202.group9.Controller.App;
 import seng202.group9.Controller.Dataset;
 import seng202.group9.Core.Route;
-
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
+
 
 /**
  * Created by michael on 16/09/2016.

src/main/resources/airport_analyser.fxml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.chart.PieChart?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.Pane?>
+<?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.text.Font?>
+
+<GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="568.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.45" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.AirportAnalyser">
+  <columnConstraints>
+    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+  </columnConstraints>
+  <rowConstraints>
+    <RowConstraints maxHeight="457.0" minHeight="10.0" prefHeight="403.0" vgrow="SOMETIMES" />
+    <RowConstraints maxHeight="129.0" minHeight="10.0" prefHeight="111.0" vgrow="SOMETIMES" />
+  </rowConstraints>
+   <children>
+      <Pane prefHeight="600.0" prefWidth="800.0" GridPane.columnSpan="2" GridPane.rowSpan="2">
+         <children>
+            <Label layoutX="14.0" layoutY="14.0" text="Airport Analyser">
+               <font>
+                  <Font size="29.0" />
+               </font>
+            </Label>
+            <Pane layoutX="15.0" layoutY="60.0" prefHeight="403.0" prefWidth="772.0">
+               <children>
+                  <PieChart fx:id="pieGraph" prefHeight="400.0" prefWidth="772.0" title="Airports per country" />
+               </children></Pane>
+         </children>
+      </Pane>
+   </children>
+</GridPane>

src/main/resources/airport_raw_data.fxml

@@ -14,7 +14,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.60" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.AirportRDController">
+<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.AirportRDController">
   <columnConstraints>
     <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
     <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
@@ -91,7 +91,7 @@
                   </Pane>
                </content>
             </ScrollPane>
-            <Button layoutX="14.0" layoutY="526.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="125.0" text="Analyse" />
+            <Button layoutX="14.0" layoutY="526.0" mnemonicParsing="false" onAction="#airportAnalyserButton" prefHeight="25.0" prefWidth="125.0" text="Analyse" />
             <Button layoutX="662.0" layoutY="526.0" mnemonicParsing="false" onAction="#addAirportSingle" prefHeight="25.0" prefWidth="125.0" text="Add" />
             <Pane layoutX="15.0" layoutY="60.0" prefHeight="403.0" prefWidth="772.0">
                <children>