SENG302

Commit Graph

Author	SHA1	Message	Date
David Wu	af45be1147	Implemented Animation Timer, FPS counter and modified display boat names and speed -Race now uses Animation Timer to simulate the race in Race class -FPS counter displayed in bottom left corner. TODO: Toggle fps view -Boat names and speed will now reposition so it is not blocked by the border of the canvas #story [18, 20]	9 years ago
David Wu	13c5c12db3	Added table column to display speed of each boat -BoatInRace now has a column to called boatSpeedColumn that displays boat #story [17] #pair[fwy13, zwu18]	9 years ago
Fan-Wu Yang	419fa8e9fe	Fixed merge conflicts - Fixed Merge conflicts with boats #merge	9 years ago
Erika Savell	a9601eb760	Switched latitude/longitude around We were using latitude on the x plane and longitude on the y plane #story[9] #fix	9 years ago
Fan-Wu Yang	d97802e06c	Refactored the refreshTable into propeties that listen. - Added currentLegName as a String Property - Refactored Name of the Boat as a StringProperty #story[15]	9 years ago
Fan-Wu Yang	12a9205ded	Implemented Table Refresh Function - Made refreshTable() in RaceController that refresh the boatInfoTable - Made checkPosition() in Race call controller.refreshTable() - Result is that the table now updates #story [15]	9 years ago
Erika Savell	3afa13d24b	Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9	9 years ago
Erika Savell	66445a91a1	Loaded official AC35 competitors - Competitors pulled from americascup.com - Added to a list of boats in Constants class, and this list is read by RaceController #story[9] #implement	9 years ago
David Wu	ca966e6c7b	Implement race clock -Added label to fxml racepane.fxml -Added calcTime method to calculate time elapsed -Added updateTime method in Race to update label text -Added setTimer in RaceController to update label text #story [16] #pair [fwy13, zwu18]	9 years ago
Erika	3dd343eb94	Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9	9 years ago
Erika	195ee10473	Added two test boats to race #story[9] #implement	9 years ago
Fan-Wu Yang	dffd77f7a7	Filled in missing documentation. - Added Documentation for all Classes. #documentation	9 years ago
Erika	cf5de5962a	Loaded the rest of the legs of the bermuda course in as an example race #story[9] #implement	9 years ago
Fan-Wu Yang	91861eb5cb	Refactored BoatinRace to observable list - Changed starting Boats into ObservableList from array - stopped checkPosition in Race abstract class from updating the table as everytime as it is checked by a listener - Changed array methods .length to .size() and [i] to .get() to reflect the type change. #refactor #story[9]	9 years ago
Erika	192178760e	Boat moves between legs and finishes - Have hard coded in first two legs -Possibly found problem with lat and longitude coordinate system being switched #story[9]	9 years ago
Erika	8ae540a6b9	Switched bearing calculation from formula to using the geodectic calcultor -this abstracts a lot of the complexity -more accurate heading, and it is return as an azimuth rather than bearing making lat and long calculations easier #story[9]	9 years ago
Erika Savell	05c7af4abf	Implemented redrawing boat with each loop - Not complete. New gps coordinate needs work around bearing -> azimuth conversion #implement #story[9]	9 years ago
cbt24	b25389f212	Implemented list of boats in order of last feature passed. - Update controller every time boats pass a mark - Cleared info table to force update #story [15]	9 years ago
Fan-Wu Yang	3751ee2488	Fixed arrow Direction, and Canvas - Canvas will not longer not fill the entire screen - Canvas will redraw when resized larger - Arrow Rotation no longer rotates the entire map. #fix	9 years ago
cbt24	85f4117666	Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story13 # Conflicts: # src/main/java/seng302/Controllers/RaceController.java	9 years ago
cbt24	456925c4c6	Implemented table view for finishing list - Added auto-numbered placing, team name, and last mark columns - Added dummy 'Finish' mark to race - Added callback for race to update controller #story [13]	9 years ago
Fan-Wu Yang	bc4701ef32	Fixed Canvas not filling screen issue - Created ResizableRaceCanvas Class - Moved all draw functions to ResizableRaceCanvas #fix	9 years ago
cbt24	d393766027	Partially completed story 13	9 years ago
David Wu	ddbb77a610	Arrow is now movable around the canvas -Arrow method is changed to take coordinates and an angle -Arrow will now be drawn around the coordinate #story [14]	9 years ago
Fan-Wu Yang	43c84cb677	Added draw ability to draw arrow on the canvas - displayArrow() function created - rotate() function created. #story [14] #pair[fwy13, zwu18]	9 years ago
Erika Savell	6f509e25ea	Implementing the boats movement throught a race -Not complete! Still need to create function to calculate new coordinates -Doesn't run because of problems with resource folder #refactor	9 years ago
Fan-Wu Yang	ffaed5ef47	Implemented Finish Line -Altered others drawing to utilise drawLine in RaceMap -Added Finish Line -Rescaled Canvas (To be fixed in the future). #story[11]	9 years ago
David Wu	ec03ec9be9	Merge remote-tracking branch 'origin/story9' into story9 # Conflicts: # src/main/java/seng302/Controllers/RaceController.java	9 years ago
David Wu	b4baba8c15	Implemented display a gate as a line -method created to add a line to canvas -added points for mark, north gate, and south gate #story [12]	9 years ago
Fan-Wu Yang	5108c0eaf5	Implemented Finish Line to show - shows a dark red line with 2 thickness - shows two rectangles at the ends of each line #story [11]	9 years ago
cbt24	6c3b7ccee7	Implemented start line in RaceController - Added coordinates as given in Story 10 - Displayed start line - Marked line ends with circles #story [10]	9 years ago
cbt24	6ca26d5bb1	Implemented race map usage by JavaFX controller - Renamed Map to RaceMap - Fixed RaceMap.convertGPS bug - Defined canvas coordinates in terms of map GPS #story [9] #pair [cbt24,fwy13,zwu18]	9 years ago
Fan-Wu Yang	0729ae719d	Implemented Display a Boat as a circle. - created displayBoat function which will display a circle at a Coordinate. #story[9] #pair[cbt24, fwy13]	9 years ago
Fan-Wu Yang	a7c64dc401	Implemented base UI and abstract controller for parent coupling -Added Controller abstract class that all JavaFX controllers are to be a child of. -Added MainController in case in the future we need a menu. -Added mainpane.fxml as a base pane that we can mount the future menu on. -Added RaceController so where the race will be made and displayed. -Added racepane.fxml which includes a Canvas and a tableview -Added loadPane() function to the mainApp which will swap the pane the app is currently on. #story[9]	9 years ago

34 Commits (f8147be4dfd74655a5c24e150531119ae5bb413f)