0387bdc597
Tests for genreating new coordinate added
...
#test #story[9]
9 years ago
26f7b94e13
Fixed finish order
...
- Added test to check order is determined by velocity
- Modified Race class to allow for unit testing
#story[15]
9 years ago
05fe402fd0
Merge remote-tracking branch 'origin/story9' into story9
...
# Conflicts:
# src/main/java/seng302/Model/ResizableRaceCanvas.java
9 years ago
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
c8fcada427
Fixed sort order for boats in race
...
- Sort boats by leg number (preserves order when boats enter shared leg)
#story [19]
9 years ago
4efab9091d
Merge remote-tracking branch 'origin/story9' into story9
...
# Conflicts:
# src/main/java/seng302/Model/Boat.java
9 years ago
293f63ca8b
Added abbreviations to each boat
...
-BoatInRace now takes extra parameter "abbrev"
#story [18]
9 years ago
419fa8e9fe
Fixed merge conflicts
...
- Fixed Merge conflicts with boats
#merge
9 years ago
b5496b07de
Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9
9 years ago
98c5c46569
Implemented displayText to display boat name and speed with mark
...
-method takes in boat name, boat speed and coordinates
#story [18, 19]
9 years ago
7778e7d2b1
Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9
9 years ago
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
15fd24203d
Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9
9 years ago
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
c33ce60e71
Changed labels for timer
...
-preRace countdown now has text saying "Time until race starts:"
-Timer during race now says "Race clock:"
#story [16]
9 years ago
1842b8f0b2
Merge remote-tracking branch 'origin/story9' into story9
...
# Conflicts:
# src/main/java/seng302/Model/Race.java
9 years ago
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]
9 years ago
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
3afa13d24b
Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9
9 years ago
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
e04fdc79c9
Merge remote-tracking branch 'origin/story9' into story9
...
# Conflicts:
# .idea/compiler.xml
# .idea/misc.xml
9 years ago
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
d0d4316bac
Boat race finishes when all boats have crossed the line
...
- Added a boolean flag 'finished' to BoatInRace
#implement #story[9]
9 years ago
fda1e0ed61
Renaming all instances of app to team-7 and resetting pom, .idea files etc
...
#chore
9 years ago
30b844e094
Renamed project to team-7
...
#chore
9 years ago
3dd343eb94
Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9
9 years ago
195ee10473
Added two test boats to race
...
#story[9] #implement
9 years ago
3f55a45362
Documented RaceMap
...
- Added Constructor Documentation for RaceMap
#documentation
9 years ago
4e94da5e49
Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9
9 years ago
dffd77f7a7
Filled in missing documentation.
...
- Added Documentation for all Classes.
#documentation
9 years ago
ccaee9131d
Fixing Maven issues
...
#chore
9 years ago
cf5de5962a
Loaded the rest of the legs of the bermuda course in as an example race
...
#story[9] #implement
9 years ago
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
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
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
05c7af4abf
Implemented redrawing boat with each loop
...
- Not complete. New gps coordinate needs work around bearing -> azimuth conversion
#implement #story[9]
9 years ago
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
9 years ago
92c0011f80
Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9
9 years ago
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
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.
9 years ago
15829628f2
Fixed Map
...
- Changed GPS Coordinate so that latitude and longitude were on the correct orientation
- Map is now centered.
#fix
9 years ago
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
9 years ago
b3b200fb02
Fixed arrow not resizing with resizable canvas
...
#story [14]
9 years ago
8bb2558b7e
Timer is now in race loop
...
-Timer is currently printing out
-Later will implement so that it is displayed on gui
#story [16]
9 years ago
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
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
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
2811a09784
Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9
9 years ago
bc4701ef32
Fixed Canvas not filling screen issue
...
- Created ResizableRaceCanvas Class
- Moved all draw functions to ResizableRaceCanvas
#fix
9 years ago
d393766027
Partially completed story 13
9 years ago
Erika Savell
Connor Taylor-Brown
David Wu
Fan-Wu Yang