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
Joseph Gardner
41a94495aa
Changed the XML reader to take an InputStream rather than InputSource- this has changed everything that used an InputSource to use an InputStream. Made the XML Readers actually read after they received a new InputStream. Changed it so the table updates when the boats in the race change. #pair[jjg64, cbt24] #story[782]
9 years ago
hba56
7cb4b2228d
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
9 years ago
hba56
a271952e0c
fixed boat parser for the mock
...
#story[778]
9 years ago
cbt24
b1db9ee5be
Merge remote-tracking branch 'remotes/origin/splitIntoTwoModules' into NetworkedVisualiser
...
# Conflicts:
# visualiser/src/main/java/seng302/VisualiserInput.java
9 years ago
Erika Savell
69fca43534
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
Erika Savell
9acd519d7b
Removed the rest of the shared model classes needed by mock
...
#story[778]
9 years ago
hba56
cdcbb07dc6
removed unused conversion
9 years ago
hba56
40a7ca808f
added .trim to remove the unwanted bytes at the end of xml
...
#pair[hba56, fw13, jjg64]
#story[782]
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
d34dfc537e
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
Fan-Wu Yang
444a4432c6
Fixed stream from messing up
...
- Stream was getting code before all of it came therefore a while loop was added t owait for the code
#story[782] #pair[hba56, fwy13]
9 years ago
Erika Savell
3f748bfdb6
Removed BoatInRace from shared model, refactored
...
#story[778]
9 years ago
Erika Savell
c972dd7caf
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
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
bbd282bd9b
Set race to send out status messages (including boat location details)
...
- Untested, so not sure of accuracy yet
#story[778]
9 years ago
Fan-Wu Yang
c3717b7fc5
Added Classes to help Visualiser
...
- Added Get Boat GPS Coordinate
- Added Get Heading as Degrees
- Added Get True Wind Angle as Degrees
#story[782]
9 years ago
Connor Taylor-Brown
68a8f64fd3
Generate StreamedCourse from VisualiserInput
...
#story[782]
9 years ago
Erika Savell
e2f3abffc6
WIP adding race status messages
...
#story[778]
9 years ago
Fan-Wu Yang
8569d3f2dc
Added a few decoders and unit converters
...
- Units can be converted from int to degrees as a double
- XML message now keeps the most recent XML file
#story[782]
9 years ago
hba56
5a972c855e
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
9 years ago
hba56
5bbdd6e00d
updated the visualiserinput to be a thread
...
#story[782]
9 years ago
Fan-Wu Yang
eab41315c5
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
Fan-Wu Yang
760f1ed5a9
Added CRC
...
- CRC checking now works
#story[782]
9 years ago
hba56
db4792452f
added run statement to mock thread
...
#story[782]
9 years ago
Erika Savell
214e26ad90
Switched port back to 4942
...
#story[778]
9 years ago
Erika Savell
ce47818c94
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
Erika Savell
9c24b0840e
Changed MockInput to thread
...
#story[778}
9 years ago
hba56
3b13f5bac1
swapping sockets so mock is the server rather than visualiser
...
#story[782]
9 years ago
Erika Savell
b1bbef814b
Switching to use networking modules
...
#story[778]
9 years ago
hba56
f4e4a207be
Merge branch 'networkingTest' into splitIntoTwoModules
9 years ago
fjc40
873089707d
Fixed the RaceStatusDecoder not deserializing BoatStatus (a subobject of RaceStatus) properly.
...
RaceVisionByteEncoder.heartBeat now uses a long (and grabs the low 4 bytes from it), as the streaming spec requires a 4 byte unsigned int.
#story[778] #story[782]
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
fjc40
50cb31b85f
Moved networking code into the network module.
9 years ago