44a5b9a38f
Fixed merge issue - Strange Issue where there was a null pointer from convertGPS however it has resolved itself may crop in the future htough. #story[782]
Fan-Wu Yang2017-05-01 20:25:09 +12:00
84bb4fdb8f
Fixed merge issue - Strange Issue where there was a null pointer from convertGPS however it has resolved itself may crop in the future htough. #story[782]
Fan-Wu Yang2017-05-01 20:23:52 +12:00
63ee51d938
Fixed compoundMarkID typo that was causing a parse int exception
Erika Savell2017-05-01 20:19:07 +12:00
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]
Fan-Wu Yang2017-05-01 20:13:16 +12:00
9eae70fb82
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
Joseph Gardner2017-05-01 19:42:30 +12:00
560af8c21d
Added more data types to Visualiser Input that can be take from InputStream -Added AverageWind -Added CourseWinds -Added MarkRounding -Added RaceStartStatus #story[782]
Fan-Wu Yang2017-05-01 19:21:43 +12:00
18e9234240
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
Joseph Gardner2017-05-01 19:15:44 +12:00
f0943d232a
Date formatting now supports both old and new formatting and dnf has been added to boat. #story[782]
Joseph Gardner2017-05-01 19:15:33 +12:00
e40bb6c4cb
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
cbt242017-05-01 18:55:08 +12:00
2e7527b325
Update boat position according to boat location messages in StreamedRace - Added StreamedRace constructor accepting VisualiserInput - Modified VisualiserInput constructor to accept Socket - Refactored controller setup of Race
cbt242017-05-01 18:52:52 +12:00
060db182a8
Minor tweaks to get streaming from mock working
Erika Savell2017-05-01 18:35:39 +12:00
2c414d3061
Added way to get the Race Status and Boat Status' - Added getters in Visualiser Input - Added Hashmap for boat status messages #story[782]
Fan-Wu Yang2017-05-01 18:35:15 +12:00
2a2fe6de59
Race clock now works and the setup for the racestart now checks if the tag has "Start" or "Time". #story[782]
Joseph Gardner2017-05-01 18:16:21 +12:00
185c65e54d
Editing MockOutput to send actual generated boat/race/regatta xmls
Erika Savell2017-05-01 18:15:36 +12:00
8bbea28cab
refactored the boat message to not use boats
hba562017-05-01 17:35:30 +12:00
9eefbbd7fa
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
Joseph Gardner2017-05-01 16:51:48 +12:00
8117e11ff2
Merge branch 'NetworkedVisualiser' into splitIntoTwoModules
Joseph Gardner2017-05-01 16:51:03 +12:00
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]
Joseph Gardner2017-05-01 16:42:47 +12:00
4811b7f4ea
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
David Wu2017-05-01 16:39:26 +12:00
0bfc9a5a39
Added test for race dnf in Race class. -Unable to test animation timer.
David Wu2017-05-01 16:37:55 +12:00
7cb4b2228d
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
hba562017-05-01 16:08:28 +12:00
a271952e0c
fixed boat parser for the mock
hba562017-05-01 16:08:23 +12:00
3f42d56502
Merge remote-tracking branch 'remotes/origin/splitIntoTwoModules' into NetworkedVisualiser
cbt242017-05-01 16:00:11 +12:00
b1db9ee5be
Merge remote-tracking branch 'remotes/origin/splitIntoTwoModules' into NetworkedVisualiser
cbt242017-05-01 15:55:19 +12:00
40a7ca808f
added .trim to remove the unwanted bytes at the end of xml
hba562017-05-01 15:21:42 +12:00
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
cbt242017-05-01 15:21:12 +12:00
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]
Fan-Wu Yang2017-05-01 15:07:59 +12:00
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]
Joseph Gardner2017-05-01 14:15:34 +12:00
7e569b59b7
Commenting out tests just to get CI working, will investigate on different branch
Erika Savell2017-04-30 21:26:57 +12:00
067beed1e3
Attempted to write test for calls to MockOutput
Erika Savell2017-04-30 20:55:40 +12:00
bbd282bd9b
Set race to send out status messages (including boat location details)
Erika Savell2017-04-30 20:18:04 +12:00
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]
Fan-Wu Yang2017-04-29 18:26:02 +12:00
06e65c2cd2
Generate StreamedCourse from VisualiserInput - Allow Race to get boat location messages (added last commit) - Removed faulty import statement (this commit)
Connor Taylor-Brown2017-04-28 20:33:58 +12:00
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]
Fan-Wu Yang2017-04-28 17:00:04 +12:00
5a972c855e
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
hba562017-04-28 14:32:32 +12:00
5bbdd6e00d
updated the visualiserinput to be a thread
hba562017-04-28 14:32:25 +12:00
3b13f5bac1
swapping sockets so mock is the server rather than visualiser
hba562017-04-28 13:17:01 +12:00
39d3cc7c28
Removed boats being able to store colour, this is now down the in the ResizableRaceCanvas. #refactor #story[782]
Joseph Gardner2017-04-28 12:44:53 +12:00
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]
Joseph Gardner2017-04-28 12:35:00 +12:00
c95f5377f6
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
hba562017-04-28 11:37:23 +12:00
04a1e70920
small refactor of the VisualiserInput to better use the decoder
hba562017-04-28 11:30:43 +12:00
3d284c4a2b
Merge branch 'splitIntoTwoModules' into visualiserAndDataLink
Joseph Gardner2017-04-28 11:23:59 +12:00
ecebace9f1
Merge branch 'splitIntoTwoModules' of eng-git.canterbury.ac.nz:seng302-2017/team-7 into splitIntoTwoModules
fjc402017-04-28 11:22:05 +12:00
7f273f8ba0
Fixed time source for visualiser, replacing local time - StreamedCourse now provides start time for clock from XML
Connor Taylor-Brown2017-04-28 02:37:50 +12:00
02511db2b9
Implemented marker visualisation from XML in ResizableRaceCanvas - Replaced and deprecated Constants - Added getMarkers to RaceDataSource interface - Added boundary testing for source data
Connor Taylor-Brown2017-04-28 01:58:55 +12:00
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]
fjc402017-04-28 01:32:39 +12:00
d29c0a9439
Mock now serializes and sends Boat.xml, Race.xml, Regatta.xml, Heartbeat, BoatLocation messages.
fjc402017-04-28 01:30:03 +12:00
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.
fjc402017-04-28 01:27:45 +12:00
033198ca2c
Linked the streamedRace course to the visualiser, linked the boats to the visualiser (this needs to be tests) #story[768]
Joseph2017-04-28 00:53:07 +12:00
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]
Fan-Wu Yang2017-04-27 22:44:21 +12:00
50cb31b85f
Moved networking code into the network module.
fjc402017-04-27 20:28:07 +12:00
06d786d581
Merge remote-tracking branch 'origin/networkingTest' into splitIntoTwoModules
fjc402017-04-27 20:02:18 +12:00
538f1bd6ba
removed all putInt and putShort methods for byte buffers to fix tests
hba562017-04-27 16:23:31 +12:00
7dd07b470a
update byte to int methods in decoders
hba562017-04-27 16:01:50 +12:00
137e85e14c
Merge remote-tracking branch 'origin/networkingTest' into networkingTest
hba562017-04-27 15:59:41 +12:00
1d33015925
Fixed a small array out of bounds exception error - Error in Byte ConverterTest where the array was pointing at the wrong place which could make an error
Fan-Wu Yang2017-04-27 15:58:04 +12:00
246420ccf9
fixed bug with heartbeat
hba562017-04-27 15:53:38 +12:00
949b967abb
visualiserInput update as well as refactor of number to bytes conversion
hba562017-04-27 15:33:23 +12:00
bd7fefd67e
Worked on the MockOutput Class
hba562017-04-26 14:38:57 +12:00
8223ae46a1
Fixed some issues - Fixed issue where everything was inputted as an integer when converting to a byte array. - Seperated loops that are used often to make it more readable. #story[782]
Fan-Wu Yang2017-04-25 20:25:56 +12:00
413ab7b768
Added Tests for bytesToLong - Tested for Bytes to long - Fixed little endian and big endian being thewrong way around. #story[782]
Fan-Wu Yang2017-04-25 19:57:14 +12:00
df871b1242
Added tests to fix ByteConverter - Integers cutting and chopping now works - Integer to bytes word - bytes to integer also work #story[782]
Fan-Wu Yang2017-04-25 19:40:20 +12:00
be9f02997e
Fixed issue where the new XML Decoder funtion was changed - Changed String XML Message to InputSource #story[782]
Fan-Wu Yang2017-04-25 18:36:39 +12:00
7d7564ce15
Added being able to decode everything into their respective classes - Made classes for Heartbeat message, race status message, xml messag,e racestartstatus message, boat location message, mark rounding message, course wind message, average wind message. - Made a statci calculation class for calculating bytes to int or long - Message Decoder now kinda works! #story[782]
Fan-Wu Yang2017-04-25 18:29:05 +12:00
Erika Savell
Fan-Wu Yang
Joseph Gardner
cbt24
hba56
David Wu
fjc40