From 85c1389557541849059efa24907eb9e0502d27a8 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 2 Oct 2016 16:24:39 +1300 Subject: [PATCH] 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 org.apache.maven.plugins maven-compiler-plugin - 1.8 - 1.8 + 1.7 + 1.7 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() { 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 useddata = new HashMap(); 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 current_air_ports){ +/** private void datasetupCustomarAirport(ArrayList 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 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 temp = useddata.get(departs); - temp.add(1,temp.get(1)+1); - useddata.replace(departs,temp); - }else { - ArrayList temp = new ArrayList(2); - temp.add(0); - temp.add(1); - useddata.put(departs,temp); - } - if (useddata.containsKey(arives)){ - ArrayList temp = useddata.get(arives); - temp.add(0,temp.get(0)+1); - useddata.replace(arives,temp); - }else { - ArrayList temp = new ArrayList(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 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() { @@ -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();