fanwuyang
/
SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • 9902cec688 Added tests for BoatXMLReader - Verifies correct operation on boat and mark reading from boatTest.xml cbt24 2017-05-10 14:23:33 +1200
  • d7294f73a1 boats now have polars stored in the -added getter and setter for a boats polars hba56 2017-05-10 14:23:26 +1200
  • 9aa4183a7c Merge remote-tracking branch 'origin/49Mock' into 49Mock cbt24 2017-05-10 13:57:36 +1200
  • 69cd44bda8 Reads data from boat XML file - Creates marks for building CompoundMarks (formerly Markers) - Rearranged Boat constructor and removed velocity cbt24 2017-05-10 13:57:20 +1200
  • 16d3fe2ef2 Added marker boats with correct gps positions into boats xml read by mock Erika Savell 2017-05-10 13:50:28 +1200
  • 5b010cad49 added the polar class for storing polars #story[900] hba56 2017-05-10 13:45:09 +1200
  • 83d6cdbd59 Edited race xml read by mock Erika Savell 2017-05-10 13:37:32 +1200
  • 6e9386f4fb Switched mock to send out official xmls. cbt24 2017-05-10 13:08:34 +1200
  • 1b6693a19b Added xml files for mock to read in Erika Savell 2017-05-10 12:39:58 +1200
  • 187acc6960 added an empty polarparser class to push a new branch #story[900] hba56 2017-05-10 12:30:46 +1200
  • 43757b34d1 General code tidy up (Visualiser) Jessica McAuslin 2017-05-08 20:45:00 +1200
  • 2d983eccfd General code tidy up Jessica McAuslin 2017-05-08 20:21:20 +1200
  • e1ba2ae5b6 Now reads course wind direction from the live stream, so the wind arrow now changes when the wind changes. #story[882] Joseph Gardner 2017-05-08 17:23:55 +1200
  • a32775eab6 Fixed a few javadoc issues. fjc40 2017-05-08 10:59:13 +1200
  • b247244665 Did some large tidy ups, refactoring, and documenting. fjc40 2017-05-08 03:29:33 +1200
  • 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. fjc40 2017-05-07 18:34:44 +1200
  • 020c0329b0 Merge remote-tracking branch 'origin/TCPDisconnection' into submission fjc40 2017-05-07 16:55:07 +1200
  • 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. fjc40 2017-05-07 15:52:34 +1200
  • 01224c509a Added some comments to MockOutput. Also removed instance of RaceVisionByteEncoder, as it has no state, and the functions used are all static. fjc40 2017-05-04 16:18:27 +1200
  • 3481a882de Fixed Team Oracle's boat name in mock data file. fjc40 2017-05-07 14:28:31 +1200
  • 61ecdc2269 Merge branch 'submission' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into submission David Wu 2017-05-06 20:23:01 +1200
  • 61afe8d608 Created finish view to see when a race finishes. -Implemented FinishController -Fixed mock not sending Finish race status. David Wu 2017-05-06 20:14:10 +1200
  • c038010bd2 Draws track for racing boats only to reduce information clutter. - Add track point only when boat status is "Racing" cbt24 2017-05-06 19:22:20 +1200
  • f27dbc29b0 Added self-documenting RaceStatus boolean getters - Deprecated RaceStatus.getRaceStatus cbt24 2017-05-06 19:06:37 +1200
  • cc824aa89a Removed unnecessary countdownTimer from Race in visualiser module - Run method now calls simulateRace directly cbt24 2017-05-06 18:20:41 +1200
  • 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 cbt24 2017-05-06 18:02:48 +1200
  • 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 Yang 2017-05-06 16:55:12 +1200
  • a95a0c2543 Added documentation for multiple classes. David Wu 2017-05-06 16:39:15 +1200
  • 12e457824d fix for issue #5 gate lines hba56 2017-05-06 16:31:40 +1200
  • 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 Yang 2017-05-06 15:58:12 +1200
  • 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 Yang 2017-05-06 15:46:38 +1200
  • 982b47943a Fixed blocking issue - Fixed byte stream error where it would reinitilise every run #story[782] Fan-Wu Yang 2017-05-06 15:27:21 +1200
  • b7f010a2fa Fixed Network While loops - Removed while blocking loops and replaced them with return statements #story[782] Fan-Wu Yang 2017-05-06 14:36:37 +1200
  • 565b7adaa2 Merge remote-tracking branch 'origin/race-timer-fixes' into layeredCanvas Fan-Wu Yang 2017-05-04 16:55:01 +1200
  • 862391d7ef Canvas Layer Created - Canvas is created via layering. - Resizable canvas is now a seperate abstract class #story[782] Fan-Wu Yang 2017-05-04 16:54:06 +1200
  • 349bd50094 Everything works, don't ask questions cbt24 2017-05-04 16:52:33 +1200
  • 62db7f333c Frantically cherry-picking commit by commit Erika Savell 2017-05-04 16:33:07 +1200
  • 8ed0ca5b4f Quick way of adding extra leg to mock data Erika Savell 2017-05-04 13:44:44 +1200
  • 284eb6d951 Added Test for AC35UnitConverter - Added tests to make sure it was working properly #story[782] Fan-Wu Yang 2017-05-04 13:40:43 +1200
  • 6888d0bddc fixed all java doc errors hba56 2017-05-04 13:40:37 +1200
  • e409c8752c Fix for now - Need to change hba56 2017-05-04 14:56:54 +1200
  • 89ba0f278d Fixed StartController countdown - Removed obsolete timer related code - Consistently use RaceClock throughout StartController cbt24 2017-05-04 14:16:14 +1200
  • 17afd9f775 Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules cbt24 2017-05-04 14:15:21 +1200
  • 336a15d1a2 Fixed StartController countdown - Removed obsolete timer related code - Consistently use RaceClock throughout StartController cbt24 2017-05-04 14:11:00 +1200
  • 288699b7c7 Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules Erika Savell 2017-05-04 13:44:56 +1200
  • 2dab427092 Quick way of adding extra leg to mock data Erika Savell 2017-05-04 13:44:44 +1200
  • 037c09b059 Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules Fan-Wu Yang 2017-05-04 13:42:28 +1200
  • 1f8941e37c Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules hba56 2017-05-04 13:41:14 +1200
  • 6bbc2ac4be Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules Fan-Wu Yang 2017-05-04 13:40:48 +1200
  • ccd90b91d7 Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules hba56 2017-05-04 13:40:45 +1200
  • bb57685faf Added Test for AC35UnitConverter - Added tests to make sure it was working properly #story[782] Fan-Wu Yang 2017-05-04 13:40:43 +1200
  • 62ecd40967 fixed all java doc errors hba56 2017-05-04 13:40:37 +1200
  • 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 Wu 2017-05-04 13:36:39 +1200
  • e345f08ad8 Fixed AC35 stream crashing before status sent. cbt24 2017-05-04 13:19:39 +1200
  • aa1d38ca9f removed import * lines hba56 2017-05-04 13:17:07 +1200
  • a07a90dfea Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules David Wu 2017-05-04 13:14:35 +1200
  • 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 Wu 2017-05-04 13:14:29 +1200
  • 099995c41b Fixed start controller visibility issues. cbt24 2017-05-04 13:13:44 +1200
  • 15179a1cdf Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules hba56 2017-05-04 13:11:58 +1200
  • 810c3837c1 adding java doc tags hba56 2017-05-04 13:11:14 +1200
  • 43fb0df5be Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules Fan-Wu Yang 2017-05-04 13:07:13 +1200
  • 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 Yang 2017-05-04 13:07:05 +1200
  • 5ebd4251e2 Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules Erika Savell 2017-05-04 12:50:42 +1200
  • c3ee3ec9e2 Added new lines to the other two xml creators Erika Savell 2017-05-04 12:50:30 +1200
  • 34ef1172ce Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules David Wu 2017-05-04 12:48:24 +1200
  • 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 Wu 2017-05-04 12:48:17 +1200
  • db43acf935 Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules hba56 2017-05-04 12:46:46 +1200
  • 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 hba56 2017-05-04 12:46:27 +1200
  • b60b4b257f Remove start button from StartController. David Wu 2017-05-04 12:41:14 +1200
  • 6e10f86a90 Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules Erika Savell 2017-05-04 12:39:58 +1200
  • 311cd99457 Added newlines to xml created by mock Erika Savell 2017-05-04 12:39:46 +1200
  • cd55052654 Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules cbt24 2017-05-04 12:38:26 +1200
  • c1fa760dde Streamlined clock handling. - Set starting time from network - Update RaceClock instance to current time from network cbt24 2017-05-04 12:38:21 +1200
  • 98723b88d4 Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules Erika Savell 2017-05-04 12:26:04 +1200
  • cfa6ba1c3f Fixed speed notbeing displayed from AC35 live data Erika Savell 2017-05-04 12:25:50 +1200
  • 618073d04e Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules Joseph Gardner 2017-05-04 12:11:47 +1200
  • 94ad164a45 Boat table and positions now update. #story[782] Joseph Gardner 2017-05-04 12:11:36 +1200
  • e43353c322 Boat table and positions now update. #story[782] Joseph Gardner 2017-05-04 12:10:13 +1200
  • d38baa9fc4 Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules Erika Savell 2017-05-04 11:58:46 +1200
  • 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] cbt24 2017-05-04 11:49:16 +1200
  • 23dfc6a6bf Fixed annotation toggles displaying behind course Erika Savell 2017-05-04 10:34:25 +1200
  • eb58581e83 Fixed velocity issues with mock data Erika Savell 2017-05-04 10:16:10 +1200
  • 8886b5db05 Fixed RegattaXMLTest. Connor Taylor-Brown 2017-05-04 01:40:12 +1200
  • 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-Brown 2017-05-04 01:32:28 +1200
  • 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-Brown 2017-05-04 00:32:06 +1200
  • 0e1bf64177 Fixed boat track rendering (points were added before boat position set) Connor Taylor-Brown 2017-05-03 22:31:34 +1200
  • 9bab3d3359 Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules Connor Taylor-Brown 2017-05-03 22:04:19 +1200
  • 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 Connor Taylor-Brown 2017-05-03 22:04:08 +1200
  • b9901a252a Moved speed conversion to BoatMessage class Erika Savell 2017-05-03 21:01:30 +1200
  • 7c59632c41 Fixes to get race running Erika Savell 2017-05-03 20:48:37 +1200
  • d2e08fa8e1 Added boat velocity to information provided by mock Erika Savell 2017-05-03 20:36:43 +1200
  • 5a92dd68f5 Fixed build and interface problems. - Ignore online host test (fails on CI) - Disable connect button on startup to prevent bad socket Connor Taylor-Brown 2017-05-03 19:31:00 +1200
  • 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-Brown 2017-05-03 03:40:36 +1200
  • ad58407021 Began work on ConnectionController for selecting active hosts on startup via GUI. cbt24 2017-05-03 00:35:46 +1200
  • 577dea2a56 Fixed time zone label on RaceController. cbt24 2017-05-02 22:41:51 +1200
  • 08f203a0f8 Added race statuses for before the race has started. 3 min -> 1 min is warning, 1 min -> 0 min is preparatory. Erika Savell 2017-05-02 20:13:39 +1200
  • 049f0f7331 Changed main loop so boats are looped through with a different starting boat Erika Savell 2017-05-02 19:50:12 +1200
  • 42ad1f78fc Added heading to boatlocation messages Erika Savell 2017-05-02 19:21:43 +1200
  • f2e0eec212 Fixed date time parsing problem Erika Savell 2017-05-02 16:50:09 +1200
  • 7d1f4209e4 Got mock data being used by visualiser. Erika Savell 2017-05-01 20:56:46 +1200