From 70645e7307fc904fdf39a206ec204618c3faa631 Mon Sep 17 00:00:00 2001 From: Liam Beckett Date: Fri, 30 Sep 2016 14:03:38 +1300 Subject: [PATCH] Started work on the ordering of flight points --- res/userdb.db | Bin 8387584 -> 8387584 bytes .../seng202/group9/Controller/Dataset.java | 3 --- .../group9/GUI/FlightRDController.java | 23 ++++++++++++++++++ .../group9/GUI/FlightSummaryController.java | 4 --- src/main/resources/flight_raw_data.fxml | 2 ++ 5 files changed, 25 insertions(+), 7 deletions(-) diff --git a/res/userdb.db b/res/userdb.db index e7dff5b906f514d4c65f1df78320c850533a6069..649a5afc7a6b2560fd690cc216231fd11e2578d2 100644 GIT binary patch delta 3865 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

WzXf;t2<5X?j{3&B|k0tEF4W+P}o(1>6T zg1HFhAvhaB6M`=zn2(?t!2$#e5iCN`f?zR%B?wv(EJe_UU>SmQ5G+Tq0>MfIs}Otz z!D*Tg3SmnL~s#; lixF%=a0!A-5nP7gas*ouT!G+91ltf?h2WcC!uGyL{|8-bLQntz diff --git a/src/main/java/seng202/group9/Controller/Dataset.java b/src/main/java/seng202/group9/Controller/Dataset.java index 3743aeb..6fcf2ff 100644 --- a/src/main/java/seng202/group9/Controller/Dataset.java +++ b/src/main/java/seng202/group9/Controller/Dataset.java @@ -2100,9 +2100,6 @@ public class Dataset { int curIndex = flightPath.getFlightPoints().indexOf(flightPoint); flightPath.getFlightPoints().remove(flightPoint); int indexToAdd = index; - if (curIndex < index){ - indexToAdd --; - } flightPath.getFlightPoints().add(indexToAdd, flightPoint); Connection c = null; diff --git a/src/main/java/seng202/group9/GUI/FlightRDController.java b/src/main/java/seng202/group9/GUI/FlightRDController.java index e3e37ce..93085fd 100644 --- a/src/main/java/seng202/group9/GUI/FlightRDController.java +++ b/src/main/java/seng202/group9/GUI/FlightRDController.java @@ -246,6 +246,29 @@ public class FlightRDController extends Controller { flightPathListView(); } + public void movePointUp(){ + FlightPoint toMove = flightTableView.getSelectionModel().getSelectedItem(); + int toMoveIndex = flightTableView.getSelectionModel().getSelectedIndex(); + try{ + theDataSet.moveFlightPoint(toMove, toMoveIndex-1); + } catch (DataException e) { + e.printStackTrace(); + } + updateTable(currentPathIndex); + + } + + public void movePointDown(){ + FlightPoint toMove = flightTableView.getSelectionModel().getSelectedItem(); + int toMoveIndex = flightTableView.getSelectionModel().getSelectedIndex(); + try{ + theDataSet.moveFlightPoint(toMove, toMoveIndex+1); + } catch (DataException e) { + e.printStackTrace(); + } + updateTable(currentPathIndex); + } + /** * Updates the table so that when the database is changed (deleted or edited) it still shows the correct data values. * @param currentPathIndex The index of the current path in the Path array list. diff --git a/src/main/java/seng202/group9/GUI/FlightSummaryController.java b/src/main/java/seng202/group9/GUI/FlightSummaryController.java index 4be3376..c5a99f4 100644 --- a/src/main/java/seng202/group9/GUI/FlightSummaryController.java +++ b/src/main/java/seng202/group9/GUI/FlightSummaryController.java @@ -96,12 +96,8 @@ public class FlightSummaryController extends Controller { Airport sourceAirport = null; Airport destinationAirport = null; - System.out.println(firstPointICAO); - System.out.println(lastPointICAO); - for (int i=0; i < airportList.size(); i++){ Airport current = airportList.get(i); - System.out.println(current.getICAO()); if(current.getICAO().equals(firstPointICAO)){ sourceAirport = current; } diff --git a/src/main/resources/flight_raw_data.fxml b/src/main/resources/flight_raw_data.fxml index 2bafa76..78a6df2 100644 --- a/src/main/resources/flight_raw_data.fxml +++ b/src/main/resources/flight_raw_data.fxml @@ -155,6 +155,8 @@ + +