diff --git a/src/main/java/seng202/group9/Controller/Dataset.java b/src/main/java/seng202/group9/Controller/Dataset.java index 585cb78..8ca4b3a 100644 --- a/src/main/java/seng202/group9/Controller/Dataset.java +++ b/src/main/java/seng202/group9/Controller/Dataset.java @@ -425,7 +425,7 @@ public class Dataset { return message; } /** - * Imports Airline files to the dataset + * Imports Airport files to the dataset * @param filePath * @return Success Message * @throws DataException @@ -559,7 +559,7 @@ public class Dataset { } /** - * Imports Airline files to dataset + * Imports Route files to dataset * @param filePath * @return Success Message * @throws DataException @@ -634,13 +634,11 @@ public class Dataset { } /** - * Imports Airline files to dataset + * Imports Flight files to dataset * @param filePath * @return Success Message * @throws DataException */ - - public String importFlight(String filePath) throws DataException { FlightPathParser parser = new FlightPathParser(filePath); //remember this still has to append the duplicate message to it. diff --git a/src/main/java/seng202/group9/GUI/FlightRawDataController.java b/src/main/java/seng202/group9/GUI/FlightRawDataController.java index ba84f90..4d11ec4 100644 --- a/src/main/java/seng202/group9/GUI/FlightRawDataController.java +++ b/src/main/java/seng202/group9/GUI/FlightRawDataController.java @@ -1,8 +1,10 @@ package seng202.group9.GUI; import javafx.collections.FXCollections; +import javafx.collections.ObservableList; 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; @@ -21,6 +23,12 @@ import java.util.ResourceBundle; */ public class FlightRawDataController implements Initializable { + private Dataset theDataSet = null; + + App parent; + public void setApp(App parent){ + this.parent = parent; + } @FXML private TableView flightTableView; @@ -45,14 +53,30 @@ public class FlightRawDataController implements Initializable { @FXML private TableColumn flightTotDisCol; - private Dataset theDataSet = null; - App parent; + @FXML + ListView flightPathListView; + final ObservableList flightList = FXCollections.observableArrayList(); - public void setApp(App parent){ - this.parent = parent; + public void flightPathListView() { + try { + ArrayList flightPaths = new ArrayList(); + flightPaths = theDataSet.getFlightPaths(); + for(int i = 0; i("ID")); flightNameCol.setCellValueFactory(new PropertyValueFactory("Name")); @@ -66,11 +90,7 @@ public class FlightRawDataController implements Initializable { flightTotDisCol.setCellValueFactory(new PropertyValueFactory("Tot_Dist")); theDataSet = this.parent.getCurrentDataset(); -// try{ -// System.out.println(theDataSet.importAirline("res/Samples/Airlines.txt")); -// } catch (DataException e){ -// e.printStackTrace(); -// } + ArrayList flightPaths = new ArrayList(); flightPaths = theDataSet.getFlightPaths(); int firstID = flightPaths.get(0).getID(); diff --git a/src/main/java/seng202/group9/GUI/FlightSummaryController.java b/src/main/java/seng202/group9/GUI/FlightSummaryController.java index 53d1dd7..faa31c3 100644 --- a/src/main/java/seng202/group9/GUI/FlightSummaryController.java +++ b/src/main/java/seng202/group9/GUI/FlightSummaryController.java @@ -1,9 +1,16 @@ package seng202.group9.GUI; +import javafx.collections.FXCollections; +import javafx.collections.ObservableList; +import javafx.fxml.FXML; import javafx.fxml.Initializable; +import javafx.scene.control.ListView; import seng202.group9.Controller.App; +import seng202.group9.Controller.Dataset; +import seng202.group9.Core.FlightPath; import java.net.URL; +import java.util.ArrayList; import java.util.ResourceBundle; /** @@ -11,12 +18,37 @@ import java.util.ResourceBundle; */ public class FlightSummaryController implements Initializable { - App parent; + private Dataset theDataSet = null; + App parent; public void setApp(App parent){ this.parent = parent; } + + @FXML + ListView flightPathListView; + final ObservableList flightList = FXCollections.observableArrayList(); + + public void flightPathListView() { + try { + theDataSet = this.parent.getCurrentDataset(); + ArrayList flightPaths = new ArrayList(); + flightPaths = theDataSet.getFlightPaths(); + for(int i = 0; i - - - - -