fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
164 Commits 1 Branch 0 Tags
101dadc003d3820830161ee49410707e6e67a619
Commit Graph
164 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Erika Savell 306e98172b Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into heading-visualisation 2017-03-25 22:11:31 +13:00
Erika Savell bd86690e85 Filled in javadoc, optimised imports, rearranged code 
#refactor #story[16]
 2017-03-25 21:49:43 +13:00
Connor Taylor-Brown e8cd9b2ee8 Implemented wake visualisation for each boat 
- Added and tested wake calculation for BoatInRace
- Draws boat in canvas between start and entering Finish leg
- Allow boat velocity to be set after initialisation for testing
#story [21]
 2017-03-25 20:41:16 +13:00
Erika Savell f5ba7c95c8 Fixing merge and resulting failing tests 
#fix #story[16]
 2017-03-25 19:01:03 +13:00
Erika Savell ac558746a0 Cleaning up gui 
-In future, users could load xml file before selecting scaling, and then get estimates of time different scaling would take

#implement #sotry[16]
 2017-03-25 18:18:01 +13:00
Erika Savell e923fe671b Changed race clock to display negative time before race 
#story[16] #implement
 2017-03-25 17:34:39 +13:00
Erika Savell 7a13885064 Users can select between 1 minute, 5 minute, or non scaled races 
- Current implementation is a bit messy I think, with 3 different start race methods for the three options
- Considering letting users choose from a dropdown, so that the chosen value can be easily found from a single method for starting the race

#implement #story[16]
 2017-03-24 18:50:19 +13:00
Erika Savell 0fde0cd9b5 Created new start screen and implemented switching from start to race map 
#implement #story[16]
 2017-03-24 13:03:03 +13:00
Erika Savell 9c22fe76bd Adjusting existing layout to prepare for creating new pane 
- Adjusted default height and width to be a larger display
- Increased percentage space the side table takes up because the team name, mark etc were very cramped

#implement #story[16]:
 2017-03-24 12:24:56 +13:00
Erika Savell d23a80841a Tests for race clock being scaled correctly added 
#story[16] #test
 2017-03-24 11:57:54 +13:00
David Wu f8147be4df Merge remote-tracking branch 'origin/story9' into story9 
# Conflicts:
#	src/main/java/seng302/Constants.java
#	src/main/java/seng302/Model/Race.java
#	src/main/java/seng302/Model/ResizableRaceCanvas.java
 2017-03-23 18:20:25 +13:00
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]
 2017-03-23 18:11:13 +13:00
Erika Savell 944da81946 Test that boat velocities are being scaled correctly added 
#story[16] #implement
 2017-03-23 17:37:52 +13:00
Erika Savell 4c7295998b Added scaler variable to mulitply the race clock and the boats' velocities by 
- Races take roughly 15 mins realtime with a slowest boat of ~20 knots. Therefore scale by 3 for a 5 min race, and 15 for a 1 min race

#story[16] #implement
 2017-03-23 17:07:16 +13:00
Erika Savell caf99ae891 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9 2017-03-23 13:55:37 +13:00
Erika Savell 4c82a4594e Added a small test for the timer function 
-More needed once scaling is in effect

#test #story[16]
 2017-03-23 13:41:14 +13:00
Erika Savell 1c6bed7f37 Tests for the Race class added 
-Mostly to do with checking positions and updating correctly

#test #story 9
 2017-03-22 14:12:45 +13:00
Erika Savell 271c0dec80 Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9 2017-03-22 13:36:05 +13:00
Erika Savell df8b711cf5 Tests for BoatInRace, imported Mockito 
#test #story[24]
 2017-03-22 13:35:47 +13:00
Erika Savell 288324ace6 Back to string properties 
-Listeners were not working with getting values from existing properties

#refactor #story[15]
 2017-03-22 13:03:28 +13:00
Fan-Wu Yang 8fac6ad23b Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9 2017-03-22 12:20:31 +13:00
Fan-Wu Yang a77f4883f3 Create Resource XML 
- Created Race XML file which contains the perameters of the bermuda race for AC35
 2017-03-22 12:20:20 +13:00
