Michael Wilson
9 years ago
parent
8ac6606b76
commit
9141f5abf3
@ -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);
|
||||
}
|
||||
}
|
||||
@ -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();
|
||||
}
|
||||
|
||||
}
|
||||
@ -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);
|
||||
}
|
||||
}
|
||||
@ -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();
|
||||
}
|
||||
}
|
||||
@ -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>
|
||||
@ -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>
|
||||
Loading…
Reference in new issue