hba56
8bbea28cab
refactored the boat message to not use boats
...
#story[778]
9 years ago
Joseph Gardner
9eefbbd7fa
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
9 years ago
Joseph Gardner
8117e11ff2
Merge branch 'NetworkedVisualiser' into splitIntoTwoModules
...
# Conflicts:
# visualiser/src/main/java/seng302/VisualiserInput.java
9 years ago
David Wu
4811b7f4ea
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
...
# Conflicts:
# mock/src/test/java/seng302/Model/RaceTest.java
9 years ago
David Wu
0bfc9a5a39
Added test for race dnf in Race class.
...
-Unable to test animation timer.
#story[778]
9 years ago
Erika Savell
9acd519d7b
Removed the rest of the shared model classes needed by mock
...
#story[778]
9 years ago
cbt24
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
Erika Savell
3f748bfdb6
Removed BoatInRace from shared model, refactored
...
#story[778]
9 years ago
Erika Savell
7e569b59b7
Commenting out tests just to get CI working, will investigate on different branch
...
#story[778]
9 years ago
Erika Savell
2320675b7e
Fixing build
...
#story[778]
9 years ago
Erika Savell
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
Erika Savell
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
Erika Savell
b1bbef814b
Switching to use networking modules
...
#story[778]
9 years ago
fjc40
d29c0a9439
Mock now serializes and sends Boat.xml, Race.xml, Regatta.xml, Heartbeat, BoatLocation messages.
...
#story[778]
9 years ago
fjc40
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
Erika Savell
1e3b816ff5
Added tests for BoatData and RaceData
...
#story[778]
9 years ago
Erika Savell
83dfe1a60c
Renamed some directories, optimized imports, general code clean up
...
#story[778]
9 years ago
Erika Savell
073102d1a3
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock
9 years ago
Erika Savell
19224ba840
Refactored RegattaData
...
#story[778]
9 years ago
Erika Savell
3542827c29
Refactored RaceData class
...
#story[778]
9 years ago
Erika Savell
03f63b2c61
Added boat data xml tests
...
#story[778]
9 years ago
Joseph Gardner
26380f2677
Merge branch 'story30_XMLs' into splitIntoTwoModules
9 years ago
Erika Savell
6a35c40f77
Commented out test causing CI issues
...
#story[778]
9 years ago
Erika Savell
a9f98b48b2
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock
9 years ago
hba56
e9578fc63b
refactored networking code from networkingTest
...
#story[778, 782]
9 years ago
David Wu
d14446a12e
Added extra constructor in Race.
...
-Constructor is used for junit testing for Race class.
#story[778]
9 years ago
David Wu
0fd4de7ec7
Fixed previously broken tests due to refactoring app.
...
-ConstantVelocityRace doesn't exist anymore so tests had to be change to compensate for this.
-Boat in race had to be change due to the addition of the sourceID for each boat.
#story[778]
9 years ago
zwu18
c5df90d276
Created RegattaDataSource and regattaTest.xml.
...
-Event regattaData will now get data from the XML instead of having static data.
#story[778]
9 years ago
Erika Savell
3ff2a07680
Temporarily ignored some tests in mock
...
#story[778]
9 years ago
Erika Savell
c365d5a344
Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock
9 years ago
David Wu
5397d14d3c
Added sourceID to boats in race.
...
-All boats in race will now have a sourceID.
-SourceID will be used in XML object for boat.
#story[778]
9 years ago
Erika Savell
737755def6
Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock
9 years ago
Erika Savell
94ba18cf0c
Began xml creator for race info message
...
#story[778]
9 years ago
David Wu
687ffb41e6
Create XML object of boat data.
...
-XML object currently displaying out in terminal.
-Reads in data from RaceDataSource.
-TODO: Add sourceID to boats.
#story[778]
9 years ago
David Wu
265bece9ed
Added a heartbeat value to the race.
...
-Heartbeat will display and update every 5 seconds.
#story[778]
9 years ago
Erika Savell
97c5c9662b
Wrapped race in an event which sends out starting xml files
...
#story[778]
9 years ago
Joseph Gardner
a85bf292d5
new branch for xml readers for the visuliser
9 years ago
Erika Savell
a584400e24
Actually added sub modules this time
...
#story[778]
9 years ago