Erika Savell 7e2804215b Methods for calculating heading (instead of azimuth) added 
- Azimuth is necessary for geodetic calculator but is between -180 and 180
- Headings need to be displayed from 0 to 360 so conversions methods were necessary

#implement #sory[24]
 2017-03-22 11:38:57 +13:00
Erika Savell 71995accfb Refactored BoatInRace currentLegName property 
-Removed current leg name as current leg was already being stored so it was redundant

#refactor #story[15]
 2017-03-22 11:22:05 +13:00
Erika Savell 393fae2ec4 Tests for calculating leg distance and updating boat positions added 
#story[9] #test
 2017-03-22 11:03:16 +13:00
Erika Savell 74a9b1499c Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9 2017-03-22 10:09:09 +13:00
Erika Savell 0387bdc597 Tests for genreating new coordinate added 
#test #story[9]
 2017-03-22 10:07:14 +13:00
Connor Taylor-Brown 26f7b94e13 Fixed finish order 
- Added test to check order is determined by velocity
- Modified Race class to allow for unit testing

#story[15]
 2017-03-20 20:18:32 +13:00
cbt24 05fe402fd0 Merge remote-tracking branch 'origin/story9' into story9 
# Conflicts:
#	src/main/java/seng302/Model/ResizableRaceCanvas.java
 2017-03-20 17:28:22 +13:00
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]
 2017-03-20 17:27:09 +13:00
cbt24 c8fcada427 Fixed sort order for boats in race 
- Sort boats by leg number (preserves order when boats enter shared leg)

#story [19]
 2017-03-20 17:26:13 +13:00
David Wu 4efab9091d Merge remote-tracking branch 'origin/story9' into story9 
# Conflicts:
#	src/main/java/seng302/Model/Boat.java
 2017-03-20 17:12:06 +13:00
David Wu 293f63ca8b Added abbreviations to each boat 
-BoatInRace now takes extra parameter "abbrev"

#story [18]
 2017-03-20 17:08:25 +13:00
Fan-Wu Yang 419fa8e9fe Fixed merge conflicts 
- Fixed Merge conflicts with boats
#merge
 2017-03-20 16:56:43 +13:00
David Wu b5496b07de Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9 2017-03-20 16:47:09 +13:00
David Wu 98c5c46569 Implemented displayText to display boat name and speed with mark 
-method takes in boat name, boat speed and coordinates

#story [18, 19]
 2017-03-20 16:46:59 +13:00
Erika Savell 7778e7d2b1 Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9 2017-03-20 16:42:48 +13:00
Erika Savell a9601eb760 Switched latitude/longitude around 
We were using latitude on the x plane and longitude on the y plane

#story[9] #fix
 2017-03-20 16:40:32 +13:00
Fan-Wu Yang 15fd24203d Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9 2017-03-20 16:38:40 +13:00
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]
 2017-03-20 16:38:35 +13:00
David Wu c33ce60e71 Changed labels for timer 
-preRace countdown now has text saying "Time until race starts:"
-Timer during race now says "Race clock:"

#story [16]
 2017-03-20 16:26:18 +13:00
David Wu 1842b8f0b2 Merge remote-tracking branch 'origin/story9' into story9 
# Conflicts:
#	src/main/java/seng302/Model/Race.java
 2017-03-20 16:22:12 +13:00
David Wu 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

#story [16]
 2017-03-20 16:20:05 +13:00
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]
 2017-03-20 16:11:02 +13:00
Erika Savell 3afa13d24b Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9 2017-03-20 15:47:57 +13:00
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
 2017-03-20 15:47:09 +13:00
David Wu e04fdc79c9 Merge remote-tracking branch 'origin/story9' into story9 
# Conflicts:
#	.idea/compiler.xml
#	.idea/misc.xml
 2017-03-20 15:34:12 +13:00
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]
 2017-03-20 15:33:37 +13:00
Erika Savell d0d4316bac Boat race finishes when all boats have crossed the line 
- Added a boolean flag 'finished' to BoatInRace

#implement #story[9]
 2017-03-20 15:07:20 +13:00
Erika Savell fda1e0ed61 Renaming all instances of app to team-7 and resetting pom, .idea files etc 
#chore
 2017-03-20 14:44:13 +13:00