8112918c13
Attempted to load details in, but ran into problems with the string property/vs string distinction
...
#pair[jam330] #story[760]
9 years ago
101dadc003
Gave BoatInRace a track property that stores the coordinates of the track. Added a method in ResizableRaceCanvas that draws the points on the track every time the canvas updates. [Story 25]
9 years ago
7790322e04
Implemented the Time showing on Grid
...
- Added Label to scene
- Added Timezone formatting
#story[28] #pair[fwy13,hba56]
9 years ago
ee65e7eba5
Changed where the saved annotation set is declared.
...
-Annotation set is now initialized along with annotations.
#story[26]
9 years ago
d08a1c325f
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7
9 years ago
5c89c1aeb7
Implemented functionality to select which annotations to display. Selected annotations can be temporarily saved and then displayed on a button press.
...
-Added checkboxes to display name, abbreviation, and speed in annotation.
-Changed single titlepane to an accordion.
-Moved all annotation controls to separate titlepane in accordion.
-Added buttons to save and load saved annotation settings.
#story[26]
9 years ago
58cae682ab
Merge branch 'story27' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story27
9 years ago
44fac754a7
Created screen for showing starters
...
- modified start pane
- added table to populate with starting boats
#Story[760]
9 years ago
47df6266d2
Created start race entry point in main controller so it could be called by start race controller
...
story[760]
9 years ago
71f0085268
Implemented geotimezone from com.github.bfsmith
...
- Calculates timezone from mark
#story[28] #pair[fwy13,hba56]
9 years ago
0772ca22c6
Re-engineered fxml controllers to use child controllers
...
- Removed a lot of unnecessary complexity in App class
#pair[jam339, esa46] #story[760]
9 years ago
a689ffc689
Added quick descriptions to params to get javadoc working
9 years ago
6866f65adf
Ignoring failing test to check CI is working.
...
- Test will be fixed as part of another stoy
9 years ago
94444e6662
Negligible change to check CI runner is working
9 years ago
8e70dfa2d5
Fixed boat position calculation
...
- Decoupled 'place' column data from position in table
- Set position in race after first mark passed
#story[15]
9 years ago
795b411f08
Added some doc strings
...
- Added doc strings to RaceXML
- Added a few minor changes to bermuda_AC35.xml
- Changes to the RaceXMLReader Unit Test
9 years ago
c105c2d01e
Fixed file paths so they work when it becomes an executable
...
- Changed file paths for the FXML files
9 years ago
ee72d85f6a
removed print messages
...
#story[20]
9 years ago
ec9574fd9d
Refactoring
...
#story[24]
9 years ago
9808c57ca7
GOat boats spread out at startline working
...
#story[20]
9 years ago
0e7d210cea
Amended wake tests to handle markers instead of direct coordinates
...
#test
9 years ago
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]
9 years ago
fb409af23b
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into changeStartingPositions2
9 years ago
495158a621
Amended and added tests to cope with marker change
...
#test #story[20]
9 years ago
305326881f
Merged Boundaries branch
...
- Merged Boundaries branch.
#story[22]
9 years ago
461d894ac8
Merge branch 'boundaries'
...
# Conflicts:
# src/main/java/seng302/Controllers/RaceController.java
# src/main/java/seng302/Model/ResizableRaceCanvas.java
# src/main/resources/scenes/racepane.fxml
9 years ago
6ffe3d02a3
Fixed and merged heading-visualisation
...
- Fixed the boats not appearing at the starting line.
- Merged with master
#story[24]
9 years ago
edd9c2a48d
Merge remote-tracking branch 'origin/heading-visualisation'
...
# Conflicts:
# src/main/java/seng302/Controllers/RaceController.java
# src/main/java/seng302/Model/Boat.java
# src/main/java/seng302/Model/Race.java
# src/main/java/seng302/Model/ResizableRaceCanvas.java
# src/main/resources/scenes/racepane.fxml
9 years ago
eb97bd6aef
Implemented resizable map and boundary scaling.
...
- Map can now be downsized
- The boundaries are auto margined and fit in the center of the canvas.
#implement
9 years ago
1524ed5a0e
Merged annotation toggle and DNF features with heading visualisation.
9 years ago
9960317732
Removed tooltip
9 years ago
68fccc3216
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7
9 years ago
4ee6624ff6
Changed abbreviations for teams
...
-Updated the team abbreviations to official ones
-Change methods that were public to private
9 years ago
40a6801477
Marker tests added
...
#story[20]
9 years ago
98be99a975
Merge remote-tracking branch 'origin/master'
9 years ago
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]
9 years ago
b943b38d61
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# src/main/java/seng302/Model/Boat.java
9 years ago
99cb4bd526
Implemented DNF with random chance in Race
...
#story [17]
9 years ago
d2de426f58
Fixed so the animation timer will exit when all boats finish the race
...
-Moved listeners for annotation to initialize
-Fixed compass arrow not rescaling properly with canvas
-Fixed scaling issue with race clock
9 years ago
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]
9 years ago
6fe80ad52c
Fixed speed displayed in table view
...
#story [17]
9 years ago
45fcd22cc5
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into changeStartingPositions2
9 years ago
f7477adb36
Added javadoc for new methods used for annotation and fps
...
#story[23]
9 years ago
33b94cdf5b
Changed implementation for Anno(annotations)
...
-drawRaceMap is now called for annotation to update map
#story[23]
9 years ago
224c16a713
Implemented Map Boundaries in XML
...
- RaceXMLReader will calculate the top left latitude and longitude and the bottom right latitude and longitude, and make the layout the map accordingly.
- The Boundaries are draw on the Race Canvas in Aqua.
#story[22]
9 years ago
2d2f4692a9
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into changeStartingPositions2
9 years ago
bb6b881392
Adding end coords to get test running gain
...
#story[20]
9 years ago
cfbb27513d
Fixed wake scale for realistic speeds.
...
#story[21]
9 years ago
3aaee1291d
Implemented heading visualisation
...
- Boats are represented as isosceles triangles
- Boats are rotated toward heading while in race
- As heading is only available in race, RaceController draws boats on start line and in race separately
#story [24]
9 years ago
879de9869b
Implemented XML Reader
...
-XMLReader class for generic XML Reading Created
- RaceXML Reader class made specifically for reading races
- RaceController COnstants now replced with XML file
#implement
9 years ago
176b644aaf
Created boat initialise method to run through boats setting correct start position
...
- Running funny, try pulling changes from master
#story[20]
9 years ago
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]
9 years ago
24dec0bb2f
Fixed participating boats not outputting correctly
...
-toString method in Boat class now uses getValue
9 years ago
bd072af0c4
Modified size of mark
...
-Size of the mark changed to avoid confusion between mark and boats.
9 years ago
073bcaa4a3
Added checkbox to change visibility of annotation to GUI
...
-Checkbox is used to toggle the text displayed beside boats
-Race Clock is now scaled using the scale factor
#story [23]
9 years ago
0df8235a28
Added TitledPane and Checkbox to GUI.
...
-Checkbox is used to control the visibility of the FPS counter
#story [20]
9 years ago
f8dff6359d
Merge branch 'story9'
...
# Conflicts:
# src/main/java/seng302/Controllers/RaceController.java
# src/main/java/seng302/Model/Race.java
# src/main/java/seng302/Model/ResizableRaceCanvas.java
# src/main/resources/scenes/racepane.fxml
9 years ago
306e98172b
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into heading-visualisation
9 years ago
bd86690e85
Filled in javadoc, optimised imports, rearranged code
...
#refactor #story[16]
9 years ago
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]
9 years ago
f5ba7c95c8
Fixing merge and resulting failing tests
...
#fix #story[16]
9 years ago
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]
9 years ago
e923fe671b
Changed race clock to display negative time before race
...
#story[16] #implement
9 years ago
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]
9 years ago
0fde0cd9b5
Created new start screen and implemented switching from start to race map
...
#implement #story[16]
9 years ago
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]:
9 years ago
d23a80841a
Tests for race clock being scaled correctly added
...
#story[16] #test
9 years ago
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
9 years ago
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]
9 years ago
944da81946
Test that boat velocities are being scaled correctly added
...
#story[16] #implement
9 years ago
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
9 years ago
4c82a4594e
Added a small test for the timer function
...
-More needed once scaling is in effect
#test #story[16]
9 years ago
1c6bed7f37
Tests for the Race class added
...
-Mostly to do with checking positions and updating correctly
#test #story 9
9 years ago
271c0dec80
Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9
9 years ago
df8b711cf5
Tests for BoatInRace, imported Mockito
...
#test #story[24]
9 years ago
288324ace6
Back to string properties
...
-Listeners were not working with getting values from existing properties
#refactor #story[15]
9 years ago
8fac6ad23b
Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9
9 years ago
a77f4883f3
Create Resource XML
...
- Created Race XML file which contains the perameters of the bermuda race for AC35
9 years ago
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]
9 years ago
71995accfb
Refactored BoatInRace currentLegName property
...
-Removed current leg name as current leg was already being stored so it was redundant
#refactor #story[15]
9 years ago
393fae2ec4
Tests for calculating leg distance and updating boat positions added
...
#story[9] #test
9 years ago
74a9b1499c
Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9
9 years ago
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
Erika Savell
Joseph Gardner
Fan-Wu Yang
David Wu
Jessica McAuslin
Connor Taylor-Brown