Erika Savell
a584400e24
Actually added sub modules this time
...
#story[778]
9 years ago
Erika Savell
669718d406
Cloned the main project into two submodules, mock and visualiser
...
#story[778]
9 years ago
cbt24
d12f70c8f8
Merge remote-tracking branch 'origin/story_30' into story_30
9 years ago
cbt24
0f22cf81ef
Moved implementational details of generated races to ConstantVelocityRace.
...
- Boat headings are now treated as a property, not a calculation
#story[758]
9 years ago
Joseph Gardner
3321727999
Tests for RegattaXMLReader #Story[782]
9 years ago
Joseph Gardner
b825790acd
Moved package to correct spot
9 years ago
Joseph Gardner
c40967f972
Added Regatta class and Regatta xml reader. This will be needed for the mock #Story[30]
9 years ago
Connor Taylor-Brown
316c0dda76
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# src/main/java/seng302/Controllers/RaceController.java
9 years ago
Connor Taylor-Brown
764eb9089f
Added race data source interface to abstract sources of race data.
...
- Refactored controllers to send data source to consumers (Race, ResizeableRaceCanvas)
#story[782]
9 years ago
David Wu
668758f6f8
Fixed boat path not being toggled when annotation is toggled.
...
#story[759]
9 years ago
Erika Savell
028cb33509
Fixing fxml problems
...
#story[760]
9 years ago
Erika Savell
374b31f5c0
Disabled scale buttons once one has been clicked
...
#story[760]
9 years ago
Erika Savell
b1e55f8c7d
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story28
9 years ago
Erika Savell
dc32868227
Created countdown clock on start screen.
...
#story[760]
9 years ago
Joseph Gardner
fc15c3d151
Added annotation to toggle all boat paths on and off #Pair[jjg64, zwu18] #Story[759]
9 years ago
hba56
f5472bf595
Merge remote-tracking branch 'remotes/origin/master' into story28
...
-anchors now fills stage
-added time label
# Conflicts:
# pom.xml
# src/main/java/seng302/Controllers/RaceController.java
# src/main/resources/scenes/racepane.fxml
#pair[fwy13, hba56]
#story[761]
9 years ago
hba56
edabe58b03
Merge remote-tracking branch 'remotes/origin/master' into story28
...
-anchors now fills stage
-added time label
# Conflicts:
# pom.xml
# src/main/java/seng302/Controllers/RaceController.java
# src/main/resources/scenes/racepane.fxml
#pair[fwy13, hba56]
#story[761]
9 years ago
Joseph Gardner
eb9fce1f22
Track scales with time scale #Pair[jjg64, zwu18] #Story[758]
9 years ago
cbt24
71535be143
Merge branch 'story_25'
9 years ago
cbt24
caf1e61391
Documented methods added for track handling.
...
#story[758]
9 years ago
Joseph Gardner
af9d6769e5
Story 25 merged #Story[758]
9 years ago
Joseph Gardner
b07e881edc
Merge branch 'story_25'
...
# Conflicts:
# src/main/java/seng302/Controllers/RaceController.java
# src/main/java/seng302/Model/ResizableRaceCanvas.java
# src/main/resources/scenes/racepane.fxml
9 years ago
Joseph Gardner
2945c8446e
Points now last whole race with a lower opacity #Story[25]
9 years ago
hba56
a00b066f8d
Quick fix to zoneId to make it set correctly
...
- removed local zoneId
#story[761]
#pair[fwy13, hba56]
9 years ago
Fan-Wu Yang
e501102bc5
Refactored the raceClock
...
- created a class that hosts the raceClock
- refactored the raceController to use a raceClock.
#story[761]
9 years ago
Joseph
56d51ceaa9
Track point is now removed after its expiry and fades after the boat has stopped Story [758]
9 years ago
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]
9 years ago
Erika Savell
f25e2bac32
Changed countdown length to two minutes
9 years ago
Erika Savell
62d220f1fb
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story27
9 years ago
cbt24
2d74cdc5dc
Fixed DNF position handling
...
- DNF position is now "-"
- If boat DNFs during leg, other boats' rankings are updated to remain accurate
#story[15]
9 years ago
cbt24
680c6fb991
Increased minimum opacity so actual track from start is visible.
...
- No longer removes points from track
#story[25]
9 years ago
cbt24
375202e7a0
Fades boat opacity every frame during and after race.
...
- Added TrackPoint with time added and expiry to calculate opacity each frame
- Modified drawTrackPoint to compute colour from TrackPoint alpha
- Removed getTrackPoint from BoatInRace
#pait[jjg64, cbt24]
9 years ago
Joseph Gardner
63591ad1ec
Added fixed opacity points of fading and modified race time to keep updating when the race is finished. Pair [jjg64, cbt24] Story [758]
9 years ago
cbt24
4eef872a60
Decoupled drawing and adding track points, added combobox selector for visible boats.
9 years ago
zwu18
c31ea51068
Temporarily removed test for countdown timer as countdown timer now uses animation timer.
9 years ago
zwu18
57d30a7a02
Fixed countdown timer not scaling.
...
-Countdown timer now also uses an animation timer
-Added scaling factor to countdown timer
9 years ago
Jessica McAuslin
2bf264c6bb
Populated starting boat table
...
- boat names shown in first column
- boat abbrevs. shown in second column
#story[760]
9 years ago
Erika Savell
8112918c13
Attempted to load details in, but ran into problems with the string property/vs string distinction
...
#pair[jam330] #story[760]
9 years ago
Joseph Gardner
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
Fan-Wu Yang
7790322e04
Implemented the Time showing on Grid
...
- Added Label to scene
- Added Timezone formatting
#story[28] #pair[fwy13,hba56]
9 years ago
David Wu
ee65e7eba5
Changed where the saved annotation set is declared.
...
-Annotation set is now initialized along with annotations.
#story[26]
9 years ago
David Wu
d08a1c325f
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7
9 years ago
David Wu
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
Jessica McAuslin
58cae682ab
Merge branch 'story27' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story27
9 years ago
Jessica McAuslin
44fac754a7
Created screen for showing starters
...
- modified start pane
- added table to populate with starting boats
#Story[760]
9 years ago
Erika Savell
47df6266d2
Created start race entry point in main controller so it could be called by start race controller
...
story[760]
9 years ago
Fan-Wu Yang
71f0085268
Implemented geotimezone from com.github.bfsmith
...
- Calculates timezone from mark
#story[28] #pair[fwy13,hba56]
9 years ago
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]
9 years ago
Erika Savell
a689ffc689
Added quick descriptions to params to get javadoc working
9 years ago
Erika Savell
6866f65adf
Ignoring failing test to check CI is working.
...
- Test will be fixed as part of another stoy
9 years ago