61afe8d608
Created finish view to see when a race finishes.
...
-Implemented FinishController
-Fixed mock not sending Finish race status.
#Story[782]
9 years ago
a95a0c2543
Added documentation for multiple classes.
...
#Story[782]
9 years ago
62db7f333c
Frantically cherry-picking commit by commit
...
#story[778]
9 years ago
8ed0ca5b4f
Quick way of adding extra leg to mock data
...
- To be redundant when the mock feed pulls from a proper xml instead of having two parsers
#story[778]
9 years ago
6888d0bddc
fixed all java doc errors
...
#story[782]
9 years ago
545ef7aa7f
Fix lobby not entering race when race status is "started".
...
-Race was previously stuck in lobby screen when race status was not 2.
#Story[782]
9 years ago
5ebd4251e2
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
c3ee3ec9e2
Added new lines to the other two xml creators
...
#story[778]
9 years ago
bf12f77796
Set it so the lobby view switches to race view depending on the race status passed in by the mock.
...
-Removed start button in lobby as it should be automatic.
-TODO: Synchronize the times across the whole race as they do not matching.
#Story[782]
9 years ago
b60b4b257f
Remove start button from StartController.
...
#story[778]
9 years ago
311cd99457
Added newlines to xml created by mock
...
#story[778]
9 years ago
eb58581e83
Fixed velocity issues with mock data
...
-Was accidentally sending scaled velocity
#story[778]
9 years ago
b9901a252a
Moved speed conversion to BoatMessage class
...
#story[778]
9 years ago
7c59632c41
Fixes to get race running
...
- Had an incorrect if else statement that was preventing race from running
#story[778]
9 years ago
d2e08fa8e1
Added boat velocity to information provided by mock
...
#story[778]
9 years ago
08f203a0f8
Added race statuses for before the race has started. 3 min -> 1 min is warning, 1 min -> 0 min is preparatory.
...
-Boat locations (spread across start line) are also broad casted
#story[778]
9 years ago
049f0f7331
Changed main loop so boats are looped through with a different starting boat
...
-This was necessary because one boat (the last one to be processed) would lag and jump, as sometimes there was not enough time for all location messages to be sent before the next lot were added.
- The solution was to add a boatOffset, which means while the boats are still processed with3 coming after 2 coming after 1 etc, the loop starts with boat 0, then the next run through it wiull start with boat 1 and so on.
-This eliminated the lag (or at least spread it evenly across all the boats)
#story[778]
9 years ago
42ad1f78fc
Added heading to boatlocation messages
...
#story[778]
9 years ago
f2e0eec212
Fixed date time parsing problem
...
#story[778]
9 years ago
7d1f4209e4
Got mock data being used by visualiser.
...
- Issue with zonedTimeDate not parsing
- Fixed race crashing once one boat finished
#story[778]
9 years ago
63ee51d938
Fixed compoundMarkID typo that was causing a parse int exception
...
- All that was needed was capitalizing the D in ID in the parser
#story[782]
9 years ago
060db182a8
Minor tweaks to get streaming from mock working
...
- Key point there being boats, raceand regatta xml files are being read from mock
#story[778]
9 years ago
185c65e54d
Editing MockOutput to send actual generated boat/race/regatta xmls
...
- Was previously sending from a static source file
#story[778]
9 years ago
8bbea28cab
refactored the boat message to not use boats
...
#story[778]
9 years ago
9eefbbd7fa
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
9 years ago
8117e11ff2
Merge branch 'NetworkedVisualiser' into splitIntoTwoModules
...
# Conflicts:
# visualiser/src/main/java/seng302/VisualiserInput.java
9 years ago
4811b7f4ea
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
...
# Conflicts:
# mock/src/test/java/seng302/Model/RaceTest.java
9 years ago
0bfc9a5a39
Added test for race dnf in Race class.
...
-Unable to test animation timer.
#story[778]
9 years ago
9acd519d7b
Removed the rest of the shared model classes needed by mock
...
#story[778]
9 years ago
ccbe467090
Synchronised GUI with VisualiserInput thread.
...
- Made StreamedCourse extend Observable
- Initialised StartController after data pulled from network
- Moved VisualiserInput to visualiser module
- Deleted Networking subpackage from visualiser module
#story[782]
9 years ago
3f748bfdb6
Removed BoatInRace from shared model, refactored
...
#story[778]
9 years ago
7e569b59b7
Commenting out tests just to get CI working, will investigate on different branch
...
#story[778]
9 years ago
2320675b7e
Fixing build
...
#story[778]
9 years ago
0126d29524
Fixing some of the SharedModel/seng302 import conflicts
...
-Am really not liking the SharedModel structure, think reverting back to original structure is worth discussing
story[778]
9 years ago
067beed1e3
Attempted to write test for calls to MockOutput
...
-Struggling because we use animation timers to run the race, and these don't seem to work from a JUnit context
#story[778]
9 years ago
bbd282bd9b
Set race to send out status messages (including boat location details)
...
- Untested, so not sure of accuracy yet
#story[778]
9 years ago
e2f3abffc6
WIP adding race status messages
...
#story[778]
9 years ago
9c24b0840e
Changed MockInput to thread
...
#story[778}
9 years ago
b1bbef814b
Switching to use networking modules
...
#story[778]
9 years ago
d29c0a9439
Mock now serializes and sends Boat.xml, Race.xml, Regatta.xml, Heartbeat, BoatLocation messages.
...
#story[778]
9 years ago
90f8bec415
Moved several classes from seng302.model to its own module - sharedModel (this is supposed to contain any shared data model code between mock and visualiser). Specifically, Regatta, Boat, BoatInRace, Constants, GPSCoordinate, Leg, Marker.
...
Updated RaceVisionByteEncoder.raceStatus to accept a Racestatus object rather than a bunch of parameters.
Added getters to RaceStatus class.
Updated some tests.
Removed Network tests from Mock, as they were duplicated.
9 years ago
1e3b816ff5
Added tests for BoatData and RaceData
...
#story[778]
9 years ago
83dfe1a60c
Renamed some directories, optimized imports, general code clean up
...
#story[778]
9 years ago
073102d1a3
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock
9 years ago
e30aa02aac
Commented and javadoc-ed RegattaData and BoatData
...
#story[9]
9 years ago
19224ba840
Refactored RegattaData
...
#story[778]
9 years ago
ba5c965fd6
Refactored BoatData
...
#story[778]
9 years ago
302f2c6869
Javadoc and commented RaceData class
...
#story[778]
9 years ago
3542827c29
Refactored RaceData class
...
#story[778]
9 years ago
03f63b2c61
Added boat data xml tests
...
#story[778]
9 years ago
David Wu
Erika Savell
hba56
Joseph Gardner
cbt24
fjc40