9acd519d7b
Removed the rest of the shared model classes needed by mock
...
#story[778]
9 years ago
d34dfc537e
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
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
e927242707
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
3f748bfdb6
Removed BoatInRace from shared model, refactored
...
#story[778]
9 years ago
10dd066302
Removed error checking within XML readers and ensured XML readers fail. Did this so an XML reader is not made with an invalid file. #story[782]
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
c972dd7caf
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
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
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
06e65c2cd2
Generate StreamedCourse from VisualiserInput
...
- Allow Race to get boat location messages (added last commit)
- Removed faulty import statement (this commit)
#story[782]
9 years ago
68a8f64fd3
Generate StreamedCourse from VisualiserInput
...
#story[782]
9 years ago
e2f3abffc6
WIP adding race status messages
...
#story[778]
9 years ago
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
5a972c855e
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
9 years ago
5bbdd6e00d
updated the visualiserinput to be a thread
...
#story[782]
9 years ago
eab41315c5
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
760f1ed5a9
Added CRC
...
- CRC checking now works
#story[782]
9 years ago
db4792452f
added run statement to mock thread
...
#story[782]
9 years ago
214e26ad90
Switched port back to 4942
...
#story[778]
9 years ago
6befa24302
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
3b24d35677
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
9 years ago
bbd725d069
Merge
9 years ago
ce47818c94
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
d977d3f146
Merge branch 'visualiserAndDataLink' into splitIntoTwoModules
...
# Conflicts:
# visualiser/src/main/java/seng302/Controllers/RaceController.java
# visualiser/src/main/java/seng302/Controllers/StartController.java
# visualiser/src/main/java/seng302/Mock/BoatXMLReader.java
# visualiser/src/main/java/seng302/Mock/StreamedBoat.java
# visualiser/src/main/java/seng302/Mock/StreamedCourse.java
# visualiser/src/main/java/seng302/Mock/StreamedRace.java
# visualiser/src/main/java/seng302/Model/BoatInRace.java
# visualiser/src/main/java/seng302/Model/ConstantVelocityRace.java
# visualiser/src/main/java/seng302/Model/Race.java
# visualiser/src/main/java/seng302/RaceXMLReader.java
# visualiser/src/test/java/seng302/Model/ConstantVelocityRaceTest.java
9 years ago
9c24b0840e
Changed MockInput to thread
...
#story[778}
9 years ago
3b13f5bac1
swapping sockets so mock is the server rather than visualiser
...
#story[782]
9 years ago
39d3cc7c28
Removed boats being able to store colour, this is now down the in the ResizableRaceCanvas. #refactor #story[782]
9 years ago
b1bbef814b
Switching to use networking modules
...
#story[778]
9 years ago
f377cf6471
Changed it so Boat can be used as a superclass for StreamedBoat and BoatInRace properly and removed ConstantVelocityRace. Everything that used to use BoatInRace or StreamedBoat now uses it superclass (boat). #pair[jjg64, cbt24] #refactor #story[782]
9 years ago
c95f5377f6
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
9 years ago
2289936f4f
Javadoc fix to get CI running
...
#story[778]
9 years ago
f4e4a207be
Merge branch 'networkingTest' into splitIntoTwoModules
9 years ago
7d35312644
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
9 years ago
5f3f3770bb
Temporarily ignore out-of-bound race markers in testing.
...
#story[758]
9 years ago
04a1e70920
small refactor of the VisualiserInput to better use the decoder
...
#story[782]
9 years ago
3d284c4a2b
Merge branch 'splitIntoTwoModules' into visualiserAndDataLink
...
# Conflicts:
# visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java
9 years ago
ecebace9f1
Merge branch 'splitIntoTwoModules' of eng-git.canterbury.ac.nz:seng302-2017/team-7 into splitIntoTwoModules
9 years ago
7f273f8ba0
Fixed time source for visualiser, replacing local time
...
- StreamedCourse now provides start time for clock from XML
#story[782]
9 years ago
02511db2b9
Implemented marker visualisation from XML in ResizableRaceCanvas
...
- Replaced and deprecated Constants
- Added getMarkers to RaceDataSource interface
- Added boundary testing for source data
#story[782]
9 years ago
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
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
033198ca2c
Linked the streamedRace course to the visualiser, linked the boats to the visualiser (this needs to be tests) #story[768]
9 years ago
a18eb86438
Merge branch 'networkingTest' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into networkingTest
9 years ago
278a7dbde0
Added rare bug which would cause system crash
...
- Fixed Array Index out of Bounds when they try to send a message of 9 length and it is to be turned into a number
#story[782]
9 years ago
50cb31b85f
Moved networking code into the network module.
9 years ago
Erika Savell
Fan-Wu Yang
Joseph Gardner
Connor Taylor-Brown
hba56
fjc40