fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
438 Commits 1 Branch 0 Tags
98723b88d4a0863c0777c2343e395c75e7849436
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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 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 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
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 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
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
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
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
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
Erika Savell e927242707 Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules 2017-05-01 15:07:41 +12:00
Erika Savell 3f748bfdb6 Removed BoatInRace from shared model, refactored 
#story[778]
 2017-05-01 15:06:56 +12:00
Erika Savell 7e569b59b7 Commenting out tests just to get CI working, will investigate on different branch 
#story[778]
 2017-04-30 21:26:57 +12:00
Erika Savell 2320675b7e Fixing build 
#story[778]
 2017-04-30 21:23:52 +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 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
Erika Savell e2f3abffc6 WIP adding race status messages 
#story[778]
 2017-04-28 18:11:28 +12:00
Erika Savell 214e26ad90 Switched port back to 4942 
#story[778]
 2017-04-28 13:30:19 +12:00
Erika Savell 6befa24302 Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules 2017-04-28 13:27:53 +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
Erika Savell b1bbef814b Switching to use networking modules 
#story[778]
 2017-04-28 12:43:14 +12:00
Erika Savell 2289936f4f Javadoc fix to get CI running 
#story[778]
 2017-04-28 11:36:30 +12:00
Erika Savell 1e3b816ff5 Added tests for BoatData and RaceData 
#story[778]
 2017-04-25 17:59:06 +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 073102d1a3 Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock 2017-04-25 17:19:28 +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 6a35c40f77 Commented out test causing CI issues 
#story[778]
 2017-04-25 13:04:30 +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
Erika Savell 896589d1a5 Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock 2017-04-25 12:09:06 +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
Erika Savell 721fb5f28a Removed regatta xml creation from Event class into RegattaData class 
#story[778]
 2017-04-25 11:51:31 +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
Erika Savell 5304f7df7d removed problematic import 
#story[778]
 2017-04-21 17:11:56 +12:00
Erika Savell 3ff2a07680 Temporarily ignored some tests in mock 
#story[778]
 2017-04-21 17:08:28 +12:00
Erika Savell a7913a16f9 Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock 2017-04-21 17:04:12 +12:00
Erika Savell 9764f448eb Added participants field to xml generator 
#story[778]
 2017-04-21 17:02:06 +12:00
Erika Savell c365d5a344 Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock 2017-04-21 17:01:23 +12:00
Erika Savell fdba50f9d2 Added course limit, course and marker seq field to xml fiule of race info 
#story[778]
 2017-04-21 16:52:07 +12:00
Erika Savell 737755def6 Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock 2017-04-21 15:33:47 +12:00
Erika Savell 94ba18cf0c Began xml creator for race info message 
#story[778]
 2017-04-21 15:33:37 +12:00
Erika Savell 33e3b3713c Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock 2017-04-21 13:10:45 +12:00
Erika Savell 97c5c9662b Wrapped race in an event which sends out starting xml files 
#story[778]
 2017-04-21 13:10:30 +12:00
Erika Savell 231a1824d1 Condensed Race and ConstantVelocityRace into one class 
#story[778]
 2017-04-21 12:17:17 +12:00
Erika Savell 34c0aec0b9 Mock race runs without an fx component 
#story[778]
 2017-04-21 10:47:15 +12:00
Erika Savell 3326da4f5d Started removing fx component from mock module. 
- Stuck on animation timer not running

#story[778]
 2017-04-20 15:09:55 +12:00
Erika Savell a584400e24 Actually added sub modules this time 
#story[778]
 2017-04-20 11:16:19 +12:00
Erika Savell 669718d406 Cloned the main project into two submodules, mock and visualiser 
#story[778]
 2017-04-19 18:57:59 +12:00
Erika Savell 028cb33509 Fixing fxml problems 
#story[760]
 2017-04-19 13:52:00 +12:00
Erika Savell 374b31f5c0 Disabled scale buttons once one has been clicked 
#story[760]
 2017-04-19 13:41:33 +12:00
