Commit Graph

188 Commits

Author SHA1 Message Date
Michael Rausch 1cf55f3e96 Fixed an issue where buffers aren't being sent properly
Tags #Story[829]
2017-04-30 16:16:44 +12:00
Michael Rausch 9a995ddcc1 Boat status changes to finished when a boat finishes the race
Tags: #story[829]
2017-04-30 01:55:49 +12:00
Michael Rausch 3e97f016d5 Getting boat locations from race simulator & bug fixes
- Boat locations that are generated by the simulator are sent to the client as they happen
- Fixed heading and lat/lon encoding
- Fixed a bug where the header wasn't included in the sent byte stream
- Fixed the format of data as it's sent to the client.
- Data is now sent using a channel
- Removed tests that don't work with channels

Tags: #story[829]
2017-04-29 19:38:21 +12:00
Haoming Yin 8a04a0e5b7 Added documents for Boat, RaceParser and Simulator classes.
#story[828]
2017-04-28 14:53:26 +12:00
Haoming Yin 705a0a2eaf Added document and unit tests for GeoUtility class.
- three methods in GeoUtility have been tested and passed.

#story[828]
2017-04-28 14:34:24 +12:00
Haoming Yin 8c8f253233 Created simulator to generate mock data.
- simulator runs as a background thread and sleep for a given time lapse.
- simulator extends observable, so it can notify all its observers when boats positions have been updated

#story[828]
2017-04-26 22:58:13 +12:00
Haoming Yin 8b8422de3a Renamed course parser to race parser
- because in AC35 spec. race xml file contain course set up and all other general race settings

#story[828]
2017-04-26 22:52:18 +12:00
Haoming Yin 7bf2d4c40e Added Position class to better use GeoUtility.
- mark now inherit from Position

#story[828]
2017-04-26 22:52:18 +12:00
Haoming Yin 2a67f04d15 Create GeoUtility to process all geo calculations.
- calculate distance between two geo positions
- calculate the bearing from one geo position to another
- calculate the new geo position by passing original position, bearing and
distance

#story[828]
2017-04-26 22:52:18 +12:00
Haoming Yin b2ea8196d5 Fixed a bug of getCourse method as it didn't parse xml correctly.
- a typo 'CompoundmarkID'(should be 'CompoundMarkID') which caused parser failed to parse file.
- add typeOf method in RoundingType to convert strings to types

#story[828]
2017-04-26 22:52:18 +12:00
Haoming Yin 7f38191d03 Rewrote course parser to parse race xml file specified in AC35 spec.
#story[828]
2017-04-26 22:52:18 +12:00
Haoming Yin f6b7a3042f Rewrote all kind of marks to fit marks specified in AC35 spec.
- added compound mark
- added corner
- rewrote mark as a single mark
- added rounding type enum

#story[828]
2017-04-26 22:52:18 +12:00
Haoming Yin 3bdc6ce5cc Created a new course parser to parse race xml file specified in AC35 spec.
#story[828]
2017-04-26 22:52:18 +12:00
Michael Rausch bc31987f96 Added Boat location messages to the mock streaming data interface
- Added static methods to convert between binary packed lat/longs and floating point numbers

Tags: #story[829]
2017-04-26 22:38:39 +12:00
Michael Rausch 1f8f1f0f86 Added boat location, and race start messages to the mock data interface
- Added proper support for signed and unsigned types. This includes automatic conversion to the correct data type (long to int, short, or byte).

- Moved code related to adding values into the byte buffer into the abstract Message class

Tags: #story[29]
2017-04-25 21:49:51 +12:00
Michael Rausch 6874f288ee Added Race Status messages to the mock streaming data interface
Tags: #story[29]
2017-04-24 21:53:42 +12:00
Michael Rausch edc306da22 Created AC35 Streaming server
- Sends heartbeat messages every 5 seconds
- Sends XML at beginning

Tags: #story[29]
2017-04-19 19:05:19 +12:00
William Muir 34872a822b Stripped back codebase to make to create basic model for streaming data
Removed many classes involved with visualisation such as controllers and multiple fxmls. Now there is just one for debugging

Merged in Boat updating pattern from team 27

