fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
244 Commits 1 Branch 0 Tags
7f2d8107b86fa73a008df6efc2e9043ddc57ad29
Commit Graph
244 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Fan-Wu Yang 3f55a45362 Documented RaceMap 
- Added Constructor Documentation for RaceMap
#documentation
 2017-03-19 22:53:57 +13:00
Fan-Wu Yang 4e94da5e49 Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9 2017-03-19 22:49:07 +13:00
Fan-Wu Yang dffd77f7a7 Filled in missing documentation. 
- Added Documentation for all Classes.
#documentation
 2017-03-19 22:48:58 +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
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]
 2017-03-19 21:21:21 +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
cbt24 92c0011f80 Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9 2017-03-17 13:29:53 +13:00
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]
 2017-03-17 13:29:33 +13:00
Fan-Wu Yang b15edd49d6 Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2017-03-17 13:13:23 +13:00
Fan-Wu Yang 15829628f2 Fixed Map 
- Changed GPS Coordinate so that latitude and longitude were on the correct orientation
- Map is now centered.
#fix
 2017-03-17 13:10:29 +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
David Wu b3b200fb02 Fixed arrow not resizing with resizable canvas 
#story [14]
 2017-03-17 12:30:22 +13:00
David Wu 8bb2558b7e Timer is now in race loop 
-Timer is currently printing out
-Later will implement so that it is displayed on gui

#story [16]
 2017-03-17 12:06:35 +13:00