From df6f2a9c9300fdcf408432e264aee91ab90b37b7 Mon Sep 17 00:00:00 2001 From: YaFedImYaEatIm Date: Sat, 1 Oct 2016 22:25:48 +1300 Subject: [PATCH] Cleaned up unnecessary entries for the flight point adder --- res/userdb.db | Bin 8387584 -> 8387584 bytes .../seng202/group9/Controller/Dataset.java | 55 +++++------------- .../java/seng202/group9/Core/FlightPoint.java | 18 ++++++ .../group9/GUI/FlightAddController.java | 14 +---- .../group9/GUI/FlightRDController.java | 2 +- src/main/resources/flight_add_form.fxml | 49 +++++----------- 6 files changed, 46 insertions(+), 92 deletions(-) diff --git a/res/userdb.db b/res/userdb.db index 30702da837c269108b74c764443030c19f1bcad4..8fe540716b5351dac695bb2093dee85cba210c79 100644 GIT binary patch delta 1527 zcmW;FeNh)>8SFpxk%gd7Y8gipBP1k^~u zfNv)SL{c;re5#Sh6tdJ)xU^&C$?T+1csM8XU=OG$eQtle?z!*p_x^s@IyND)LW4{g z-`eP_!ShUZoRoQFJ0Pt)AZ0)ZB5;C9Fd0}7gEL6L1zf=mUV$m#4j%9-@OMqMACP($ za!wlNv4H$tllj4@o=Y#T#wmx{wba?4W@$^c!Lalz!&`BHJAbZ zFcW40e>MPKxBI6A29K}}<^=7ze;1IBlSi}r79HK~?KDCSoLt3jfB0ojRq{o;$p$>Fr_ij0ST6;cD69s6|C z_Xo#l^q@k;+T6aYF)^P}L@T1Ky>fcfpHs-pN6uGQF7ySZ&{;k;@P*N@OB9~FDK zfho>PifBXBd>b8M2t7q+J{nFWMBTm8N@v>?F>GB`x1|5+RC>&Bc4)L&FMcpnSUckI z{LY}YGCP&DE5g{l3nNn={OU$s{HA%f)m=PizkRq};iYD4+b(aMG?qw{?<77N>f@taQFY7SxV+^7-gUNuV@vwGiQ}Us{`o-T z&pl-2BX?(bV5IdA>f>W)$WI|{Mdw=v@jjs0L;b5qiQ~h3%^Yf9VI&6)?$z>x!2r5+ln$H*v1=I z1CCuiO`jBHs#s%O|C7+*F8aGDQ^~$J=~#5j*8vn-j7<|`d3L-;ZPh=Hw%smk+yvDQ%cL|p=IYK{%!|J7ANH9bmk&25nlxC5M z0;`Lu)R^fd&rA0`DdyJI#~=M=e9Nq9)kSWMr$8zYhy`M?fSH`C)9KVn`U&C;7B7iV zDUkfXmQtF*;>(sNX2s5bF-BVrmRPp_^WdO0y2W(CU{U#(o)tHLm{Q4w8&@0`EEwT( zlHMO}IB}j!{lLXM+wU(Q@=LcYV>1>C#B+0_$dr!rwUsw}l{SCsPPeGo+NZZ#-ClOk zBR*=9`|gfb>nS9|62X?mtm+T#T1*=47Mkmfvrc$UPtqf18I0bZw+}c_dnRH?=T+}hVv?vN* zmQ-OpMns%u;?&GY%(^&@XqM>A+~#HIUYO}H0TeGZy66kXet)tT+etnr&-eWQ=kdNC z3G#wZA<2BRPnm`H*;NJ^KeWAF*3>TJK>|S#3}YY!1du`~jD;`=hX{y-C>RIhAsX1O z3I2AOe61L4~73Rll1Q=xnzKj7b6C@?uk56n;70Y2FOoAAg z3<`(^CB(ry5DzMN7p6c0OojLSs^V$WAM?9uc}#_hoT6GO>E-%QaY9XIdJ%`^!Hz#A+fKeUC+bL3k zd0LiQ$yZPgo6ED*@%(n$#pYvd?x1UI?!zoJ&v=@iu=6B^n$$YpOJXbzY^Kp4JZ$bT zsbhILosX@EZ@OnvL!$qlNh320=9gD2&&xiiz#)xZ*t)qpci zixr{zq#Mywshh?6kQ?R~M;a->qB`?n#=SclNeOh3<}_dSw!FL4#ZG*KIx(bq zgTKF16Jr!yi6eSjZUluq)aZoegWsL~Yu-f?AL3roaDH!9%X9LwD2X0!o*ky89u}5| zZzpv+D%$?UYzW@7XKYCei7d99{A%2lO|9f*ku#?4etYpg>S0kiIA!2=#*4N-%-wf| zsNS?MNn~LTecJl6dW5`vnsniuXh`bXT;Fu5PXkHtK1_!hFcXqN3n`EaI+z8sAr0n0 zI_SXwb0GshfJ~SNA{ZeHOfVm^VF7#y3tk&bVw^>Ab)RXUvc5d#RrttsT5?sj&M0_}tbN5p@=@{z`6^A~7GB-sAH+mWNUNi=(6 z67&r#**`K)CKd4TLP3tvXv{CvrKE}0h&wrN3y#nZvnO4sO}wV;+xt8HVD{*fN)Ck8 zB*eWGQyh!G<}x3PtMgj|zEkJKf4|2{blg~Ml{d&J&f>`xvSt)nt_}T6ZVNU!Uro$; zZuZhQ7LQ(V9d+Ea|2>_av2eJG>kpi+qM24ts$lMv^R0hK$!_)NX^F$8q8_V9C6ukZ PD{bsD`1`G%$w&SHo*H|S diff --git a/src/main/java/seng202/group9/Controller/Dataset.java b/src/main/java/seng202/group9/Controller/Dataset.java index c879b44..ed55270 100644 --- a/src/main/java/seng202/group9/Controller/Dataset.java +++ b/src/main/java/seng202/group9/Controller/Dataset.java @@ -1189,22 +1189,14 @@ public class Dataset { * @param id * @param name * @param type - * @param via * @param altitude * @param latitude * @param longitude - * @param heading - * @param legDist - * @param totDist */ - public void addFlightPointToPath(int id, String name, String type, String via, String altitude, String latitude, String longitude, - String heading, String legDist, String totDist , int index) throws DataException{ + public void addFlightPointToPath(int id, String name, String type, String altitude, String latitude, String longitude, int index) throws DataException{ double altitudeVal = 0.0; double latitudeVal = 0.0; double longitudeVal = 0.0; - int headingVal = 0; - double legDistVal = 0.0; - double totalDistVal = 0.0; try{ altitudeVal = Double.parseDouble(altitude); @@ -1221,20 +1213,8 @@ public class Dataset { }catch (NumberFormatException e){ throw new DataException("Longitude must be a double value"); } - try{ - headingVal = Integer.parseInt(heading); - }catch (NumberFormatException e){ - throw new DataException("Heading must be a integer value"); - } - try{ - legDistVal = Double.parseDouble(legDist); - }catch (NumberFormatException e){ - throw new DataException("Leg DIstance must be a double value"); - } - try{ - totalDistVal = Double.parseDouble(totDist); - }catch (NumberFormatException e){ - throw new DataException("Total Distance must be a double value"); + if (index == -1){ + index = flightPathDictionary.get(id).getFlightPoints().size(); } Connection c = null; Statement stmt; @@ -1252,12 +1232,11 @@ public class Dataset { stmt = c.createStatement(); String insertFlightPointQuery = "INSERT INTO `" + this.name + "_Flight_Points` (`Index_ID`, `Name`, `Type`," + - " `Altitude`, `Latitude`, `Longitude`, `Heading`, `Tot_Dist`, `Leg_Dist`, `Via`, `Order`) VALUES "; + " `Altitude`, `Latitude`, `Longitude`, `Order`) VALUES "; String flightType = type.replace("\"", "\"\""); String flightName = name.replace("\"", "\"\""); insertFlightPointQuery += "(" + id +", \""+ flightName +"\", \"" + flightType + "\", "+ altitudeVal + ", " + - "" + latitudeVal + ", " + longitudeVal + ", " + headingVal + ", " + totalDistVal + ", " + legDistVal + - ", \"" + via + "\", "+index+")"; + "" + latitudeVal + ", " + longitudeVal + ", "+index+")"; stmt.execute(insertFlightPointQuery); stmt.close(); //move all the points after this forward @@ -1297,11 +1276,10 @@ public class Dataset { System.exit(0); } - FlightPoint pointToAdd = new FlightPoint(name, pointID+1, id, type, via, headingVal, altitudeVal, legDistVal, - totalDistVal,latitudeVal, longitudeVal); - updateFlightPointInfo(flightPathDictionary.get(Integer.valueOf(id))); + FlightPoint pointToAdd = new FlightPoint(type, pointID+1, id, name, altitudeVal, latitudeVal, longitudeVal); flightPathDictionary.get(Integer.valueOf(id)).addFlightPoint(pointToAdd, index); flightPointDictionary.put(pointID + 1, pointToAdd); + updateFlightPointInfo(flightPathDictionary.get(Integer.valueOf(id))); } /*** @@ -1311,9 +1289,8 @@ public class Dataset { * @throws DataException */ public void addFlightPointToPath(FlightPoint point, int index) throws DataException{ - addFlightPointToPath(point.getIndex(), point.getName(), point.getType(), point.getVia(), String.valueOf(point.getAltitude()), - String.valueOf( point.getLatitude()),String.valueOf(point.getLongitude()), - String.valueOf(point.getHeading()), String.valueOf(point.getLegDistance()), String.valueOf(point.getTotalDistance()), index); + addFlightPointToPath(point.getIndex(), point.getName(), point.getType(), String.valueOf(point.getAltitude()), + String.valueOf( point.getLatitude()),String.valueOf(point.getLongitude()), index); } /*** * Adds a single flight Point to an Existing FLight Path appended on the end of the list. @@ -1321,9 +1298,8 @@ public class Dataset { * @throws DataException */ public void addFlightPointToPath(FlightPoint point) throws DataException{ - addFlightPointToPath(point.getIndex(), point.getName(), point.getType(), point.getVia(), String.valueOf(point.getAltitude()), - String.valueOf( point.getLatitude()),String.valueOf(point.getLongitude()), - String.valueOf(point.getHeading()), String.valueOf(point.getLegDistance()), String.valueOf(point.getTotalDistance()), -1); + addFlightPointToPath(point.getIndex(), point.getName(), point.getType(), String.valueOf(point.getAltitude()), + String.valueOf( point.getLatitude()),String.valueOf(point.getLongitude()), -1); } /** @@ -1331,19 +1307,14 @@ public class Dataset { * @param id * @param name * @param type - * @param via * @param altitude * @param latitude * @param longitude - * @param heading - * @param legDist - * @param totDist * @throws DataException */ - public void addFlightPointToPath(int id, String name, String type, String via, String altitude, String latitude, String longitude, - String heading, String legDist, String totDist) throws DataException{ - addFlightPointToPath(id, name, type, via, altitude, latitude, longitude, heading, legDist, totDist, -1); + public void addFlightPointToPath(int id, String name, String type, String altitude, String latitude, String longitude) throws DataException{ + addFlightPointToPath(id, name, type, altitude, latitude, longitude, -1); } /** * This is called in conjunction to the App deleteDataset DO NOT CALL UNLESS THROUGH APP.DELETEDATASET diff --git a/src/main/java/seng202/group9/Core/FlightPoint.java b/src/main/java/seng202/group9/Core/FlightPoint.java index d4538e7..88b0b7c 100644 --- a/src/main/java/seng202/group9/Core/FlightPoint.java +++ b/src/main/java/seng202/group9/Core/FlightPoint.java @@ -60,6 +60,24 @@ public class FlightPoint { this.longitude = longitude; } + public FlightPoint(String type, int id, int index, String name, double altitude, double latitude, double longitude){ + //extra calculations will have to be used to find heading, legdistance and total distance. If necessary + //Type 1 file the file the lecturers gave us + //indexID = flight path ID + //ID = unique Auto Increment value + this.name = name; + this.ID = id; + this.indexID = index; + this.type = type; + this.via = ""; + this.heading = 0; + this.altitude = altitude; + this.legDistance = 0.0; + this.totalDistance = 0.0; + this.latitude = latitude; + this.longitude = longitude; + } + /** * Constructor when getting points from the database. * @param name Name for the point. diff --git a/src/main/java/seng202/group9/GUI/FlightAddController.java b/src/main/java/seng202/group9/GUI/FlightAddController.java index d33f44a..cec96de 100644 --- a/src/main/java/seng202/group9/GUI/FlightAddController.java +++ b/src/main/java/seng202/group9/GUI/FlightAddController.java @@ -18,20 +18,12 @@ public class FlightAddController extends Controller { @FXML private TextField fTypeAdd; @FXML - private TextField fViaAdd; - @FXML private TextField fAltitudeAdd; @FXML private TextField fLatitudeAdd; @FXML private TextField fLongitudeAdd; @FXML - private TextField fHeadingAdd; - @FXML - private TextField fLegDistAdd; - @FXML - private TextField fTotDistAdd; - @FXML private Button flightAddButton; //Set an empty Dataset to be assigned later @@ -49,13 +41,9 @@ public class FlightAddController extends Controller { theDataSet.addFlightPointToPath(currentSession.getCurrentFlightPathID(), fNameAdd.getText(), fTypeAdd.getText(), - fViaAdd.getText(), fAltitudeAdd.getText(), fLatitudeAdd.getText(), - fLongitudeAdd.getText(), - fHeadingAdd.getText(), - fLegDistAdd.getText(), - fTotDistAdd.getText()); + fLongitudeAdd.getText()); Alert alert = new Alert(Alert.AlertType.INFORMATION); alert.setTitle("Flight Point Add Successful"); alert.setHeaderText("New Flight Point added!"); diff --git a/src/main/java/seng202/group9/GUI/FlightRDController.java b/src/main/java/seng202/group9/GUI/FlightRDController.java index ed61468..d94b8b9 100644 --- a/src/main/java/seng202/group9/GUI/FlightRDController.java +++ b/src/main/java/seng202/group9/GUI/FlightRDController.java @@ -154,7 +154,7 @@ public class FlightRDController extends Controller { public void openAdd() { Session session = getParent().getSession(); session.setCurrentFlightPathtID(currentPathId); - createPopUpStage(SceneCode.FLIGHT_ADD, 600, 400); + createPopUpStage(SceneCode.FLIGHT_ADD, 600, 280); //flightTableView.setItems(FXCollections.observableArrayList(theDataSet.getAirports())); updateTable(currentPathIndex); } diff --git a/src/main/resources/flight_add_form.fxml b/src/main/resources/flight_add_form.fxml index 896e86f..a82c803 100644 --- a/src/main/resources/flight_add_form.fxml +++ b/src/main/resources/flight_add_form.fxml @@ -1,5 +1,10 @@ + + + + + @@ -9,7 +14,7 @@ - + @@ -22,10 +27,6 @@ - - - - @@ -46,50 +47,26 @@ -