fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
186 Commits 1 Branch 0 Tags
dc3286822718ec322869b23ac218c3c66f8fb6de
Commit Graph
77 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Erika Savell dc32868227 Created countdown clock on start screen. 
#story[760]
 2017-04-19 13:35:02 +12:00
Erika Savell 4e78ae2ae7 Fixed testing problem where race tests would sometimes fail because a boat did not finish 
- Added an option to set the dnf chance, then set it to 0 is all tests

#story[760]
 2017-04-17 15:41:23 +12:00
Erika Savell f25e2bac32 Changed countdown length to two minutes 2017-04-17 15:25:54 +12:00
Erika Savell 62d220f1fb Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story27 2017-04-17 15:08:04 +12:00
Erika Savell 8112918c13 Attempted to load details in, but ran into problems with the string property/vs string distinction 
#pair[jam330] #story[760]
 2017-04-06 17:17:06 +12:00
Erika Savell 47df6266d2 Created start race entry point in main controller so it could be called by start race controller 
story[760]
 2017-04-06 16:19:31 +12:00
Erika Savell 0772ca22c6 Re-engineered fxml controllers to use child controllers 
- Removed a lot of unnecessary complexity in App class

#pair[jam339, esa46] #story[760]
 2017-04-06 15:35:55 +12:00
Erika Savell a689ffc689 Added quick descriptions to params to get javadoc working 2017-04-06 14:31:11 +12:00
Erika Savell 6866f65adf Ignoring failing test to check CI is working. 
- Test will be fixed as part of another stoy
 2017-04-06 13:53:21 +12:00
Erika Savell 94444e6662 Negligible change to check CI runner is working 2017-04-06 13:41:04 +12:00
Erika Savell ee72d85f6a removed print messages 
#story[20]
 2017-03-30 14:33:28 +13:00
Erika Savell ec9574fd9d Refactoring 
#story[24]
 2017-03-29 23:58:00 +13:00
Erika Savell e2f9a710aa Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into changeStartingPositions2 2017-03-29 23:07:57 +13:00
Erika Savell fc1121b5b7 Removed extra < char from .mailmap 2017-03-29 23:07:42 +13:00
Erika Savell 6344e12d8f Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into changeStartingPositions2 2017-03-29 23:06:24 +13:00
Erika Savell 9808c57ca7 GOat boats spread out at startline working 
#story[20]
 2017-03-29 23:06:16 +13:00
Erika Savell 9f71c99ecf Updated .mailmap 2017-03-29 23:05:36 +13:00
Erika Savell 0e7d210cea Amended wake tests to handle markers instead of direct coordinates 
#test
 2017-03-29 22:02:24 +13:00
Erika Savell 970f0d0116 Fixed race scaling 
- Races were completed far too quickly because a set SLEEPTIME was used as the time elapsed, instead of the actual break time

#story[16]
 2017-03-29 21:51:03 +13:00
Erika Savell fb409af23b Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into changeStartingPositions2 2017-03-29 19:54:53 +13:00
Erika Savell 495158a621 Amended and added tests to cope with marker change 
#test #story[20]
 2017-03-29 19:47:49 +13:00
Erika Savell 40a6801477 Marker tests added 
#story[20]
 2017-03-29 12:37:53 +13:00
Erika Savell eb4c02557d Changing xml reader to take both coordinates of a marker 
- Have commented out tests for now because  a lot of rearranging and fixing needed

#story[20]
 2017-03-29 12:08:40 +13:00
Erika Savell d1d46f2cf5 Created Marker class 
- Holds the start and end coordinate of a gate or marker, and has a method to calculate the middle point
- Each leg will hold a start Marker and end Marker

#story[20]
 2017-03-29 11:16:37 +13:00
Erika Savell 45fcd22cc5 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into changeStartingPositions2 2017-03-29 10:46:06 +13:00
Erika Savell 2d2f4692a9 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into changeStartingPositions2 2017-03-28 14:42:22 +13:00
Erika Savell bb6b881392 Adding end coords to get test running gain 
#story[20]
 2017-03-28 14:38:08 +13:00
Erika Savell 176b644aaf Created boat initialise method to run through boats setting correct start position 
- Running funny, try pulling changes from master

#story[20]
 2017-03-26 20:56:26 +13:00
Erika Savell d15cd2b881 Wrote method to calculate spread positions across start line 
- Also began work to make sure it is called. Requires refactoring
- WIP, this porgramme shouldn't run atm

#story[20]
 2017-03-26 20:28:20 +13:00
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
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
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
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
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
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
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
Erika Savell 30b844e094 Renamed project to team-7 
#chore
 2017-03-20 14:35:26 +13:00
Erika 3dd343eb94 Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9 2017-03-19 23:06:50 +13:00
Erika 195ee10473 Added two test boats to race 
#story[9] #implement
 2017-03-19 23:05:18 +13:00
Erika ccaee9131d Fixing Maven issues 
#chore
 2017-03-19 22:45:12 +13:00
Erika cf5de5962a Loaded the rest of the legs of the bermuda course in as an example race 
#story[9] #implement
 2017-03-19 21:30:49 +13:00
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]
 2017-03-19 14:14:53 +13:00
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] 2017-03-19 13:09:49 +13:00
Erika Savell 05c7af4abf Implemented redrawing boat with each loop 
- Not complete. New gps coordinate needs work around bearing -> azimuth conversion

#implement #story[9]
 2017-03-17 18:13:48 +13:00
Erika Savell e6e59e2df9 Changed POM file to recognise project as team-7 
-We had two project names, 'app' and 'team-7', which was causing problems with maven

#fix #story9
 2017-03-17 15:54:01 +13:00
Erika Savell 1284cac68e Importing geotools library to calculate next coordinate for boat 
-Currently getting ClassDefNotFound error
- I think one of th elibraries dependencies is visible and compile time not runtime

#story[9] #implement
 2017-03-17 13:03:27 +13:00
Erika Savell 2811a09784 Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9 2017-03-17 11:13:27 +13:00
Erika Savell b82ded6014 Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9 2017-03-16 16:40:53 +13:00
Erika Savell 8090108b12 Began implementing function to calculate boat's new coordinates 
-Using haversine function
-current values being produced are too small

#implement #story[9]
 2017-03-16 16:40:34 +13:00
Erika Savell 2551dd7362 Added single test to debug race process 2017-03-15 22:02:13 +13:00
Erika Savell dbbfece149 Fixed resources issue 2017-03-15 17:14:30 +13:00
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
 2017-03-15 16:59:55 +13:00
Erika Savell b73fee2cb5 Rewriting code to work with the transplanted loop 
- Event has been replaced by leg, which holds the start and end coordinates, and total distance needed to pass it.
- The boats coordinates will be recalculated at each run through of the loop
- Not worrying about randomised race for now.

#refactor
 2017-03-15 15:04:30 +13:00
Erika Savell 54d4ea2d03 Merge remote-tracking branch 'origin/story9' into mergePacedLoop 
# Conflicts:
#	.idea/compiler.xml
#	.idea/misc.xml
 2017-03-15 13:50:52 +13:00
Erika Savell 0dc5efd830 Just trying to fix my ide 2017-03-15 13:49:39 +13:00
Erika Savell 41cdf09dc2 Started merging team 8 paced loop into team 7 codebase. 
-No running! Syntax errors and not done merging

-Just pushing so David can pull changes

#pair[zwu18, esa46]
 2017-03-15 11:03:50 +13:00