a3ae015be8
Merge remote-tracking branch 'origin/30b/30c_boat_animation' into StreamReceiverMergeWithVisualiser
2017-04-26 15:06:55 +12:00
5eebab2748
Completed data extractors for: heartbeat, racestatus, display text msg, race start status, yacht event code, yacht action acode, chatter text, boat location, mark rounding, course wind and average wind. Some of the methods need to be validated but others have been tested. Will now need to link the parses with the model.
...
#story[820]
2017-04-25 17:57:22 +12:00
8cbd1cc4aa
Added support to import XML packet to XML Document object.
...
#story[820]
2017-04-25 17:38:26 +12:00
00c1a89f58
Fixed error in the switch (missing breaks)
...
#story[820]
2017-04-25 15:39:28 +12:00
d51825ffb7
Created separate streams for each different data type to be parsed into so the exact needed data would be able to be extracted.
...
#story[820]
2017-04-25 15:32:04 +12:00
42569e6ad7
Changed BoatPolygon is now a group instead of a polygon and is called BoatGroup.
...
BoatPolygon's functionality was more maintainable and scalable by having it extend Group.
#story30c
2017-04-25 04:30:44 +12:00
ef874b4245
Added a transition time to rotational movement.
...
The aim is to make animations smoother when the boat turns. Unsure if current
implementation will look good without testing on a datastream.
#story30c
2017-04-25 03:12:30 +12:00
46037b5aea
Refactored Boat class to better fit the MVC model by moving all GUI parts to BoatPolygon. Changed the way animation works so that it will work with a constantly updated set of lats and lons.
...
TODO - Change Mark class to no longer store XY pixel data.
TODO - Add in a timer force updates boat position if a packet has not been recieved for a while.
#story30b #story30c #implement #refactor
2017-04-24 23:06:30 +12:00
f078c34bf9
the stream receiver can now be passed a threadsafe priorityQueue that it will add the packets to as they are received (note the priority queue passed should be initialized with a comparitor for "StreamPacket"s) #story[817]
2017-04-24 18:29:50 +12:00
c1e4a6156c
re-engineered stream receiver to make it cleaner and ready to be used with the rest of the program. #story[817]
2017-04-24 17:38:29 +12:00
71e14259f6
Started looking into boat location packets, am able to extract the lats an lons but needs validations. Can also see the device type, timestamp, and sequence number. Code needs to be cleaned up and will need to start looking into the set up packets, specifically the packets containing xml data so the course can be created.
...
#story[820]
2017-04-24 16:47:41 +12:00
403dc480c4
Created packet enum to class packets and started progress on how the packets are read and parsed according to the type of packet.
...
#story[820]
2017-04-24 15:50:21 +12:00
3dc1a7f9c0
StreamPacket class created so that we can store all packets generically. The timestamp has also been extracted and stored with the packet so that in the future we may turn the current ArrayList into a priority que.
...
#story[817]
2017-04-23 20:14:41 +12:00
ba352183bf
added functionality to check the CRC for the packet. I ran into a lot of trouble with this regarding everything in java being signed by twos compliment #story[817]
2017-04-23 16:53:35 +12:00
4047978ea2
Renamed file to match its functionality more accurately .
...
#story[30a]
2017-04-23 14:43:18 +12:00
a649b11bbf
Reading relevant information (boats and race related info) from the stream so it can be moved to a parse and turned into objects for the actual race.
...
#story[30a]
2017-04-23 14:42:10 +12:00
247560ee43
converted prototype to be reading the stream byte by byte rather than by lines and characters which was very confusing and unreliable. currently extracting message type and payload length. #story[817]
2017-04-22 16:39:03 +12:00
50e7ece477
Checking for the header of each packet as the stream parser checks for each byte to see if it matches with the desired header sequence.
2017-04-20 19:17:12 +12:00
b5129c5c80
Moved the canvas drawing implementation from team27's codebase to team13's.
...
#story30b
2017-04-20 19:06:32 +12:00
6a27dedd74
Simple test to get stream data
2017-04-20 15:08:50 +12:00
15ded667fe
Started to implement the group over the canvas in the code. Removed basic boat redrawing and timeline and replaced with boats being placed into a group and given coordinates.
2017-04-11 17:46:02 +12:00
9817fc9093
Fixed JavaDoc errors by adding missing @params
2017-04-04 19:29:05 +12:00
dde4b2fcba
gitlab ci test (passing)
2017-04-04 19:15:41 +12:00
623600a8a9
gitlab ci test (failing)
2017-04-04 19:15:01 +12:00
bff4986242
Gitlab CI Build Test
2017-04-04 19:10:01 +12:00
c689530068
Gitlab CI Build Test
2017-04-04 19:03:45 +12:00
7022be1979
Fixed unit test which failed due to the change of configure file.
...
#story[445]
2017-03-30 16:16:30 +13:00
971a3920a3
Fixed race timer to display real race time, and made race time scalable.
...
#story[445]
2017-03-30 16:12:01 +13:00
b252797e9b
Removed test case that failed when the config file was changed
2017-03-30 14:48:47 +13:00
c758afe3e3
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13
2017-03-30 14:46:22 +13:00
f8d3f53158
changed boat speed to a lower value
2017-03-30 14:45:33 +13:00
4a8672a20b
Updated race timer test to use new controller
...
Tags:story[455]
2017-03-30 14:44:57 +13:00
32109e8565
Merge branch 'controller-refacto' into origin/master
2017-03-29 15:03:38 +13:00
5d6060c690
Merge remote-tracking branch 'origin/master' into controller-refacto
2017-03-29 15:01:38 +13:00
a95d030817
Controllers and Fxml nicely refactored, tests still broken #story[463]
2017-03-29 14:59:37 +13:00
ffa84c6e87
Removed testNextColor for now as the test seems to be broken..
2017-03-29 13:28:49 +13:00
4a6978ff79
Fxml refactored, partway through refactoring controllers (app does not run) #story[463]
2017-03-29 12:58:49 +13:00
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
2c125d4ce0
Fixed test case for the boat heading #story[466]
2017-03-28 19:25:04 +13:00
8bf5455f42
Updated fxml and canvas controller to display a resizable canvas.
...
#story[377]
2017-03-27 17:05:49 +13:00
48f7e41905
Merge branch 'master' of /home/cosc/student/zyt10/Documents/[SENG302]/team-13 with conflicts.
2017-03-27 16:52:31 +13:00
b50ac62a4b
Merge branch 'add-fps-counter'
2017-03-27 16:47:34 +13:00
6fc55bb82c
Added toggle for fps #story[463]
2017-03-27 16:45:02 +13:00
65ac864bf2
added count for fps inside handle loop and displayed fps on the canvas #story[463]
2017-03-27 16:34:54 +13:00
cf6bbdd1f1
Fixed boat heading calculation method to get a correct direction
...
#story[480] #pair[hyi25, ptg19]
2017-03-27 14:29:03 +13:00
bbe7cbee8f
Use canvas polygon to draw a triangle
...
#story[480]
2017-03-27 14:26:38 +13:00
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
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
550ab59231
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13
2017-03-24 20:45:49 +13:00
213303d674
Merge branch 'create-wake-line'
2017-03-24 20:39:21 +13:00
Kusal Ekanayake
Alistair McIntyre
cir27
Peter Galloway
Michael Rausch
Haoming Yin
Zhi You Tan