c07f13180f
Merged Story 30b branch into 30c branch
...
#story[820]
2017-05-01 15:32:23 +12:00
f672eafd6d
Merge remote-tracking branch 'origin/Story30A_InputStreamCheckingHead' into wake_remake
...
# Conflicts:
# src/main/java/seng302/models/parsers/StreamPacket.java
# src/main/java/seng302/models/parsers/StreamParser.java
# src/main/java/seng302/models/parsers/StreamReceiver.java
2017-05-01 15:27:51 +12:00
b597f010dc
Added some missing fields. Added missing getters.
...
#story[820]
2017-05-01 00:36:10 +12:00
0eb767b615
Finished tweaking wakes. Made marker movement smooth.
...
#implement #story[818]
2017-04-30 22:34:49 +12:00
45b77c05d4
Improvements to wake
2017-04-30 19:32:29 +12:00
0b2ef3de00
XML data types are done. Easily navigated for future use. Some documentation has been done, tests aren't yet completed just yet.
...
#story[820]
2017-04-30 00:52:18 +12:00
1d28334346
Removed the parser from queing packets incorrectly. Used the marker boat location packets to get the live updates of the marker positions and implemented the markers being updated much like the boats currently are. This means the course more closely resembles the actual intended course design.
...
#story[820]
2017-04-29 20:10:39 +12:00
ab0d4634d6
Moved XML parsing to non static class to create objects. Changed the abstraction as using generics in maps lead to more headaches than anything. Still not quite completed. Needs documentation and validation for tags too.
...
#story[820]
2017-04-29 19:02:30 +12:00
1e1e482b79
Added a delay for reading packets from the packet buffer so packets that are recieved out of order have time to order by timestamp in the priority queue #story[820]
2017-04-29 18:56:41 +12:00
474f0ee427
Further work on new wake system. Wakes turn correctly but need to scale with velocity and
...
eventually desync with the boats. Needs to reset to the boats position on straights.
2017-04-28 23:25:49 +12:00
07bbd7e06d
Added reasonable testing for StreamReciever, further testing would probably need StreamReciever to be rewritten #story[817]
2017-04-28 18:29:35 +12:00
fe480d5cb6
Finished parsing the Race XML data. Began making some optimizations to hopefully make parsing the Boat Data a quicker and simpler task.
...
#story[820]
2017-04-28 15:41:12 +12:00
d1289b0de1
Fixed boats moving in the correct heading as according to the stream and attempted to fix the wakes direction.
...
#story[818]
2017-04-27 18:52:37 +12:00
e1de5e0989
Parsed more course data from XML messages
...
#story[820]
2017-04-27 18:31:13 +12:00
f5b9160304
Started parsing the different types of XML messages to Map objects so that we can extract the relevant data for the visualizer.
...
#story[820]
2017-04-27 17:22:46 +12:00
0a22812165
Got the live ac35 data working in paralell with the parse and the app. Boats move and the live data works correctly. We need to fix the markers now
...
#story[818]
2017-04-27 16:18:33 +12:00
104fd86179
Got the live ac35 data working in paralell with the parse and the app.
...
#story[820]
2017-04-27 14:40:26 +12:00
67a702ffcd
Wakes still broken. Implemented dashed lines that track the progress of individual boats.
...
#implement #story[483]
2017-04-27 13:57:19 +12:00
65c0e6f77d
Fixed markergroup bugs. Improved wakes. Still WIP
2017-04-27 11:58:50 +12:00
eaff4c5aac
Added abstract class for all javafx object that a displayed during race. Began refactoring of mark implementation to be a subclass of the aforementioned abstract class.
2017-04-26 21:16:22 +12:00
c776d22941
Linking up course stream with visualiser. Boats moving, and course drawing. Boats however are not moving as intended. Needs to be fixed/looked into.
...
#story[820] #pair[kre39,cir27]
2017-04-26 18:45:58 +12:00
c73bf7dd3e
Started merging received packets from the sample stream and reading lats and lons to move boats from them.
...
#story[820]
2017-04-26 15:51:15 +12:00
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
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
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
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
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
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
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
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
121f996a43
created config, teams xml file, and teamsParser class
...
#implement
2017-03-17 01:04:10 +13:00
16abfcffda
Created course parser as a subclass of file parser
...
- refactored file parser as an abstract class
- created course parser to parse course xml file
#implement #fix #refactor #story[9] #story[10]
2017-03-17 00:54:43 +13:00
Alistair McIntyre
alistairjmcintyre
Calum
Kusal Ekanayake
Peter Galloway
Haoming Yin
Michael Rausch
zyt10