f27dbc29b0
Added self-documenting RaceStatus boolean getters
...
- Deprecated RaceStatus.getRaceStatus
#story[782]
9 years ago
037c09b059
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
bb57685faf
Added Test for AC35UnitConverter
...
- Added tests to make sure it was working properly
#story[782]
9 years ago
62ecd40967
fixed all java doc errors
...
#story[782]
9 years ago
cfa6ba1c3f
Fixed speed notbeing displayed from AC35 live data
...
- Turns out the AC35 stream gives the speed in the SOG (speed over ground) section, not the boat speed section
#story[782]
9 years ago
23dfc6a6bf
Fixed annotation toggles displaying behind course
...
#story[782]
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
d2e08fa8e1
Added boat velocity to information provided by mock
...
#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
5444b872bd
Fixed GPs Coordinates as well as got Boats to display
...
- Fixed GPS conversion number being wrong (extra 1)
- Fixed Boats displaying as the boat = null (cough Joseph) was stopping it from working as well as track is broken.
#story[782]
9 years ago
560af8c21d
Added more data types to Visualiser Input that can be take from InputStream
...
-Added AverageWind
-Added CourseWinds
-Added MarkRounding
-Added RaceStartStatus
#story[782]
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
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
7cb4b2228d
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
9 years ago
a271952e0c
fixed boat parser for the mock
...
#story[778]
9 years ago
b1db9ee5be
Merge remote-tracking branch 'remotes/origin/splitIntoTwoModules' into NetworkedVisualiser
...
# Conflicts:
# visualiser/src/main/java/seng302/VisualiserInput.java
9 years ago
69fca43534
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
9acd519d7b
Removed the rest of the shared model classes needed by mock
...
#story[778]
9 years ago
cdcbb07dc6
removed unused conversion
9 years ago
40a7ca808f
added .trim to remove the unwanted bytes at the end of xml
...
#pair[hba56, fw13, jjg64]
#story[782]
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
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
3f748bfdb6
Removed BoatInRace from shared model, refactored
...
#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
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
ce47818c94
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
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
b1bbef814b
Switching to use networking modules
...
#story[778]
9 years ago
f4e4a207be
Merge branch 'networkingTest' into splitIntoTwoModules
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
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
50cb31b85f
Moved networking code into the network module.
9 years ago
cbt24
Fan-Wu Yang
hba56
Erika Savell
Joseph Gardner
fjc40