Merge remote-tracking branch 'origin/master'

This commit is contained in:
Michael
2016-09-15 16:14:23 +12:00
2 changed files with 25 additions and 1 deletions
@@ -2,12 +2,17 @@ package seng202.group9.GUI;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
import javafx.event.ActionEvent;
import javafx.event.EventHandler;
import javafx.fxml.FXML;
import javafx.fxml.Initializable;
import javafx.scene.control.Button;
import javafx.scene.control.ListView;
import javafx.scene.control.TableView;
import seng202.group9.Controller.App;
import seng202.group9.Controller.Dataset;
import seng202.group9.Core.FlightPath;
import seng202.group9.Core.FlightPoint;
import java.net.URL;
import java.util.ArrayList;
@@ -26,6 +31,9 @@ public class FlightSummaryController implements Initializable {
this.parent = parent;
}
@FXML
private Button flightRawData;
@FXML
ListView<String> flightPathListView;
final ObservableList<String> flightList = FXCollections.observableArrayList();
@@ -52,6 +60,22 @@ public class FlightSummaryController implements Initializable {
}
}
/**
* Changes to the Flight Raw Data Scene when the Raw Data Button is clicked
*/
public void handleRawDataButton() {
try {
FlightRawDataController rawDataController = (FlightRawDataController)
parent.replaceSceneContent("flight_raw_data.fxml");
rawDataController.setApp(parent);
rawDataController.loadTables();
rawDataController.flightPathListView();
}
catch (Exception e) {
e.printStackTrace();
}
}
public void initialize(URL arg0, ResourceBundle arg1) {
// TODO Auto-generated method stub