fanwuyang
/
SENG202
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made error message report correctly.

Browse Source
main
Michael 9 years ago
parent 7f42e7f59b
commit 85c1389557
6 changed files with 34 additions and 53 deletions
Show Stats Download Patch File Download Diff File

4
pom.xml
Unescape View File

@ -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>

3
src/main/java/seng202/group9/GUI/BarChooserController.java
Unescape View File

@ -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>() {

62
src/main/java/seng202/group9/GUI/BarGraphController.java
Unescape View File

@ -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();

7
src/main/java/seng202/group9/GUI/PieChooserController.java
Unescape View File

@ -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);

9
src/main/java/seng202/group9/GUI/PieGraphController.java
Unescape View File

@ -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();

2
src/main/java/seng202/group9/Map/Map.java
Unescape View File

@ -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();

Write Preview
Loading…
Cancel
Save