e923fe671b
Changed race clock to display negative time before race
Erika Savell2017-03-25 17:34:39 +13:00
7a13885064
Users can select between 1 minute, 5 minute, or non scaled races
Erika Savell2017-03-24 18:50:19 +13:00
0fde0cd9b5
Created new start screen and implemented switching from start to race map
Erika Savell2017-03-24 13:03:03 +13:00
9c22fe76bd
Adjusting existing layout to prepare for creating new pane
Erika Savell2017-03-24 12:24:56 +13:00
d23a80841a
Tests for race clock being scaled correctly added
Erika Savell2017-03-24 11:57:54 +13:00
f8147be4df
Merge remote-tracking branch 'origin/story9' into story9
David Wu2017-03-23 18:20:25 +13:00
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
David Wu2017-03-23 18:11:13 +13:00
944da81946
Test that boat velocities are being scaled correctly added
Erika Savell2017-03-23 17:37:52 +13:00
4c7295998b
Added scaler variable to mulitply the race clock and the boats' velocities by
Erika Savell2017-03-23 17:07:16 +13:00
a77f4883f3
Create Resource XML - Created Race XML file which contains the perameters of the bermuda race for AC35
Fan-Wu Yang2017-03-22 12:20:20 +13:00
7e2804215b
Methods for calculating heading (instead of azimuth) added
Erika Savell2017-03-22 11:38:57 +13:00
0387bdc597
Tests for genreating new coordinate added
Erika Savell2017-03-22 10:07:14 +13:00
26f7b94e13
Fixed finish order - Added test to check order is determined by velocity - Modified Race class to allow for unit testing
Connor Taylor-Brown2017-03-20 20:18:32 +13:00
05fe402fd0
Merge remote-tracking branch 'origin/story9' into story9
cbt242017-03-20 17:28:22 +13:00
13c5c12db3
Added table column to display speed of each boat -BoatInRace now has a column to called boatSpeedColumn that displays boat
David Wu2017-03-20 17:27:09 +13:00
c8fcada427
Fixed sort order for boats in race - Sort boats by leg number (preserves order when boats enter shared leg)
cbt242017-03-20 17:26:13 +13:00
4efab9091d
Merge remote-tracking branch 'origin/story9' into story9
David Wu2017-03-20 17:12:06 +13:00
293f63ca8b
Added abbreviations to each boat -BoatInRace now takes extra parameter "abbrev"
David Wu2017-03-20 17:08:25 +13:00
98c5c46569
Implemented displayText to display boat name and speed with mark -method takes in boat name, boat speed and coordinates
David Wu2017-03-20 16:46:59 +13:00
d97802e06c
Refactored the refreshTable into propeties that listen. - Added currentLegName as a String Property - Refactored Name of the Boat as a StringProperty #story[15]
Fan-Wu Yang2017-03-20 16:38:35 +13:00
c33ce60e71
Changed labels for timer -preRace countdown now has text saying "Time until race starts:" -Timer during race now says "Race clock:"
David Wu2017-03-20 16:26:18 +13:00
1842b8f0b2
Merge remote-tracking branch 'origin/story9' into story9
David Wu2017-03-20 16:22:12 +13:00
946b9d0a72
Implement countdown clock -Added method countdownTimer() that countdowns from the current time to an selected time -Method is called in run (in Race) before the simulatedRace -Private integer PRERACE_TIME is used to set time before the race begins
David Wu2017-03-20 16:20:05 +13:00
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]
Fan-Wu Yang2017-03-20 16:11:02 +13:00
e04fdc79c9
Merge remote-tracking branch 'origin/story9' into story9
David Wu2017-03-20 15:34:12 +13:00
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
David Wu2017-03-20 15:33:37 +13:00
d0d4316bac
Boat race finishes when all boats have crossed the line
Erika Savell2017-03-20 15:07:20 +13:00
fda1e0ed61
Renaming all instances of app to team-7 and resetting pom, .idea files etc
Erika Savell2017-03-20 14:44:13 +13:00
cf5de5962a
Loaded the rest of the legs of the bermuda course in as an example race
Erika2017-03-19 21:30:49 +13:00
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]
Fan-Wu Yang2017-03-19 21:21:21 +13:00
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]
Erika2017-03-19 14:12:28 +13:00
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]
Erika2017-03-19 12:58:42 +13:00
05c7af4abf
Implemented redrawing boat with each loop
Erika Savell2017-03-17 18:13:48 +13:00
e6e59e2df9
Changed POM file to recognise project as team-7
Erika Savell2017-03-17 15:54:01 +13:00
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]
cbt242017-03-17 13:29:33 +13:00
15829628f2
Fixed Map - Changed GPS Coordinate so that latitude and longitude were on the correct orientation - Map is now centered. #fix
Fan-Wu Yang2017-03-17 13:10:29 +13:00
1284cac68e
Importing geotools library to calculate next coordinate for boat
Erika Savell2017-03-17 13:03:27 +13:00
b3b200fb02
Fixed arrow not resizing with resizable canvas
David Wu2017-03-17 12:30:22 +13:00
8bb2558b7e
Timer is now in race loop -Timer is currently printing out -Later will implement so that it is displayed on gui
David Wu2017-03-17 12:06:35 +13:00
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
Fan-Wu Yang2017-03-17 11:52:54 +13:00
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
cbt242017-03-17 11:15:15 +13:00
bc4701ef32
Fixed Canvas not filling screen issue - Created ResizableRaceCanvas Class - Moved all draw functions to ResizableRaceCanvas #fix
Fan-Wu Yang2017-03-17 10:30:40 +13:00
d393766027
Partially completed story 13
cbt242017-03-16 17:44:34 +13:00
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
David Wu2017-03-16 17:44:24 +13:00
8090108b12
Began implementing function to calculate boat's new coordinates
Erika Savell2017-03-16 16:40:34 +13:00
43c84cb677
Added draw ability to draw arrow on the canvas - displayArrow() function created - rotate() function created. #story [14] #pair[fwy13, zwu18]
Fan-Wu Yang2017-03-16 16:14:28 +13:00
2551dd7362
Added single test to debug race process
Erika Savell2017-03-15 22:02:13 +13:00
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]
Fan-Wu Yang2017-03-15 13:27:58 +13:00
ec03ec9be9
Merge remote-tracking branch 'origin/story9' into story9
David Wu2017-03-15 12:36:43 +13:00
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
David Wu2017-03-15 12:35:14 +13:00
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]
Fan-Wu Yang2017-03-15 12:33:56 +13:00
6c3b7ccee7
Implemented start line in RaceController - Added coordinates as given in Story 10 - Displayed start line - Marked line ends with circles #story [10]
cbt242017-03-15 12:33:55 +13:00
6ca26d5bb1
Implemented race map usage by JavaFX controller - Renamed Map to RaceMap - Fixed RaceMap.convertGPS bug - Defined canvas coordinates in terms of map GPS
cbt242017-03-15 12:19:41 +13:00
0729ae719d
Implemented Display a Boat as a circle. - created displayBoat function which will display a circle at a Coordinate. #story[9] #pair[cbt24, fwy13]
Fan-Wu Yang2017-03-15 11:55:11 +13:00
fbb3094da8
Implemented GPS coordinate to screen coordinate conversion - Created Coordinate class with getters - Created Map class - Created convertGPS method in Map #story [9], #pair [cbt24,fwy13]
cbt242017-03-15 11:11:38 +13:00
41cdf09dc2
Started merging team 8 paced loop into team 7 codebase.
Erika Savell2017-03-15 11:03:50 +13:00
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]
Fan-Wu Yang2017-03-15 02:03:37 +13:00
3ac93ae1e5
Documentation and Refactor - Changed Race to an abstract class - Protected and privated certain variables - Wrote Javadocs for the classes and functions - Moved generate race from RandomisedRace and ConstantVelocityRace to the abstract Race class - Added string checking exception for Scanner for whether to run in 1 minute or 5 minutes #pair[fwy13, cbt24]
Fan-Wu Yang2017-03-09 16:43:30 +13:00
2d777b8903
Implemented user input - Changed it from launching the program with args setting to with Scanner. - Changed field 'factor' to 'timescale' in Race class #story [5] #pair[fwy13, cbt24]
Fan-Wu Yang2017-03-09 16:03:27 +13:00
1a9cf5bdda
Allow users to choose timescale of race playback. Playback is ~1 min by default, real-time selected with command line variable '-5'. Rescaled race marker positions to distances appropriate for a ~5 minute race.
Connor Taylor-Brown2017-03-08 19:00:09 +13:00
2db4beadcb
Boats now display knots, also the racecouse has been modified to reflect the AC35 racecourse via linear coordinates.
Fan-Wu Yang2017-03-08 16:24:51 +13:00
f62c4dcb3d
Added Display of all Boats participating in the race, and a message to seperate this and the events in the console.
Fan-Wu Yang2017-03-08 15:35:40 +13:00
377683ef8c
Displayed information for all boats.
cbt242017-03-06 17:02:18 +13:00
Erika Savell
David Wu
Fan-Wu Yang
Connor Taylor-Brown