michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 14:28:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
288 Commits 17 Branches 21 Tags
8233b75e0597b546c3edf2fe503ac2d108d4ceec
Commit Graph

48 Commits

Author SHA1 Message Date
Zhi You Tan 8233b75e05 Fixed the start screen team list after merging. Team list shows boats competing in event again. 
#story[572]
 2017-05-02 18:52:31 +12:00
Zhi You Tan 3af15b2b95 Updated wind direction on race view controller so it responds to the stream. 
#story[818]
 2017-05-02 18:02:44 +12:00
Kusal Ekanayake 178af141f0 Refactoring and documentation 
#story[820]
 2017-05-02 14:08:25 +12:00
Peter Galloway f8d003002b fixing error from merge #story[820] 2017-05-01 20:37:46 +12:00
Peter Galloway 1f71fd1967 Merge branch 'wake_remake' into Story30b_correcting_boat_movement 
# Conflicts:
#	src/main/java/seng302/App.java
#	src/main/java/seng302/controllers/CanvasController.java
#	src/main/java/seng302/models/BoatGroup.java
#	src/main/java/seng302/models/RaceObject.java
#	src/main/java/seng302/models/mark/MarkGroup.java
#	src/main/java/seng302/models/parsers/StreamParser.java
 2017-05-01 20:33:09 +12:00
Peter Galloway 33ae7beeb4 merging with wake remake #story[820] 2017-05-01 20:09:51 +12:00
Peter Galloway 130efa3a51 Merge branch 'wake_remake' into Story30b_correcting_boat_movement 
# Conflicts:
#	src/main/java/seng302/controllers/CanvasController.java
#	src/main/java/seng302/models/BoatGroup.java
#	src/main/java/seng302/models/parsers/StreamParser.java
 2017-05-01 19:09:09 +12:00
Peter Galloway 7df55fc1a3 problems appear to be fixed and the boats are updating properly from the timeValid field of the boat location. #story[820] 2017-05-01 18:55:21 +12:00
Kusal Ekanayake 5b027a29d8 Merge remote-tracking branch 'origin/wake_remake' into wake_remake 2017-05-01 18:35:56 +12:00
Kusal Ekanayake 2a9d0fb82c Removed 2 bad import statements that halted the build form building. 2017-05-01 18:35:48 +12:00
Zhi You Tan ee6a543f8d Fixed timer separator instead of dot to semicolon, and fixed the timer position in race canvas, and updated the start screen so it does not grow vertically 
#story[572]
 2017-05-01 18:35:17 +12:00
Kusal Ekanayake d927531354 Removed broken time extracting method and replaced it with currently existing long extractor. Added speed to the setDestination method for the raceObject abstract class. 
#story[820]
 2017-05-01 18:22:08 +12:00
Alistair McIntyre 57de058582 Began figuring out how to implement XML data in place of mock data. 
#story[820] #pair[ajm412, wmu16]
 2017-05-01 17:35:39 +12:00
Peter Galloway a5ca9218da Discovered the time valid timestamp in the boat location packet is quite inconsistent and either the stream or my implementation is making the display really buggy. Because the way it was before I changed things is more reliable at the moment, I have decided to wait until our mock stream is merged before continuing this development. #story[820] 2017-05-01 16:56:53 +12:00
Zhi You Tan 9a864cc2bd Merge remote-tracking branch 'origin/Mark_to_MarkGroup' into wake_remake 
# Conflicts:
#	src/main/java/seng302/App.java
#	src/main/java/seng302/controllers/Controller.java
#	src/main/java/seng302/models/BoatGroup.java
#	src/main/java/seng302/models/Wake.java
#	src/main/java/seng302/models/parsers/StreamParser.java
#	src/main/resources/views/MainView.fxml
 2017-05-01 15:59:14 +12:00
Alistair McIntyre c07f13180f Merged Story 30b branch into 30c branch 
#story[820]
 2017-05-01 15:32:23 +12:00
Alistair McIntyre 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
alistairjmcintyre b597f010dc Added some missing fields. Added missing getters. 
#story[820]
 2017-05-01 00:36:10 +12:00
Michael Rausch d5aa430d4a Fixed a method that was converting the timestamp bytes incorrectly 
- If an argument is passed to the application, it will use the internal mock server
Tags: #story[820]
 2017-04-30 23:41:21 +12:00
Zhi You Tan 25038da2a1 Created BoatsParser.java to parse boats from server boat.xml and created a table on the start screen to display all the teams from server 
#story[572]
 2017-04-30 17:17:47 +12:00
alistairjmcintyre 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
Peter Galloway a898290c0b partway through fixing boat movement to be updated from the data valid timestamp rather than the data sent timestamp #pair[kre39, ptg19] #story[820] 2017-04-29 20:21:26 +12:00
Kusal Ekanayake 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
Alistair McIntyre 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
Peter Galloway 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
Calum 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
Zhi You Tan b939086e10 Updated welcome screen to show if race is finished or starting 
#story[572]
 2017-04-28 21:28:34 +12:00
Zhi You Tan ffdfc24e65 Created a start screen with a timer which shows the race progress 
#story[572]
 2017-04-28 20:09:17 +12:00
Kusal Ekanayake d204bee55d Started documentation on the stream parser. 
#story[820]
 2017-04-28 17:01:28 +12:00
Kusal Ekanayake 0f4ad48de0 Fixed and enables the old wakes. Enabled the fps counter by implementing the team-27s fps counter from their code, fixed trails from starting at the start of the startline no matter at what point in the race the stream is connected to (this is means the map starts a lot cleaner). Added live tracked speeds which are taken from the boat location packet. Linked the speeds coming in to their specified boats and allowed the onscreen speed tracker to keep up with the speeds. Linked the current speeds to the wakes so the wakes are redrawn for each change in speed and size to match the speed. Also added the toggle functionality back to the fps counter so they can be toggled on an off. 
#story[818]
 2017-04-28 16:41:35 +12:00
Alistair McIntyre 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
Kusal Ekanayake 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
Alistair McIntyre e1de5e0989 Parsed more course data from XML messages 
#story[820]
 2017-04-27 18:31:13 +12:00
Alistair McIntyre 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
Kusal Ekanayake 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
Kusal Ekanayake 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
Calum 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
Calum 65c0e6f77d Fixed markergroup bugs. Improved wakes. Still WIP 2017-04-27 11:58:50 +12:00
Kusal Ekanayake 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
Kusal Ekanayake 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
Kusal Ekanayake 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
Alistair McIntyre 8cbd1cc4aa Added support to import XML packet to XML Document object. 
#story[820]
 2017-04-25 17:38:26 +12:00
Kusal Ekanayake 00c1a89f58 Fixed error in the switch (missing breaks) 
#story[820]
 2017-04-25 15:39:28 +12:00
Kusal Ekanayake 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
Peter Galloway 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
Kusal Ekanayake 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
Kusal Ekanayake 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
Kusal Ekanayake 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