fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,092 Commits 1 Branch 0 Tags
346aa148ef495a7fb06cf4c420568f2b9a0b970c
Commit Graph
1092 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Erika Savell 6e10f86a90 Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules 2017-05-04 12:39:58 +12:00
Erika Savell 311cd99457 Added newlines to xml created by mock 
#story[778]
 2017-05-04 12:39:46 +12:00
cbt24 cd55052654 Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules 2017-05-04 12:38:26 +12:00
cbt24 c1fa760dde Streamlined clock handling. 
- Set starting time from network
- Update RaceClock instance to current time from network

#story[782]
 2017-05-04 12:38:21 +12:00
Erika Savell 98723b88d4 Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules 2017-05-04 12:26:04 +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
Joseph Gardner 618073d04e Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules 2017-05-04 12:11:47 +12:00
Joseph Gardner 94ad164a45 Boat table and positions now update. #story[782] 2017-05-04 12:11:36 +12:00
Joseph Gardner e43353c322 Boat table and positions now update. #story[782] 2017-05-04 12:10:13 +12:00
Erika Savell d38baa9fc4 Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules 2017-05-04 11:58:46 +12:00
cbt24 09483fff2c Added blocking loop to wait 
- waits for the InputStream to be populated for at least 15 bytes of size before reading in case of header size error potentially crashing the program.
#story[782]
 2017-05-04 11:49:16 +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
Connor Taylor-Brown 8886b5db05 Fixed RegattaXMLTest. 
#story[782]
 2017-05-04 01:40:12 +12:00
Connor Taylor-Brown 7d81fc810c Display name of race in lobby. 
- Moved Regatta properties and accessors to RegattaXMLReader
- StartController update now tolerates any permutation of types of XML messages

#story[782]
 2017-05-04 01:32:28 +12:00
Connor Taylor-Brown 1723d0c27f Fixed scaling of wakes (note issues with velocity data) 
- Official stream provides speeds of 0 kn
- Mock provides speeds that do not correlate with motion

#story[782]
 2017-05-04 00:32:06 +12:00
Connor Taylor-Brown 0e1bf64177 Fixed boat track rendering (points were added before boat position set) 
#story[782]
 2017-05-03 22:31:34 +12:00
Connor Taylor-Brown 9bab3d3359 Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules 2017-05-03 22:04:19 +12:00
Connor Taylor-Brown e7008ab6db Fixed race playback issue, removed obsolete detail from UI. 
- Removed race scaling options
- Refactored start screen timer formatting for clarity
- Removed incomplete countdownTimer override in Streamed Race

#story[782]
 2017-05-03 22:04:08 +12:00
Erika Savell b9901a252a Moved speed conversion to BoatMessage class 
#story[778]
 2017-05-03 21:01:30 +12:00
Erika Savell 7c59632c41 Fixes to get race running 
- Had an incorrect if else statement that was preventing race from running

#story[778]
 2017-05-03 20:48:37 +12:00
Erika Savell d2e08fa8e1 Added boat velocity to information provided by mock 
#story[778]
 2017-05-03 20:36:43 +12:00
Connor Taylor-Brown 5a92dd68f5 Fixed build and interface problems. 
- Ignore online host test (fails on CI)
- Disable connect button on startup to prevent bad socket

#story[782]
 2017-05-03 19:31:00 +12:00
Connor Taylor-Brown ac4fbda848 Added connection screen to allow users to select available hosts from a preconfigured list. 
- Added ConnectionController for initial client setup
- Added RaceConnection class for socket data and checking
- Configures StartController with a socket drawn from a host table

#story[782]
 2017-05-03 03:40:36 +12:00
cbt24 ad58407021 Began work on ConnectionController for selecting active hosts on startup via GUI. 
#story[782]
 2017-05-03 00:35:46 +12:00
cbt24 577dea2a56 Fixed time zone label on RaceController. 
#story[782]
 2017-05-02 22:41:51 +12:00
Erika Savell 08f203a0f8 Added race statuses for before the race has started. 3 min -> 1 min is warning, 1 min -> 0 min is preparatory. 
-Boat locations (spread across start line) are also broad casted

#story[778]
 2017-05-02 20:13:39 +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
Erika Savell f2e0eec212 Fixed date time parsing problem 
#story[778]
 2017-05-02 16:50:09 +12:00
Erika Savell 7d1f4209e4 Got mock data being used by visualiser. 
- Issue with zonedTimeDate not parsing
- Fixed race crashing once one boat finished

#story[778]
 2017-05-01 20:56:46 +12:00
Erika Savell d1baf021ac Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules 2017-05-01 20:25:54 +12:00
Erika Savell 984617ce57 Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules 2017-05-01 20:25:36 +12:00
Fan-Wu Yang 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]
 2017-05-01 20:25:09 +12:00
Fan-Wu Yang 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]
 2017-05-01 20:23:52 +12:00
Erika Savell 63ee51d938 Fixed compoundMarkID typo that was causing a parse int exception 
- All that was needed was capitalizing the D in ID in the parser

#story[782]
 2017-05-01 20:19:07 +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
Joseph Gardner 9eae70fb82 Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules 
# Conflicts:
#	visualiser/src/main/java/seng302/VisualiserInput.java
 2017-05-01 19:42:30 +12:00
Joseph Gardner 32dabdb187 Fixed course xml reader. #story[782] 2017-05-01 19:42:17 +12:00
Fan-Wu Yang 04366c2e4c Fixed small Merge issue 
- Deleted a unfinished statement that caused hte build to fail
#story[782]
 2017-05-01 19:24:59 +12:00
Fan-Wu Yang 0fc1da4090 Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules 2017-05-01 19:21:48 +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
Joseph Gardner 18e9234240 Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules 2017-05-01 19:15:44 +12:00
Joseph Gardner f0943d232a Date formatting now supports both old and new formatting and dnf has been added to boat. #story[782] 2017-05-01 19:15:33 +12:00
cbt24 e40bb6c4cb Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules 
# Conflicts:
#	visualiser/src/main/java/seng302/VisualiserInput.java
 2017-05-01 18:55:08 +12:00
cbt24 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

#story[782]
 2017-05-01 18:52:52 +12:00
Erika Savell 4b485fe5ca Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules 2017-05-01 18:47:48 +12:00
Erika Savell 060db182a8 Minor tweaks to get streaming from mock working 
- Key point there being boats, raceand regatta xml files are being read from mock

#story[778]
 2017-05-01 18:35:39 +12:00
Fan-Wu Yang 2c414d3061 Added way to get the Race Status and Boat Status' 
- Added getters in Visualiser Input
- Added Hashmap for boat status messages
#story[782]
 2017-05-01 18:35:15 +12:00
Erika Savell 0ef96258ad Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules 2017-05-01 18:21:37 +12:00