diff --git a/src/main/java/seng202/group9/Controller/App.java b/src/main/java/seng202/group9/Controller/App.java index 56673fd..da3dbde 100644 --- a/src/main/java/seng202/group9/Controller/App.java +++ b/src/main/java/seng202/group9/Controller/App.java @@ -101,12 +101,14 @@ public class App extends Application System.out.println(currentDataset.importRoute("res/Samples/Routes.txt")); } catch (DataException e) { e.printStackTrace(); - } + }*/ + + //testing out flight parser try { System.out.println(currentDataset.importFlight("res/Samples/NZCH-WSSS.csv")); } catch (DataException e) { e.printStackTrace(); - }*/ + } } diff --git a/src/main/java/seng202/group9/GUI/FlightRawDataController.java b/src/main/java/seng202/group9/GUI/FlightRawDataController.java index 4d11ec4..f555e7b 100644 --- a/src/main/java/seng202/group9/GUI/FlightRawDataController.java +++ b/src/main/java/seng202/group9/GUI/FlightRawDataController.java @@ -2,12 +2,14 @@ package seng202.group9.GUI; import javafx.collections.FXCollections; import javafx.collections.ObservableList; +import javafx.event.EventHandler; import javafx.fxml.FXML; import javafx.fxml.Initializable; import javafx.scene.control.ListView; import javafx.scene.control.TableColumn; import javafx.scene.control.TableView; import javafx.scene.control.cell.PropertyValueFactory; +import javafx.scene.input.MouseEvent; import seng202.group9.Controller.App; import seng202.group9.Controller.Dataset; import seng202.group9.Core.FlightPath; @@ -15,6 +17,7 @@ import seng202.group9.Core.FlightPoint; import java.net.URL; import java.util.ArrayList; +import java.util.Arrays; import java.util.ResourceBundle; /** @@ -62,21 +65,33 @@ public class FlightRawDataController implements Initializable { try { ArrayList flightPaths = new ArrayList(); flightPaths = theDataSet.getFlightPaths(); - for(int i = 0; i() { + public void handle(MouseEvent event) { + String flightPathDisplayNameClicked = flightPathListView.getSelectionModel().getSelectedItem(); + String[] segments = flightPathDisplayNameClicked.split("_"); + String pathIdClicked = segments[0]; + + ArrayList flightPaths; + flightPaths = theDataSet.getFlightPaths(); + ArrayList flightPoints = flightPaths.get(Integer.parseInt(pathIdClicked)-1).getFlight(); + flightTableView.setItems(FXCollections.observableArrayList(flightPoints)); + + } + }); + flightPathListView.setItems(flightList); } catch (Exception e) { e.printStackTrace(); } } - - public void loadTables() { flightIdCol.setCellValueFactory(new PropertyValueFactory("ID")); flightNameCol.setCellValueFactory(new PropertyValueFactory("Name")); @@ -91,13 +106,17 @@ public class FlightRawDataController implements Initializable { theDataSet = this.parent.getCurrentDataset(); - ArrayList flightPaths = new ArrayList(); + ArrayList flightPaths; flightPaths = theDataSet.getFlightPaths(); int firstID = flightPaths.get(0).getID(); ArrayList flightPoints = flightPaths.get(0).getFlight(); flightTableView.setItems(FXCollections.observableArrayList(flightPoints)); } + public static void updateTable(int pathID) { + + } + public void initialize(URL arg0, ResourceBundle arg1) { // TODO Auto-generated method stub diff --git a/src/main/resources/flight_data_summary.fxml b/src/main/resources/flight_data_summary.fxml index 7acfc48..f690661 100644 --- a/src/main/resources/flight_data_summary.fxml +++ b/src/main/resources/flight_data_summary.fxml @@ -17,7 +17,7 @@ - + diff --git a/src/main/resources/flight_raw_data.fxml b/src/main/resources/flight_raw_data.fxml index cd0a143..9b9fbee 100644 --- a/src/main/resources/flight_raw_data.fxml +++ b/src/main/resources/flight_raw_data.fxml @@ -17,7 +17,7 @@ - +