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
971a3920a3
Fixed race timer to display real race time, and made race time scalable.
...
#story[445]
2017-03-30 16:12:01 +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
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
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
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
304f30ece6
Reformatted and refactored the fileparser to get xml from resource folder
...
#fix #refactor #story[377] #pair[xyi25, zyt10]
2017-03-24 12:55:11 +13:00
d39aacba83
RaceController now uses new parsers & deleted OldApp and OldFileParser
...
#story[377]
2017-03-24 11:34:34 +13:00
7bc5c8f8a4
Merge remote-tracking branch 'refs/remotes/origin/master'
...
Conflicts:
src/main/java/seng302/controllers/CanvasController.java
src/main/java/seng302/models/Boat.java
2017-03-23 22:17:45 +13:00
bb8c681270
added a markpos value to event for use in displaying the team positions #story[426]
2017-03-23 21:19:39 +13:00
403aaa76ae
Display team name and speed beside boat
...
- Also slowed down the AnimationTimer
- Removed the need to scale the canvas
Tags: #implement #story[18] #story[19]
2017-03-23 18:04:00 +13:00
2384013139
Created race timer
...
- Race starts when timer reaches 1 second
- Race waits 10 seconds before it starts
Tags: #implement #story[16]
2017-03-23 14:11:12 +13:00
a2d06909c9
Finished config parser to read race info from external xml file
...
- created config parser unit test.
- modified config.xml file
- write unit test for config parser
#story[422]
2017-03-23 00:21:18 +13:00
9e22eac4d8
Added the race results to the RaceResultController. Also fixed some bugs
...
- Fixed a bug where the race results would be out of order.
- Changed the colour of the start and finish gates
- Added the race results to the RaceResultController and updated view
Tags: #fix #implement #story[13, 10, 11]
2017-03-22 22:30:49 +13:00
f6ea2953e9
Changed lat/long for gates to midpoint and added colours for the marks
...
Tags: #fix #implement #story[10,11]
2017-03-22 14:28:51 +13:00
ef098e63d7
Added finishing events #implement and rotated the map by 180 degrees#fix
2017-03-22 12:51:03 +13:00
0e4bb0f942
Changed getMark to getThisMark. Added start point to KeyFrame. Race now starts from start point and ends at finish point
...
#story[377]
2017-03-20 17:34:24 +13:00
ee34e5028f
Reformatted and refactored the canvas controller
...
#fix #refactor #story[377]
2017-03-20 17:23:33 +13:00
cc04e2dd6d
Fixed boat colour, was in the wrong constructor
...
#story[377]
2017-03-20 16:03:07 +13:00
b88cf6a101
Merge branch 'refactor-file-parser'
2017-03-18 21:38:38 +13:00
d10985f890
Finished team parser to read team info from external xml file
...
- created team parser unit test
- refactored team parser functions
#fix #refactor #implement
2017-03-18 21:32:12 +13:00
c08504293b
Created canvas and race controllers to display boats on canvas and modified marks and parsers to support them.
...
#story[377] #pair[zyt10, ptg19]
2017-03-17 18:21:11 +13:00
4bc49da10d
Merge remote-tracking branch 'origin/master'
2017-03-17 16:18:24 +13:00
683f4ba94e
Mostly got boats going to marks on the canvas (code currently broken) #story[377] #pair[zyt10, ptg19]
2017-03-17 16:18:01 +13:00
8fd06c84ac
Merged the refactored mark related class with course parser.
...
#fix #refactor #story[9] #story[10] #story[11]
2017-03-17 15:56:37 +13:00
23b163e6c1
Merge branch 'master' into refactor-file-parser
...
# Conflicts:
# src/main/java/seng302/models/GateMark.java
2017-03-17 15:44:16 +13:00
6383b9a6f8
Deleted the old Mark and GateMark files
2017-03-17 15:26:38 +13:00
0b3ebf229f
Refactor mark related classes.
...
- Mark is an abstract class which containing its name and type
- Single Mark is a sub class of Mark which containing only one GPS location
- Gate Mark is a sub class of Mark which containing two Single Marks
#refactor #fix #story[10] #story[11] #story[12]
2017-03-17 15:21:04 +13:00
d6fe155d4d
Changed distance calculation to use latitude and longitude
...
Tags: #fix
2017-03-17 11:08:35 +13:00
121f996a43
created config, teams xml file, and teamsParser class
...
#implement
2017-03-17 01:04:10 +13:00
44d4f25413
Implemented Color Enum & boat will call function from enum to get next color. Using static colour cycling for now.
...
#story[377]
2017-03-17 00:57:50 +13:00
Kusal Ekanayake
cir27
Peter Galloway
Alistair McIntyre
Michael Rausch
Haoming Yin
zyt10
Ryan Tan