#story[828]
2017-04-08 17:49:50 +12:00
Michael Rausch 9817fc9093 Fixed JavaDoc errors by adding missing @params 2017-04-04 19:29:05 +12:00
Michael Rausch dde4b2fcba gitlab ci test (passing) 2017-04-04 19:15:41 +12:00
Michael Rausch 623600a8a9 gitlab ci test (failing) 2017-04-04 19:15:01 +12:00
Michael Rausch bff4986242 Gitlab CI Build Test 2017-04-04 19:10:01 +12:00
Michael Rausch c689530068 Gitlab CI Build Test 2017-04-04 19:03:45 +12:00
Haoming Yin 7022be1979 Fixed unit test which failed due to the change of configure file.
#story[445]
sprint_2.3
2017-03-30 16:16:30 +13:00
Haoming Yin 971a3920a3 Fixed race timer to display real race time, and made race time scalable.
#story[445]
sprint_2.2
2017-03-30 16:12:01 +13:00
Michael Rausch b252797e9b Removed test case that failed when the config file was changed sprint_2.1 2017-03-30 14:48:47 +13:00
Michael Rausch c758afe3e3 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 2017-03-30 14:46:22 +13:00
Peter f8d3f53158 changed boat speed to a lower value 2017-03-30 14:45:33 +13:00
Michael Rausch 4a8672a20b Updated race timer test to use new controller
Tags:story[455]
2017-03-30 14:44:57 +13:00
Peter 32109e8565 Merge branch 'controller-refacto' into origin/master sprint_2.0 2017-03-29 15:03:38 +13:00
Peter 5d6060c690 Merge remote-tracking branch 'origin/master' into controller-refacto 2017-03-29 15:01:38 +13:00
Peter a95d030817 Controllers and Fxml nicely refactored, tests still broken #story[463] 2017-03-29 14:59:37 +13:00
Michael Rausch ffa84c6e87 Removed testNextColor for now as the test seems to be broken.. 2017-03-29 13:28:49 +13:00
Peter 4a6978ff79 Fxml refactored, partway through refactoring controllers (app does not run) #story[463] 2017-03-29 12:58:49 +13:00
Haoming Yin 1497858cc0 Deleted the print exception stack statement to make terminal more tidy.
- the exception is aim to happen, so no need to print it out.

#story[377]
2017-03-28 19:38:57 +13:00
Michael Rausch 2c125d4ce0 Fixed test case for the boat heading #story[466] 2017-03-28 19:25:04 +13:00
Zhi You Tan 8bf5455f42 Updated fxml and canvas controller to display a resizable canvas.
#story[377]
2017-03-27 17:05:49 +13:00
Zhi You Tan 48f7e41905 Merge branch 'master' of /home/cosc/student/zyt10/Documents/[SENG302]/team-13 with conflicts. 2017-03-27 16:52:31 +13:00
Peter b50ac62a4b Merge branch 'add-fps-counter' 2017-03-27 16:47:34 +13:00
Peter 6fc55bb82c Added toggle for fps #story[463] 2017-03-27 16:45:02 +13:00
Peter 65ac864bf2 added count for fps inside handle loop and displayed fps on the canvas #story[463] 2017-03-27 16:34:54 +13:00
Haoming Yin cf6bbdd1f1 Fixed boat heading calculation method to get a correct direction
#story[480] #pair[hyi25, ptg19]
2017-03-27 14:29:03 +13:00
Haoming Yin bbe7cbee8f Use canvas polygon to draw a triangle
#story[480]
2017-03-27 14:26:38 +13:00
Michael Rausch 55ba343426 Merge branch 'change-to-short-names' into 'master'
Changed the team names to their abbreviated versions

- Also halved the size of the wake lines
- Updated tests to support the shorter team names
- Wake lines are now hidden with the other annotations

Tags: #story[23,21]

See merge request !25
2017-03-24 21:01:55 +13:00
Michael Rausch e6ace5fb2f Changed the team names to their abbreviated versions
- Also halved the size of the wake lines
- Updated tests to support the shorter team names
- Wake lines are now hidden with the other annotations

Tags: #story[23,21]
2017-03-24 20:56:52 +13:00
Michael Rausch 550ab59231 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 2017-03-24 20:45:49 +13:00
Michael Rausch 213303d674 Merge branch 'create-wake-line' 2017-03-24 20:39:21 +13:00
Michael Rausch 74c81eb7b3 Removed a character that was accidentally inserted 2017-03-24 20:37:32 +13:00
Michael Rausch c33586e7f5 Changed test to work with the new getHeading method, and removed an unused import that was causing tests to fail
- There was a com.sun import that we were no longer using that was causing issues

Tags: story[466]
2017-03-24 20:33:53 +13:00
Michael Rausch 5dd5e50738 Implemented wake lines
- Changed heading calculation in event class
- The boats now go to the marker, rather than the center of a gate

Tags: #story[466]
2017-03-24 20:27:17 +13:00