From dec72c02722be8ab93568d0038a760593b41ae95 Mon Sep 17 00:00:00 2001 From: YaFedImYaEatIm Date: Mon, 19 Sep 2016 08:07:46 +1200 Subject: [PATCH] Uncommented a few necessary functions and new Sample DataFile --- res/Samples/NZCH-RJAA.csv | 34 +++++++++++++++++++ .../java/seng202/group9/Controller/App.java | 2 +- .../group9/GUI/FlightSummaryController.java | 2 +- .../seng202/group9/GUI/MenuController.java | 3 ++ 4 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 res/Samples/NZCH-RJAA.csv diff --git a/res/Samples/NZCH-RJAA.csv b/res/Samples/NZCH-RJAA.csv new file mode 100644 index 0000000..fa0beab --- /dev/null +++ b/res/Samples/NZCH-RJAA.csv @@ -0,0 +1,34 @@ +APT,NZCH,0,-43.48664,172.53368 +FIX,KIDAL,14000,42.85864,172.28600 +FIX,UDUMO,34000,41.20481,171.99256 +FIX,MOTKO,34000,-39.12419,171.64394 +FIX,PAPTI,34000,-35.56533,171.09314 +FIX,SALAG,35000,-34.84506,171.68336 +FIX,LEBOL,34000,-29.14631,165.21556 +FIX,NOGOL,34000,-28.83722,164.86833 +FIX,DUBEV,34000,-27.55056,163.45472 +FIX,LEMIB,34000,-26.01333,163.45472 +FIX,ISTEM,34000,-26.01333,161.82806 +FIX,MEPAB,35000,-24.59750,160.3833 +FIX,BODEG,35000,-21.38047,163.00000 +FIX,IKODA,34000,-20.12667,163.00000 +FIX,RIPNA,35000,-16.62333,157.44833 +FIX,BISTT,35000,-14.00000,158.41667 +FIX,KOPAU,35000,-11.02667,159.46833 +FIX,IRRIE,34000,-9.53167,159.60667 +FIX,KAKOP,34000,-8.59000,159.48500 +FIX,KAKOP,34000,-5.64500,157.66833 +FIX,ADBON,34000,-5.65167,157.65000 +FIX,OKOLE,34000,0.00000,154.22833 +FIX,GALSS,34000,6.06667,150.51667 +FIX,KLOUT,35000,10.46167,147.79167 +FIX,STINE,34000,12.78167,147.87000 +FIX,SNAPP,34000,14.46796,147.63881 +FIX,TEEDE,34000,15.85344,146.60578 +FIX,TEGOD,34000,17.42306,146.51806 +FIX,SAGOP,34000,21.00000,145.19667 +FIX,NOGAK,34000,25.00500,144.34000 +FIX,ADKAK,30300,30.00333,143.16500 +FIX,RENAU,22600,33.90350,142.16331 +FIX,SUNNS,18900,34.46783,141.89803 +APT,RJAA,0,35.77655,140.38277 \ No newline at end of file diff --git a/src/main/java/seng202/group9/Controller/App.java b/src/main/java/seng202/group9/Controller/App.java index 63ee4f9..99d83be 100644 --- a/src/main/java/seng202/group9/Controller/App.java +++ b/src/main/java/seng202/group9/Controller/App.java @@ -64,7 +64,7 @@ public class App extends Application //testing out dataset try { - currentDataset = new Dataset("test's", Dataset.createNew); + currentDataset = new Dataset("test's", Dataset.getExisting); datasets.add(currentDataset); }catch (DataException e){ e.printStackTrace(); diff --git a/src/main/java/seng202/group9/GUI/FlightSummaryController.java b/src/main/java/seng202/group9/GUI/FlightSummaryController.java index c3a54ef..4bbdb92 100644 --- a/src/main/java/seng202/group9/GUI/FlightSummaryController.java +++ b/src/main/java/seng202/group9/GUI/FlightSummaryController.java @@ -116,7 +116,7 @@ public class FlightSummaryController extends Controller { } flightPathListView.getSelectionModel().selectedItemProperty().addListener(new ChangeListener() { public void changed(ObservableValue observable, String oldValue, String newValue) { - //map.displayRoute(theDataSet.getFlightPaths().get(flightPathListView.getSelectionModel().getSelectedIndices().get(0)).getRoutePath()); + map.displayRoute(theDataSet.getFlightPaths().get(flightPathListView.getSelectionModel().getSelectedIndices().get(0)).getRoutePath()); } }); } diff --git a/src/main/java/seng202/group9/GUI/MenuController.java b/src/main/java/seng202/group9/GUI/MenuController.java index 9231ca8..f530c9e 100644 --- a/src/main/java/seng202/group9/GUI/MenuController.java +++ b/src/main/java/seng202/group9/GUI/MenuController.java @@ -12,6 +12,9 @@ import seng202.group9.Controller.App; import seng202.group9.Controller.Dataset; import seng202.group9.Controller.SceneCode; +/** + * Created By Fan-Wu Yang (fwy13) + */ public class MenuController extends Controller{ public void importAirports(){