44a5b9a38fFixed 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 Yang
2017-05-01 20:25:09 +1200
84bb4fdb8fFixed 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 Yang
2017-05-01 20:23:52 +1200
63ee51d938Fixed compoundMarkID typo that was causing a parse int exception
Erika Savell
2017-05-01 20:19:07 +1200
5444b872bdFixed 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 Yang
2017-05-01 20:13:16 +1200
9eae70fb82Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
Joseph Gardner
2017-05-01 19:42:30 +1200
32dabdb187Fixed course xml reader. #story[782]
Joseph Gardner
2017-05-01 19:42:17 +1200
04366c2e4cFixed small Merge issue - Deleted a unfinished statement that caused hte build to fail #story[782]
Fan-Wu Yang
2017-05-01 19:24:59 +1200
560af8c21dAdded more data types to Visualiser Input that can be take from InputStream -Added AverageWind -Added CourseWinds -Added MarkRounding -Added RaceStartStatus #story[782]
Fan-Wu Yang
2017-05-01 19:21:43 +1200
18e9234240Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
Joseph Gardner
2017-05-01 19:15:44 +1200
f0943d232aDate formatting now supports both old and new formatting and dnf has been added to boat. #story[782]
Joseph Gardner
2017-05-01 19:15:33 +1200
e40bb6c4cbMerge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
cbt24
2017-05-01 18:55:08 +1200
2e7527b325Update 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
cbt24
2017-05-01 18:52:52 +1200
060db182a8Minor tweaks to get streaming from mock working
Erika Savell
2017-05-01 18:35:39 +1200
2c414d3061Added way to get the Race Status and Boat Status' - Added getters in Visualiser Input - Added Hashmap for boat status messages #story[782]
Fan-Wu Yang
2017-05-01 18:35:15 +1200
2a2fe6de59Race clock now works and the setup for the racestart now checks if the tag has "Start" or "Time". #story[782]
Joseph Gardner
2017-05-01 18:16:21 +1200
185c65e54dEditing MockOutput to send actual generated boat/race/regatta xmls
Erika Savell
2017-05-01 18:15:36 +1200
8bbea28cabrefactored the boat message to not use boats
hba56
2017-05-01 17:35:30 +1200
9eefbbd7faMerge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
Joseph Gardner
2017-05-01 16:51:48 +1200
8117e11ff2Merge branch 'NetworkedVisualiser' into splitIntoTwoModules
Joseph Gardner
2017-05-01 16:51:03 +1200
41a94495aaChanged 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 Gardner
2017-05-01 16:42:47 +1200
4811b7f4eaMerge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
David Wu
2017-05-01 16:39:26 +1200
0bfc9a5a39Added test for race dnf in Race class. -Unable to test animation timer.
David Wu
2017-05-01 16:37:55 +1200
7cb4b2228dMerge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
hba56
2017-05-01 16:08:28 +1200
a271952e0cfixed boat parser for the mock
hba56
2017-05-01 16:08:23 +1200
3f42d56502Merge remote-tracking branch 'remotes/origin/splitIntoTwoModules' into NetworkedVisualiser
cbt24
2017-05-01 16:00:11 +1200
b1db9ee5beMerge remote-tracking branch 'remotes/origin/splitIntoTwoModules' into NetworkedVisualiser
cbt24
2017-05-01 15:55:19 +1200
40a7ca808fadded .trim to remove the unwanted bytes at the end of xml
hba56
2017-05-01 15:21:42 +1200
ccbe467090Synchronised 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
cbt24
2017-05-01 15:21:12 +1200
444a4432c6Fixed 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 Yang
2017-05-01 15:07:59 +1200
10dd066302Removed 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 Gardner
2017-05-01 14:15:34 +1200
7e569b59b7Commenting out tests just to get CI working, will investigate on different branch
Erika Savell
2017-04-30 21:26:57 +1200
067beed1e3Attempted to write test for calls to MockOutput
Erika Savell
2017-04-30 20:55:40 +1200
bbd282bd9bSet race to send out status messages (including boat location details)
Erika Savell
2017-04-30 20:18:04 +1200
c3717b7fc5Added 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 Yang
2017-04-29 18:26:02 +1200
06e65c2cd2Generate StreamedCourse from VisualiserInput - Allow Race to get boat location messages (added last commit) - Removed faulty import statement (this commit)
Connor Taylor-Brown
2017-04-28 20:33:58 +1200
68a8f64fd3Generate StreamedCourse from VisualiserInput
Connor Taylor-Brown
2017-04-28 20:29:03 +1200
e2f3abffc6WIP adding race status messages
Erika Savell
2017-04-28 18:11:28 +1200
8569d3f2dcAdded 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 Yang
2017-04-28 17:00:04 +1200
5a972c855eMerge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
hba56
2017-04-28 14:32:32 +1200
5bbdd6e00dupdated the visualiserinput to be a thread
hba56
2017-04-28 14:32:25 +1200
d977d3f146Merge branch 'visualiserAndDataLink' into splitIntoTwoModules
Joseph Gardner
2017-04-28 13:26:12 +1200
9c24b0840eChanged MockInput to thread
Erika Savell
2017-04-28 13:18:07 +1200
3b13f5bac1swapping sockets so mock is the server rather than visualiser
hba56
2017-04-28 13:17:01 +1200
39d3cc7c28Removed boats being able to store colour, this is now down the in the ResizableRaceCanvas. #refactor #story[782]
Joseph Gardner
2017-04-28 12:44:53 +1200
b1bbef814bSwitching to use networking modules
Erika Savell
2017-04-28 12:43:14 +1200
f377cf6471Changed 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 Gardner
2017-04-28 12:35:00 +1200
c95f5377f6Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
hba56
2017-04-28 11:37:23 +1200
2289936f4fJavadoc fix to get CI running
Erika Savell
2017-04-28 11:36:30 +1200
f4e4a207beMerge branch 'networkingTest' into splitIntoTwoModules
hba56
2017-04-28 11:34:47 +1200
7d35312644Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
cbt24
2017-04-28 11:30:58 +1200
04a1e70920small refactor of the VisualiserInput to better use the decoder
hba56
2017-04-28 11:30:43 +1200
3d284c4a2bMerge branch 'splitIntoTwoModules' into visualiserAndDataLink
Joseph Gardner
2017-04-28 11:23:59 +1200
ecebace9f1Merge branch 'splitIntoTwoModules' of eng-git.canterbury.ac.nz:seng302-2017/team-7 into splitIntoTwoModules
fjc40
2017-04-28 11:22:05 +1200
7f273f8ba0Fixed time source for visualiser, replacing local time - StreamedCourse now provides start time for clock from XML
Connor Taylor-Brown
2017-04-28 02:37:50 +1200
02511db2b9Implemented marker visualisation from XML in ResizableRaceCanvas - Replaced and deprecated Constants - Added getMarkers to RaceDataSource interface - Added boundary testing for source data
Connor Taylor-Brown
2017-04-28 01:58:55 +1200
873089707dFixed 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]
fjc40
2017-04-28 01:32:39 +1200
d29c0a9439Mock now serializes and sends Boat.xml, Race.xml, Regatta.xml, Heartbeat, BoatLocation messages.
fjc40
2017-04-28 01:30:03 +1200
90f8bec415Moved 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.
fjc40
2017-04-28 01:27:45 +1200
033198ca2cLinked the streamedRace course to the visualiser, linked the boats to the visualiser (this needs to be tests) #story[768]
Joseph
2017-04-28 00:53:07 +1200
278a7dbde0Added 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 Yang
2017-04-27 22:44:21 +1200
50cb31b85fMoved networking code into the network module.
fjc40
2017-04-27 20:28:07 +1200
06d786d581Merge remote-tracking branch 'origin/networkingTest' into splitIntoTwoModules
fjc40
2017-04-27 20:02:18 +1200
538f1bd6baremoved all putInt and putShort methods for byte buffers to fix tests
hba56
2017-04-27 16:23:31 +1200
7dd07b470aupdate byte to int methods in decoders
hba56
2017-04-27 16:01:50 +1200
137e85e14cMerge remote-tracking branch 'origin/networkingTest' into networkingTest
hba56
2017-04-27 15:59:41 +1200
1d33015925Fixed 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 Yang
2017-04-27 15:58:04 +1200
246420ccf9fixed bug with heartbeat
hba56
2017-04-27 15:53:38 +1200
949b967abbvisualiserInput update as well as refactor of number to bytes conversion
hba56
2017-04-27 15:33:23 +1200
bd7fefd67eWorked on the MockOutput Class
hba56
2017-04-26 14:38:57 +1200
8223ae46a1Fixed 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 Yang
2017-04-25 20:25:56 +1200
413ab7b768Added Tests for bytesToLong - Tested for Bytes to long - Fixed little endian and big endian being thewrong way around. #story[782]
Fan-Wu Yang
2017-04-25 19:57:14 +1200
df871b1242Added tests to fix ByteConverter - Integers cutting and chopping now works - Integer to bytes word - bytes to integer also work #story[782]
Fan-Wu Yang
2017-04-25 19:40:20 +1200
be9f02997eFixed issue where the new XML Decoder funtion was changed - Changed String XML Message to InputSource #story[782]
Fan-Wu Yang
2017-04-25 18:36:39 +1200
7d7564ce15Added 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 Yang
2017-04-25 18:29:05 +1200
1e3b816ff5Added tests for BoatData and RaceData
Erika Savell
2017-04-25 17:59:06 +1200
Erika Savell 2017-05-01 20:25:54 +1200
Fan-Wu Yang 2017-05-01 20:25:09 +1200
Joseph Gardner 2017-05-01 19:42:30 +1200
cbt24 2017-05-01 18:55:08 +1200
hba56 2017-05-01 17:35:30 +1200
David Wu 2017-05-01 16:39:26 +1200
fjc40 2017-04-28 11:22:05 +1200