fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
413 Commits 1 Branch 0 Tags
f2e0eec2124b106ca2401ad6c357c35aa51ff2dd
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Erika Savell 176b644aaf Created boat initialise method to run through boats setting correct start position 
- Running funny, try pulling changes from master

#story[20]
 2017-03-26 20:56:26 +13:00
Erika Savell d15cd2b881 Wrote method to calculate spread positions across start line 
- Also began work to make sure it is called. Requires refactoring
- WIP, this porgramme shouldn't run atm

#story[20]
 2017-03-26 20:28:20 +13:00
Erika Savell 306e98172b Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into heading-visualisation 2017-03-25 22:11:31 +13:00
Erika Savell bd86690e85 Filled in javadoc, optimised imports, rearranged code 
#refactor #story[16]
 2017-03-25 21:49:43 +13:00
Erika Savell f5ba7c95c8 Fixing merge and resulting failing tests 
#fix #story[16]
 2017-03-25 19:01:03 +13:00
Erika Savell ac558746a0 Cleaning up gui 
-In future, users could load xml file before selecting scaling, and then get estimates of time different scaling would take

#implement #sotry[16]
 2017-03-25 18:18:01 +13:00
Erika Savell e923fe671b Changed race clock to display negative time before race 
#story[16] #implement
 2017-03-25 17:34:39 +13:00
Erika Savell 7a13885064 Users can select between 1 minute, 5 minute, or non scaled races 
- Current implementation is a bit messy I think, with 3 different start race methods for the three options
- Considering letting users choose from a dropdown, so that the chosen value can be easily found from a single method for starting the race

#implement #story[16]
 2017-03-24 18:50:19 +13:00
Erika Savell 0fde0cd9b5 Created new start screen and implemented switching from start to race map 
#implement #story[16]
 2017-03-24 13:03:03 +13:00
Erika Savell 9c22fe76bd Adjusting existing layout to prepare for creating new pane 
- Adjusted default height and width to be a larger display
- Increased percentage space the side table takes up because the team name, mark etc were very cramped

#implement #story[16]:
 2017-03-24 12:24:56 +13:00
Erika Savell d23a80841a Tests for race clock being scaled correctly added 
#story[16] #test
 2017-03-24 11:57:54 +13:00