From 805eee58af25f4208c51ce7dc19f9a90647487b5 Mon Sep 17 00:00:00 2001 From: Liam Beckett Date: Sat, 1 Oct 2016 14:52:59 +1300 Subject: [PATCH 1/5] Updated the path so that it will update when the 2nd point becomes the 1st point --- res/userdb.db | Bin 8387584 -> 8387584 bytes .../seng202/group9/Controller/Dataset.java | 2 -- .../group9/GUI/FlightRDController.java | 20 ++++++++++++++++++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/res/userdb.db b/res/userdb.db index f98b130e87d47fc7328ea7bf95b2284ac9015bfd..e70283afa54547c7448d691322529974ffda20b1 100644 GIT binary patch delta 1197 zcmY+;Yfw~W9LMpq7dgA&!qUcdG4m4Zw#3zScSGdtE(@zmfN}{@>oHu^EJQ>$ys%(A zAiikU)Sj4uMw>uNrm>RUQHi#jgwxGlSWTltFwN#zI*c``V^hC}>P2VH=gfT1bDr~m zI_~_X=zu_~Jip{fngh>HLWztLIVB28l$6Y)B#IJ|5)~zCN}?%=p=3TK8cJd*iK9eI zNjxPFP@<#c!BLVhRHB>}6tkgt$rw?@Xk|&rcoydIzgurajEi^8ukBQ zsmtn|ZhJ-5a*IXUHI*aDCp}@;_!`@#{aVR;ME6VZi>UwJ8?iYF|B6%KXDZd)@rzg2 zW(!?khl_$W%H*Saq%BuIO1V)V5Cp-%$BJ<({;iso*$v5lt6Zaw=ZBH=!^oWOn(}qI zIaXOfI{8yq-;&O@uq)ghJkX(%yaC^hd$v~#fA=p@18hcrh9iww? zc^EF89BJ)}u`CF?%zwV0b>dseYl>QWH7iZ3H{Uwz+*YBmspjVDg@3nKuE*fKY<_U* z!;Rm>ezz)x9kLrNVra2bfBZ}fyU1hm+@jWIrcAU?QxY(x9?pP9p9$P~|3jugJw z+Q58#<&C7$!J^@NY?Q~iw6C$C?^kx4$2;k_yiE;vS&oy(mrd_p*8A8_r@<@^rH`Ag zln=7gJYGIGB)?YO+Y@mbU|A^QG&b~$fiwQ%xAePN)s!($9L{hT^j;ohFHIROB2Bz{ zecEqlpYs_0)KsD^pUJWjZ}ztK5aCMZ})z7>iEZ(*m=HkYV7djE0cHG9Uc?G zp0$6B)v^^c#!T_Ok!ow(wMMpM1}hi#-gZY1jIlR)jBegEJ7D;#Co*G%N5KRc@EBx5 z7Gy&Xf^a6vJYfE!lB8t_0VJOO1;4i&H# z)uI2RsMQLnG{jCfEhd dup3%n543_0UVt{(3;SR{9Dw#vWX7M8{5Jp|8fyRm delta 1183 zcmY+>c}x>o0LSr}wlY(pa?~PKJl11N0g=H|m zJ9Qm24OOLw?2WeJUQa0DDN#|PrbI)@07`-=5hxKU(NZ#yl3+?gDA7?eh>}oB!YB!+ zB!Ut>C4;+(p>w+C38#M26E2$r>R??6ui*@a+#P(kuU_Jzz9QO7(~Nx7y%<; z6nq1tVGN9gaXoLG-v&J!#BrhAZl2HNc5}VFiiOE0xmG)b({p;YfJ>Y2oRy)`X(g3T z8?KD1`bX`Kg4uIZC5dm6tNy*>8&*@~&Gx!IlfGKTf3d3d(!ThvDUtoFw$+JpX;XFI z|CXOVJ*}Fo)_r~}OSPIJ1U65SR^^dQ-j&rkZN~g$OA5F1vRvg$l2v~@ zy;+_DO;qy+dD*qI#=fQ4+lTRSyiRMt=0inM5JXY=g4Q{%L~r()nU)JRVRGqS{R7XX zAdC3%jQuC)^9pgsl*B~5K$N`?$|EjJ*u{2PO_FdT+PJVU?k4+7i9bg_zdk&=jA?9$ zQ_bsQZgrM3o6VFU94&vjn&h8n)ymAT>8YWvxBFSQ5+^HT+Fo=uvZqQM?ha{+J1w## zJK~St_Too*XIQ1(lqT%IBaK-Z-@y(m(U{qyY0p^E5U`sdrYB%GFaKHC^ZeBPod14g zE}uC?=y0bOMjlUKjXtv^)Qi9T&=oa+T~y*X-gDqYV;dWI3$d@YW9@>)Wz3<(4v%hU zWb-}dR-)DM&>ejB5Id(tOM7hPjh0PJbsN!nZ&7ab)Ei7z;#l2*3U5&o+kV@eCLBCe zGWKq^o1Io>I^teGX08(UN{L?6h=x(!2iZiwIYBsbzO6VzbB$H_G2=5_PY|t zvi|WMjpZ5welx^E9K^$TNPr2D2uY9(DUb?jFcBn}1Qtk#444d4U@ByS3|6p#9kL)B zronV@zzmoPPM8HbkPEY64txi5ArD-T4+Ss}=0hPAK`|_V5?Ba}fWTr{0!v{Tl)`er xPxY^aGAM@%SOwq1YN&)YPz7sY9ju29uo0?Z6KsYpuoY@x8*J|h_-l<(?*V$W5H0`! diff --git a/src/main/java/seng202/group9/Controller/Dataset.java b/src/main/java/seng202/group9/Controller/Dataset.java index 5704540..2aff0d5 100644 --- a/src/main/java/seng202/group9/Controller/Dataset.java +++ b/src/main/java/seng202/group9/Controller/Dataset.java @@ -467,7 +467,6 @@ public class Dataset { while (IDResult.next()) { nextID = Integer.parseInt(IDResult.getString("seq")) + 1;//for some reason sqlite3 stores incremental values as a string... } - System.out.println(nextID); stmt.close(); stmt = c.createStatement(); String insertAirportQuery = "INSERT INTO `" + this.name + "_Airport` (`Name`, `City`, `Country`, `IATA/FFA`," + @@ -1610,7 +1609,6 @@ public class Dataset { stmt.close(); int index = flightPath.getFlightPoints().indexOf(flightPoint); - System.out.println(index); if (index == 0){ try { diff --git a/src/main/java/seng202/group9/GUI/FlightRDController.java b/src/main/java/seng202/group9/GUI/FlightRDController.java index 93085fd..4afd3f7 100644 --- a/src/main/java/seng202/group9/GUI/FlightRDController.java +++ b/src/main/java/seng202/group9/GUI/FlightRDController.java @@ -255,6 +255,7 @@ public class FlightRDController extends Controller { e.printStackTrace(); } updateTable(currentPathIndex); + updatePaths(); } @@ -267,6 +268,7 @@ public class FlightRDController extends Controller { e.printStackTrace(); } updateTable(currentPathIndex); + updatePaths(); } /** @@ -281,6 +283,24 @@ public class FlightRDController extends Controller { flightTableView.refresh(); } + private void updatePaths(){ + try { + flightPathListView.getItems().clear(); + ArrayList flightPaths; + flightPaths = theDataSet.getFlightPaths(); + for(int i = 0; i Date: Sat, 1 Oct 2016 15:02:45 +1300 Subject: [PATCH 2/5] Fixed the move up and down bugs on for the first and last points in a path. --- src/main/java/seng202/group9/GUI/FlightRDController.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/seng202/group9/GUI/FlightRDController.java b/src/main/java/seng202/group9/GUI/FlightRDController.java index 4afd3f7..d3a42c0 100644 --- a/src/main/java/seng202/group9/GUI/FlightRDController.java +++ b/src/main/java/seng202/group9/GUI/FlightRDController.java @@ -250,7 +250,9 @@ public class FlightRDController extends Controller { FlightPoint toMove = flightTableView.getSelectionModel().getSelectedItem(); int toMoveIndex = flightTableView.getSelectionModel().getSelectedIndex(); try{ - theDataSet.moveFlightPoint(toMove, toMoveIndex-1); + if (toMoveIndex != 0) { + theDataSet.moveFlightPoint(toMove, toMoveIndex - 1); + } } catch (DataException e) { e.printStackTrace(); } @@ -263,7 +265,9 @@ public class FlightRDController extends Controller { FlightPoint toMove = flightTableView.getSelectionModel().getSelectedItem(); int toMoveIndex = flightTableView.getSelectionModel().getSelectedIndex(); try{ - theDataSet.moveFlightPoint(toMove, toMoveIndex+1); + if (toMoveIndex != flightTableView.getItems().size()-1) { + theDataSet.moveFlightPoint(toMove, toMoveIndex + 1); + } } catch (DataException e) { e.printStackTrace(); } From 6ec38bcb87208eeeafefc7aafc483924995d03d4 Mon Sep 17 00:00:00 2001 From: Liam Beckett Date: Sat, 1 Oct 2016 15:31:28 +1300 Subject: [PATCH 3/5] Fixed the error when the user clicks on empty path fields in the flight path list view --- res/userdb.db | Bin 8387584 -> 8387584 bytes .../java/seng202/group9/Core/FlightPath.java | 2 +- .../group9/GUI/FlightRDController.java | 30 ++++++++++++------ .../group9/GUI/FlightSummaryController.java | 14 ++++---- 4 files changed, 29 insertions(+), 17 deletions(-) diff --git a/res/userdb.db b/res/userdb.db index e70283afa54547c7448d691322529974ffda20b1..6476a058bd99e7a0fd547c243d02868e9f13272b 100644 GIT binary patch delta 1084 zcmZwCZERCz7zW_eZuG3hv5tvuv`o~=S()s^vb9y9=kzcrjPWrx3Ip|VP!JGi2UB+f%+_|6k zee$;5{U@yrx*VqVZl`W)f18+0OlGDurgWxBOco}YDTB$%WMi7l^Z-*P(-fvGCOcC$ z(^RG$rU#j(F+IfeFjFp59@BIt2a}U&22(!MBTO@y9%Xur>2an4rYD$Y4U%%yKSh$V zqcINTN(Ne_Iu={CcVHT=W0W zxqV(Wa{Iu*)F0o!KWA6N-8sL<&RhJq!%cRZ8Z(Q-s#4_hm@}=}#vZe=$EpX{tf;{j zQZOFExn2}%N`ByI;+<3TTRY>G<$n*C z9QjEN7g-9fl{nRn>X|PKqSu|lhv{Y)psGiSV2$HlFoB|{<_z>#bD8?N5-i$P=R z)V8(XLjk;1Uec`TVJ~PhPZ2lvq#K*CqqF|k#rTyU+uJ> z_+;#g*q%gla&JfTWQ#6(jSzE>b{?$XzbBP+!E7jkCt(g0LkW~Z89W7Um<#1l0Uq#z z51xi+U>?ke1>gr2GzfqW3!xGg!D0x)5?BgVunekUIjn${unKBmHPk{Ktbq`$g>_I5 z>tO>t3(vvxK=1-Iz(&{vVb}~?;6>O9+h9Aq1Uq0SG{VaefhO1myWtgh6{7GOybf=` Qo6rm`(0V+Td@C>aU)6j1L;wH) delta 1065 zcmX}keN5DK90%~<9eTez6gav>@zC-ieq2X9i02&@^1J(aa)}A@V2BTWhz_3;0f`GA zcrZR7{?V{y-`Jp~8%oKXmf%z(S|;JtvOl!ebSJElt8~t})XnMp*IM6wUw^#!`F!3@ z51vFcL5JOtvp+#IEbm?D{`FimBOVv1&pVX`vCGCjj& zV|tcp8dDt8bfy_h@k}$B>`VzvvzTTxJ;(Gs(;TL`O!JuLGrho+*iXu#?C23GMk<%^ zZyS=NE@4%b0;|Psh_XzRY?93^<5@(ts>H`y)!=^HUjvs+YIQhWHIC+rbE@JjlO##e zcVo<0Hd|JdY5{M4QQEM7Xj$fkUH>0>j8T?Yz0#;x8nnQwyn+Sk9z%zE@b{L^dCm31 z{^8bv-A!gS*b(~kQRXMv_k%UoNOiy{lDx`n-@(4RmMQL8!+zJ}uTwv}rUsp+`PWku z)Nik>W z(+7!nf>jj{MY@K;iOW@AUa^P7HcfHKhZBdKSMz$rQ9XQk`mpgvaeLc@ra;oE3C&T_ zC3hTeT>6E5yC@1fGUVRmKvw&e9`Qlg;W5QszctqA6&J$}x7_=^Gsl`YRYcxI=-kun z@pd~!Ko5I2G}N5`^sH#Ti4%Y8ueLp##5sM?HTle;aLI@;jv@4wCjS<-Z$zki=sy~& zcjwL&4Py?Me60P4BL}{_AkOHMBZK=!KOTK39_V3Ypl#(pgC%0oxFbdWs;}5nf1^@t z8OP-8j(dT~?m_Xn9{S7H-R)L>Y?~N&z>DC7WOxZuAQjRe9Tq?aECd%U0ylUd6JCZ_ z;8nqmArwI|tb#Y71Xe>Stbw(# z4%Wk)Ku`v6K{>n)L8yQYun{)FX4nGnz*eY)ZBPZ(Py^ec7T$$A2*G<$4?AEd?1J6U LaB5<_F@DBVz*g{- diff --git a/src/main/java/seng202/group9/Core/FlightPath.java b/src/main/java/seng202/group9/Core/FlightPath.java index 0f29d90..70539e4 100644 --- a/src/main/java/seng202/group9/Core/FlightPath.java +++ b/src/main/java/seng202/group9/Core/FlightPath.java @@ -28,7 +28,7 @@ public class FlightPath { } /** - * COnstructor for FlightPath from dataset add later the ID needs to be set from database. + * Constructor for FlightPath from dataset add later the ID needs to be set from database. * @param departureAirport * @param arrivalAirport */ diff --git a/src/main/java/seng202/group9/GUI/FlightRDController.java b/src/main/java/seng202/group9/GUI/FlightRDController.java index d3a42c0..25ab2dd 100644 --- a/src/main/java/seng202/group9/GUI/FlightRDController.java +++ b/src/main/java/seng202/group9/GUI/FlightRDController.java @@ -92,17 +92,19 @@ public class FlightRDController extends Controller { flightPathListView.setOnMouseClicked(new EventHandler() { public void handle(MouseEvent event) { String flightPathDisplayNameClicked = flightPathListView.getSelectionModel().getSelectedItem(); - String[] segments = flightPathDisplayNameClicked.split("_"); - String pathIdClicked = segments[0]; + if (flightPathDisplayNameClicked!=null) { + String[] segments = flightPathDisplayNameClicked.split("_"); + String pathIdClicked = segments[0]; - currentPathIndex = theDataSet.getFlightPaths().indexOf(theDataSet.getFlightPathDictionary() - .get(Integer.parseInt(pathIdClicked))); - currentPathId = Integer.parseInt(pathIdClicked); + currentPathIndex = theDataSet.getFlightPaths().indexOf(theDataSet.getFlightPathDictionary() + .get(Integer.parseInt(pathIdClicked))); + currentPathId = Integer.parseInt(pathIdClicked); - ArrayList flightPaths; - flightPaths = theDataSet.getFlightPaths(); - ArrayList flightPoints = flightPaths.get(currentPathIndex).getFlight(); - flightTableView.setItems(FXCollections.observableArrayList(flightPoints)); + ArrayList flightPaths; + flightPaths = theDataSet.getFlightPaths(); + ArrayList flightPoints = flightPaths.get(currentPathIndex).getFlight(); + flightTableView.setItems(FXCollections.observableArrayList(flightPoints)); + } } }); @@ -246,6 +248,9 @@ public class FlightRDController extends Controller { flightPathListView(); } + /** + * Function for the 'Move Up' right click option on the points in the flight table. + */ public void movePointUp(){ FlightPoint toMove = flightTableView.getSelectionModel().getSelectedItem(); int toMoveIndex = flightTableView.getSelectionModel().getSelectedIndex(); @@ -258,9 +263,11 @@ public class FlightRDController extends Controller { } updateTable(currentPathIndex); updatePaths(); - } + /** + * Function for the 'Move Down' right click option on the points in the flight table. + */ public void movePointDown(){ FlightPoint toMove = flightTableView.getSelectionModel().getSelectedItem(); int toMoveIndex = flightTableView.getSelectionModel().getSelectedIndex(); @@ -287,6 +294,9 @@ public class FlightRDController extends Controller { flightTableView.refresh(); } + /** + * Updates the flight path list view so that it displays the correct names for the paths + */ private void updatePaths(){ try { flightPathListView.getItems().clear(); diff --git a/src/main/java/seng202/group9/GUI/FlightSummaryController.java b/src/main/java/seng202/group9/GUI/FlightSummaryController.java index c5a99f4..12f8c86 100644 --- a/src/main/java/seng202/group9/GUI/FlightSummaryController.java +++ b/src/main/java/seng202/group9/GUI/FlightSummaryController.java @@ -158,12 +158,14 @@ public class FlightSummaryController extends Controller { flightPathListView.setOnMouseClicked(new EventHandler() { public void handle(MouseEvent event) { String flightPathDisplayNameClicked = flightPathListView.getSelectionModel().getSelectedItem(); - String[] segments = flightPathDisplayNameClicked.split("_"); - String pathIdClicked = segments[0]; - - currentPathIndex = theDataSet.getFlightPaths().indexOf(theDataSet.getFlightPathDictionary() - .get(Integer.parseInt(pathIdClicked))); - currentPathId = Integer.parseInt(pathIdClicked); + if (flightPathDisplayNameClicked!=null) { + String[] segments = flightPathDisplayNameClicked.split("_"); + String pathIdClicked = segments[0]; + + currentPathIndex = theDataSet.getFlightPaths().indexOf(theDataSet.getFlightPathDictionary() + .get(Integer.parseInt(pathIdClicked))); + currentPathId = Integer.parseInt(pathIdClicked); + } } }); flightPathListView.setItems(flightList); From 04481661c4881bd29ca5ce2b6b9f716f811b1e35 Mon Sep 17 00:00:00 2001 From: Liam Beckett Date: Sat, 1 Oct 2016 16:00:43 +1300 Subject: [PATCH 4/5] Removed the via column in the table --- .../seng202/group9/GUI/FlightRDController.java | 8 +------- src/main/resources/flight_raw_data.fxml | 18 ++++++------------ 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/src/main/java/seng202/group9/GUI/FlightRDController.java b/src/main/java/seng202/group9/GUI/FlightRDController.java index 25ab2dd..53dbfa1 100644 --- a/src/main/java/seng202/group9/GUI/FlightRDController.java +++ b/src/main/java/seng202/group9/GUI/FlightRDController.java @@ -37,8 +37,6 @@ public class FlightRDController extends Controller { @FXML private TableColumn flightTypeCol; @FXML - private TableColumn flightViaCol; - @FXML private TableColumn flightAltitudeCol; @FXML private TableColumn flightLatCol; @@ -60,8 +58,6 @@ public class FlightRDController extends Controller { @FXML private TextField flightTypeBox; @FXML - private TextField flightViaBox; - @FXML private TextField flightAltitudeBox; @FXML private TextField flightLatitudeBox; @@ -128,7 +124,6 @@ public class FlightRDController extends Controller { flightIdCol.setCellValueFactory(new PropertyValueFactory("ID")); flightNameCol.setCellValueFactory(new PropertyValueFactory("Name")); flightTypeCol.setCellValueFactory(new PropertyValueFactory("Type")); - flightViaCol.setCellValueFactory(new PropertyValueFactory("Via")); flightAltitudeCol.setCellValueFactory(new PropertyValueFactory("Altitude")); flightLatCol.setCellValueFactory(new PropertyValueFactory("Latitude")); flightLongCol.setCellValueFactory(new PropertyValueFactory("Longitude")); @@ -151,7 +146,7 @@ public class FlightRDController extends Controller { theDataSet.addFlightPointToPath(currentPathId, flightNameBox.getText(), flightTypeBox.getText(), - flightViaBox.getText(), + "", flightAltitudeBox.getText(), flightLatitudeBox.getText(), flightLongitudeBox.getText(), @@ -160,7 +155,6 @@ public class FlightRDController extends Controller { flightTotDistBox.getText()); flightNameBox.clear(); flightTypeBox.clear(); - flightViaBox.clear(); flightAltitudeBox.clear(); flightLatitudeBox.clear(); flightLongitudeBox.clear(); diff --git a/src/main/resources/flight_raw_data.fxml b/src/main/resources/flight_raw_data.fxml index 78a6df2..06111a4 100644 --- a/src/main/resources/flight_raw_data.fxml +++ b/src/main/resources/flight_raw_data.fxml @@ -78,7 +78,7 @@ - + @@ -88,23 +88,18 @@ - +