fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
682 Commits 1 Branch 0 Tags
8514c98805b0ce6040cf1fd8ad24e10df53d26e2
Commit Graph
174 Commits
Author SHA1 Message Date
David Wu 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.

#Story[782]
 2017-05-04 12:48:17 +12:00
David Wu b60b4b257f Remove start button from StartController. 
#story[778]
 2017-05-04 12:41:14 +12:00
Erika Savell 311cd99457 Added newlines to xml created by mock 
#story[778]
 2017-05-04 12:39:46 +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 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
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 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
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
Erika Savell 185c65e54d Editing MockOutput to send actual generated boat/race/regatta xmls 
- Was previously sending from a static source file

#story[778]
 2017-05-01 18:15:36 +12:00
hba56 8bbea28cab refactored the boat message to not use boats 
#story[778]
 2017-05-01 17:35:30 +12:00
David Wu 4811b7f4ea Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules 
# Conflicts:
#	mock/src/test/java/seng302/Model/RaceTest.java
 2017-05-01 16:39:26 +12:00
David Wu 0bfc9a5a39 Added test for race dnf in Race class. 
-Unable to test animation timer.

#story[778]
 2017-05-01 16:37:55 +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
Erika Savell 3f748bfdb6 Removed BoatInRace from shared model, refactored 
#story[778]
 2017-05-01 15:06:56 +12:00
Erika Savell 0126d29524 Fixing some of the SharedModel/seng302 import conflicts 
-Am really not liking the SharedModel structure, think reverting back to original structure is worth discussing

story[778]
 2017-04-30 21:21:09 +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
Erika Savell e2f3abffc6 WIP adding race status messages 
#story[778]
 2017-04-28 18:11:28 +12:00
Erika Savell 9c24b0840e Changed MockInput to thread 
#story[778}
 2017-04-28 13:18:07 +12:00
Erika Savell b1bbef814b Switching to use networking modules 
#story[778]
 2017-04-28 12:43:14 +12:00
fjc40 d29c0a9439 Mock now serializes and sends Boat.xml, Race.xml, Regatta.xml, Heartbeat, BoatLocation messages. 
#story[778]
 2017-04-28 01:30:03 +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
Erika Savell 83dfe1a60c Renamed some directories, optimized imports, general code clean up 
#story[778]
 2017-04-25 17:41:10 +12:00
Erika Savell e30aa02aac Commented and javadoc-ed RegattaData and BoatData 
#story[9]
 2017-04-25 17:19:04 +12:00
Erika Savell 19224ba840 Refactored RegattaData 
#story[778]
 2017-04-25 16:56:11 +12:00
Erika Savell ba5c965fd6 Refactored BoatData 
#story[778]
 2017-04-25 16:45:39 +12:00
Erika Savell 302f2c6869 Javadoc and commented RaceData class 
#story[778]
 2017-04-25 15:34:29 +12:00
Erika Savell 3542827c29 Refactored RaceData class 
#story[778]
 2017-04-25 15:20:49 +12:00
Erika Savell 03f63b2c61 Added boat data xml tests 
#story[778]
 2017-04-25 14:42:14 +12:00
Erika Savell d05d7271fc Removed output stream, started refactoring BoatDataClass 
#story[778]
 2017-04-25 13:28:48 +12:00
Erika Savell a9f98b48b2 Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock 2017-04-25 13:00:21 +12:00
Erika Savell 744caf0d29 Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock 2017-04-25 12:57:09 +12:00
hba56 e9578fc63b refactored networking code from networkingTest 
#story[778, 782]
 2017-04-25 12:38:13 +12:00
David Wu d14446a12e Added extra constructor in Race. 
-Constructor is used for junit testing for Race class.

#story[778]
 2017-04-25 12:24:39 +12:00
Erika Savell 0719720585 Moved boat xml creation from Event class to BoatData class 
#story[778]
 2017-04-25 12:07:58 +12:00
hba56 67b73ec1db Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules 2017-04-25 12:00:05 +12:00
Erika Savell 721fb5f28a Removed regatta xml creation from Event class into RegattaData class 
#story[778]
 2017-04-25 11:51:31 +12:00
hba56 4b5ebbd9e4 refactored networking code from networkingTest branch 
#story[778, 782]
 2017-04-25 11:50:22 +12:00
Erika Savell 7f2d8107b8 Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules 2017-04-25 11:39:22 +12:00
David Wu d995d5df45 Fixed RegattaDataSource missing. 
-RegattaDataSource failed to push from before. It is now created and working.

#story[778]
 2017-04-25 11:28:28 +12:00
fjc40 2876eec1e4 Added some exception classes to encapsulate the internal exceptions that can occur when sending Boat/race/regatta data. 
#story[778]
 2017-04-25 11:24:33 +12:00
fjc40 bf5ea193af Mock App now passes an OutputStream into the "Event" class. This is where data is written to (i.e., writing data over tcp socket). 
Updated Event and Race class to write to this stream, and added some TODO notes which point out where we need to properly serialize messages, when merged with networking code.
 2017-04-24 21:53:51 +12:00
fjc40 091ee4735b Race.simulateRace() function now generates a BoatLocationMessage after updating the position of each boat. Currently we just print the message to stdout. 
Added functions to convert knots (as a double) to mm/sec (as an int) to BoatLocationMessage class.
Added toString function to BoatLocationMessage class.
Added a sequence number member to the BoatInRace class.
Added Knots to meters per second conversion factor to Contants class.

#story[788]
 2017-04-24 20:19:39 +12:00
zwu18 c5df90d276 Created RegattaDataSource and regattaTest.xml. 
-Event regattaData will now get data from the XML instead of having static data.

#story[778]
 2017-04-23 19:59:07 +12:00
Erika Savell 5304f7df7d removed problematic import 
#story[778]
 2017-04-21 17:11:56 +12:00