9902cec688
Added tests for BoatXMLReader - Verifies correct operation on boat and mark reading from boatTest.xml
cbt242017-05-10 14:23:33 +12:00
d7294f73a1
boats now have polars stored in the -added getter and setter for a boats polars
hba562017-05-10 14:23:26 +12:00
9aa4183a7c
Merge remote-tracking branch 'origin/49Mock' into 49Mock
cbt242017-05-10 13:57:36 +12:00
69cd44bda8
Reads data from boat XML file - Creates marks for building CompoundMarks (formerly Markers) - Rearranged Boat constructor and removed velocity
cbt242017-05-10 13:57:20 +12:00
16d3fe2ef2
Added marker boats with correct gps positions into boats xml read by mock
Erika Savell2017-05-10 13:50:28 +12:00
5b010cad49
added the polar class for storing polars #story[900]
hba562017-05-10 13:45:09 +12:00
e1ba2ae5b6
Now reads course wind direction from the live stream, so the wind arrow now changes when the wind changes. #story[882]
Joseph Gardner2017-05-08 17:23:55 +12:00
a32775eab6
Fixed a few javadoc issues.
fjc402017-05-08 10:59:13 +12:00
b247244665
Did some large tidy ups, refactoring, and documenting.
fjc402017-05-08 03:29:33 +12:00
466e22437b
Visualiser. The nullptr issues relating to the XML data files appears to be fixed. Essentially, the StartController.startRaceNoScaling() function was being called as soon possible, before it was even ready - setRaceClock either hadn't been called or hadn't finished executing yet, so the StartController.raceClock member was null, causing crashes.
fjc402017-05-07 18:34:44 +12:00
020c0329b0
Merge remote-tracking branch 'origin/TCPDisconnection' into submission
fjc402017-05-07 16:55:07 +12:00
83ce9b99d2
Mockoutput's main loop now pops messages off the message queue, rather than iterating over it like an array, and clearing it (this could have threading issues where the iteration starts (with e.g., 5 messages), as it is sending the messages another one is added, and then it ends up clearing the sent messages, and the unsent message.
fjc402017-05-07 15:52:34 +12:00
01224c509a
Added some comments to MockOutput. Also removed instance of RaceVisionByteEncoder, as it has no state, and the functions used are all static.
fjc402017-05-04 16:18:27 +12:00
3481a882de
Fixed Team Oracle's boat name in mock data file.
fjc402017-05-07 14:28:31 +12:00
61afe8d608
Created finish view to see when a race finishes. -Implemented FinishController -Fixed mock not sending Finish race status.
David Wu2017-05-06 20:14:10 +12:00
c038010bd2
Draws track for racing boats only to reduce information clutter. - Add track point only when boat status is "Racing"
cbt242017-05-06 19:22:20 +12:00
cc824aa89a
Removed unnecessary countdownTimer from Race in visualiser module - Run method now calls simulateRace directly
cbt242017-05-06 18:20:41 +12:00
a6adfb4960
Refactored RaceClock to act as central source of time and duration information throughout visualiser. - StartController and RaceController use same RaceClock instance - RaceClock updates automatically as Runnable for consistent operation - Duration between starting and current time is now an observable property of RaceClock
cbt242017-05-06 18:02:48 +12:00
bdf215d0f1
TCP connection at the front menu will no longer bug out if the socket is bugged. - Timeout set on connection socket so that the socket will return false after 5 seconds. #story[782]
Fan-Wu Yang2017-05-06 16:55:12 +12:00
a95a0c2543
Added documentation for multiple classes.
David Wu2017-05-06 16:39:15 +12:00
12e457824d
fix for issue #5 gate lines
hba562017-05-06 16:31:40 +12:00
d52b09e74a
Visualiser Closes All threads on exit now. - Added override for exiting the Visualiser which closes all threads: such as the TCP connection. #story[782]
Fan-Wu Yang2017-05-06 15:58:12 +12:00
a20dafea11
Annotations go on top and boundaries now update - Fixed FPS and other annotations being hidden under the map - Fixed boundaries not updating with the visualiser. #story[782]
Fan-Wu Yang2017-05-06 15:46:38 +12:00
982b47943a
Fixed blocking issue - Fixed byte stream error where it would reinitilise every run #story[782]
Fan-Wu Yang2017-05-06 15:27:21 +12:00
b7f010a2fa
Fixed Network While loops - Removed while blocking loops and replaced them with return statements #story[782]
Fan-Wu Yang2017-05-06 14:36:37 +12:00
862391d7ef
Canvas Layer Created - Canvas is created via layering. - Resizable canvas is now a seperate abstract class #story[782]
Fan-Wu Yang2017-05-04 16:54:06 +12:00
62db7f333c
Frantically cherry-picking commit by commit
Erika Savell2017-05-04 16:33:07 +12:00
8ed0ca5b4f
Quick way of adding extra leg to mock data
Erika Savell2017-05-04 13:44:44 +12:00
284eb6d951
Added Test for AC35UnitConverter - Added tests to make sure it was working properly #story[782]
Fan-Wu YangandErika Savell2017-05-04 13:40:43 +12:00
ccd90b91d7
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
hba562017-05-04 13:40:45 +12:00
bb57685faf
Added Test for AC35UnitConverter - Added tests to make sure it was working properly #story[782]
Fan-Wu Yang2017-05-04 13:40:43 +12:00
62ecd40967
fixed all java doc errors
hba562017-05-04 13:40:37 +12:00
545ef7aa7f
Fix lobby not entering race when race status is "started". -Race was previously stuck in lobby screen when race status was not 2.
David Wu2017-05-04 13:36:39 +12:00
e345f08ad8
Fixed AC35 stream crashing before status sent.
cbt242017-05-04 13:19:39 +12:00
88bb568ec7
Set it so the lobby view switches to race view depending on the race status passed in by the mock. -Removed start button in lobby as it should be automatic. -TODO: Synchronize the times across the whole race as they do not matching.
David Wu2017-05-04 13:14:29 +12:00
874953f763
Fixed issue win ResizableRaceCanvas - Issue where the boat position may mess up if it is called before the server has sent us information about hte location. #story[782]
Fan-Wu Yang2017-05-04 13:07:05 +12:00
bf12f77796
Set it so the lobby view switches to race view depending on the race status passed in by the mock. -Removed start button in lobby as it should be automatic. -TODO: Synchronize the times across the whole race as they do not matching.
David Wu2017-05-04 12:48:17 +12:00
86db16c83d
updated the connection scene to let a user add their own connection -added textfields to the fxml -added scaling to the connection scene(in mainController) -added a newConnection method and a method for getting the wrapper anchor pane
hba562017-05-04 12:46:27 +12:00
b60b4b257f
Remove start button from StartController.
David Wu2017-05-04 12:41:14 +12:00
cd55052654
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
cbt242017-05-04 12:38:26 +12:00
c1fa760dde
Streamlined clock handling. - Set starting time from network - Update RaceClock instance to current time from network
cbt242017-05-04 12:38:21 +12:00
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]
cbt242017-05-04 11:49:16 +12:00
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
Connor Taylor-Brown2017-05-04 01:32:28 +12:00
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
Connor Taylor-Brown2017-05-04 00:32:06 +12:00
0e1bf64177
Fixed boat track rendering (points were added before boat position set)
Connor Taylor-Brown2017-05-03 22:31:34 +12:00
d2e08fa8e1
Added boat velocity to information provided by mock
Erika Savell2017-05-03 20:36:43 +12:00
5a92dd68f5
Fixed build and interface problems. - Ignore online host test (fails on CI) - Disable connect button on startup to prevent bad socket
Connor Taylor-Brown2017-05-03 19:31:00 +12:00
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
Connor Taylor-Brown2017-05-03 03:40:36 +12:00
ad58407021
Began work on ConnectionController for selecting active hosts on startup via GUI.
cbt242017-05-03 00:35:46 +12:00
577dea2a56
Fixed time zone label on RaceController.
cbt242017-05-02 22:41:51 +12:00
08f203a0f8
Added race statuses for before the race has started. 3 min -> 1 min is warning, 1 min -> 0 min is preparatory.
Erika Savell2017-05-02 20:13:39 +12:00
049f0f7331
Changed main loop so boats are looped through with a different starting boat
Erika Savell2017-05-02 19:50:12 +12:00
42ad1f78fc
Added heading to boatlocation messages
Erika Savell2017-05-02 19:21:43 +12:00
cbt24
hba56
Erika Savell
Jessica McAuslin
Joseph Gardner
fjc40
David Wu
Fan-Wu Yang