fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
485 Commits 1 Branch 0 Tags
cc824aa89a3784a6f6d34e23bdba90205fddb14d
Commit Graph
48 Commits
Author SHA1 Message Date
Fan-Wu Yang 037c09b059 Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules 2017-05-04 13:42:28 +12:00
Fan-Wu Yang bb57685faf Added Test for AC35UnitConverter 
- Added tests to make sure it was working properly
#story[782]
 2017-05-04 13:40:43 +12:00
hba56 62ecd40967 fixed all java doc errors 
#story[782]
 2017-05-04 13:40:37 +12:00
Erika Savell 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]
 2017-05-04 12:25:50 +12:00
Erika Savell 23dfc6a6bf Fixed annotation toggles displaying behind course 
#story[782]
 2017-05-04 10:34:25 +12:00
Erika Savell eb58581e83 Fixed velocity issues with mock data 
-Was accidentally sending scaled velocity

#story[778]
 2017-05-04 10:16:10 +12:00
Erika Savell b9901a252a Moved speed conversion to BoatMessage class 
#story[778]
 2017-05-03 21:01:30 +12:00
Erika Savell d2e08fa8e1 Added boat velocity to information provided by mock 
#story[778]
 2017-05-03 20:36:43 +12:00
Erika Savell 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]
 2017-05-02 19:50:12 +12:00
Erika Savell 42ad1f78fc Added heading to boatlocation messages 
#story[778]
 2017-05-02 19:21:43 +12:00
Fan-Wu Yang 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]
 2017-05-01 20:13:16 +12:00
Fan-Wu Yang 560af8c21d Added more data types to Visualiser Input that can be take from InputStream 
-Added AverageWind
-Added CourseWinds
-Added MarkRounding
-Added RaceStartStatus
#story[782]
 2017-05-01 19:21:43 +12:00
hba56 8bbea28cab refactored the boat message to not use boats 
#story[778]
 2017-05-01 17:35:30 +12:00
Joseph Gardner 9eefbbd7fa Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules 2017-05-01 16:51:48 +12:00
Joseph Gardner 8117e11ff2 Merge branch 'NetworkedVisualiser' into splitIntoTwoModules 
# Conflicts:
#	visualiser/src/main/java/seng302/VisualiserInput.java
 2017-05-01 16:51:03 +12:00
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] 2017-05-01 16:42:47 +12:00
hba56 7cb4b2228d Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules 2017-05-01 16:08:28 +12:00
hba56 a271952e0c fixed boat parser for the mock 
#story[778]
 2017-05-01 16:08:23 +12:00
cbt24 b1db9ee5be Merge remote-tracking branch 'remotes/origin/splitIntoTwoModules' into NetworkedVisualiser 
# Conflicts:
#	visualiser/src/main/java/seng302/VisualiserInput.java
 2017-05-01 15:55:19 +12:00
Erika Savell 69fca43534 Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules 2017-05-01 15:49:26 +12:00
Erika Savell 9acd519d7b Removed the rest of the shared model classes needed by mock 
#story[778]
 2017-05-01 15:49:07 +12:00
hba56 cdcbb07dc6 removed unused conversion 2017-05-01 15:24:46 +12:00
hba56 40a7ca808f added .trim to remove the unwanted bytes at the end of xml 
#pair[hba56, fw13, jjg64]
#story[782]
 2017-05-01 15:21:42 +12:00
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]
 2017-05-01 15:21:12 +12:00
Erika Savell d34dfc537e Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules 2017-05-01 15:17:50 +12:00
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]
 2017-05-01 15:07:59 +12:00
Erika Savell 3f748bfdb6 Removed BoatInRace from shared model, refactored 
#story[778]
 2017-05-01 15:06:56 +12:00
Erika Savell c972dd7caf Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules 2017-04-30 21:20:04 +12:00
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]
 2017-04-30 20:55:40 +12:00
Erika Savell bbd282bd9b Set race to send out status messages (including boat location details) 
- Untested, so not sure of accuracy yet

#story[778]
 2017-04-30 20:18:04 +12:00
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]
 2017-04-29 18:26:02 +12:00
Connor Taylor-Brown 68a8f64fd3 Generate StreamedCourse from VisualiserInput 
#story[782]
 2017-04-28 20:29:03 +12:00
Erika Savell e2f3abffc6 WIP adding race status messages 
#story[778]
 2017-04-28 18:11:28 +12:00
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]
 2017-04-28 17:00:04 +12:00
hba56 5a972c855e Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules 2017-04-28 14:32:32 +12:00
hba56 5bbdd6e00d updated the visualiserinput to be a thread 
#story[782]
 2017-04-28 14:32:25 +12:00
Fan-Wu Yang eab41315c5 Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules 2017-04-28 13:44:19 +12:00
Fan-Wu Yang 760f1ed5a9 Added CRC 
- CRC checking now works
#story[782]
 2017-04-28 13:44:14 +12:00
hba56 db4792452f added run statement to mock thread 
#story[782]
 2017-04-28 13:34:50 +12:00
Erika Savell 214e26ad90 Switched port back to 4942 
#story[778]
 2017-04-28 13:30:19 +12:00
Erika Savell ce47818c94 Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules 2017-04-28 13:27:27 +12:00
Erika Savell 9c24b0840e Changed MockInput to thread 
#story[778}
 2017-04-28 13:18:07 +12:00
hba56 3b13f5bac1 swapping sockets so mock is the server rather than visualiser 
#story[782]
 2017-04-28 13:17:01 +12:00
Erika Savell b1bbef814b Switching to use networking modules 
#story[778]
 2017-04-28 12:43:14 +12:00
hba56 f4e4a207be Merge branch 'networkingTest' into splitIntoTwoModules 2017-04-28 11:34:47 +12:00
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]
 2017-04-28 01:32:39 +12:00
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.
 2017-04-28 01:27:45 +12:00
fjc40 50cb31b85f Moved networking code into the network module. 2017-04-27 20:28:07 +12:00