Erika Savell b1e55f8c7d Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story28 2017-04-19 13:40:40 +12:00
Erika Savell dc32868227 Created countdown clock on start screen. 
#story[760]
 2017-04-19 13:35:02 +12:00
Erika Savell 4e78ae2ae7 Fixed testing problem where race tests would sometimes fail because a boat did not finish 
- Added an option to set the dnf chance, then set it to 0 is all tests

#story[760]
 2017-04-17 15:41:23 +12:00
Erika Savell f25e2bac32 Changed countdown length to two minutes 2017-04-17 15:25:54 +12:00
Erika Savell 62d220f1fb Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story27 2017-04-17 15:08:04 +12:00
Erika Savell 8112918c13 Attempted to load details in, but ran into problems with the string property/vs string distinction 
#pair[jam330] #story[760]
 2017-04-06 17:17:06 +12:00
Erika Savell 47df6266d2 Created start race entry point in main controller so it could be called by start race controller 
story[760]
 2017-04-06 16:19:31 +12:00
Erika Savell 0772ca22c6 Re-engineered fxml controllers to use child controllers 
- Removed a lot of unnecessary complexity in App class

#pair[jam339, esa46] #story[760]
 2017-04-06 15:35:55 +12:00
Erika Savell a689ffc689 Added quick descriptions to params to get javadoc working 2017-04-06 14:31:11 +12:00
Erika Savell 6866f65adf Ignoring failing test to check CI is working. 
- Test will be fixed as part of another stoy
 2017-04-06 13:53:21 +12:00
Erika Savell 94444e6662 Negligible change to check CI runner is working 2017-04-06 13:41:04 +12:00
Erika Savell ee72d85f6a removed print messages 
#story[20]
 2017-03-30 14:33:28 +13:00
Erika Savell ec9574fd9d Refactoring 
#story[24]
 2017-03-29 23:58:00 +13:00
Erika Savell e2f9a710aa Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into changeStartingPositions2 2017-03-29 23:07:57 +13:00
Erika Savell fc1121b5b7 Removed extra < char from .mailmap 2017-03-29 23:07:42 +13:00
Erika Savell 6344e12d8f Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into changeStartingPositions2 2017-03-29 23:06:24 +13:00
Erika Savell 9808c57ca7 GOat boats spread out at startline working 
#story[20]
 2017-03-29 23:06:16 +13:00
Erika Savell 9f71c99ecf Updated .mailmap 2017-03-29 23:05:36 +13:00
Erika Savell 0e7d210cea Amended wake tests to handle markers instead of direct coordinates 
#test
 2017-03-29 22:02:24 +13:00
Erika Savell 970f0d0116 Fixed race scaling 
- Races were completed far too quickly because a set SLEEPTIME was used as the time elapsed, instead of the actual break time

#story[16]
 2017-03-29 21:51:03 +13:00
Erika Savell fb409af23b Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into changeStartingPositions2 2017-03-29 19:54:53 +13:00
Erika Savell 495158a621 Amended and added tests to cope with marker change 
#test #story[20]
 2017-03-29 19:47:49 +13:00
Erika Savell 40a6801477 Marker tests added 
#story[20]
 2017-03-29 12:37:53 +13:00
Erika Savell eb4c02557d Changing xml reader to take both coordinates of a marker 
- Have commented out tests for now because  a lot of rearranging and fixing needed

#story[20]
 2017-03-29 12:08:40 +13:00
Erika Savell d1d46f2cf5 Created Marker class 
- Holds the start and end coordinate of a gate or marker, and has a method to calculate the middle point
- Each leg will hold a start Marker and end Marker

#story[20]
 2017-03-29 11:16:37 +13:00
Erika Savell 45fcd22cc5 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into changeStartingPositions2 2017-03-29 10:46:06 +13:00
Erika Savell 2d2f4692a9 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into changeStartingPositions2 2017-03-28 14:42:22 +13:00
Erika Savell bb6b881392 Adding end coords to get test running gain 
#story[20]
 2017-03-28 14:38:08 +13:00