33ae7beeb4
merging with wake remake #story[820]
2017-05-01 20:09:51 +12:00
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
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
3adadcc1e1
Updated the timer to show two decimals for the seconds.
...
#story[572]
2017-05-01 18:49:58 +12:00
5b027a29d8
Merge remote-tracking branch 'origin/wake_remake' into wake_remake
2017-05-01 18:35:56 +12:00
2a9d0fb82c
Removed 2 bad import statements that halted the build form building.
2017-05-01 18:35:48 +12:00
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
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
1d47df09eb
Merge branch 'merge_branch_front' into wake_remake
...
# Conflicts:
# src/main/java/seng302/App.java
2017-05-01 17:46:16 +12:00
a9709c4f84
Merged the mock server to visualisation.
...
#story[715] #story[716]
2017-05-01 17:42:07 +12:00
a06806c42d
Merge remote-tracking branch 'origin/wake_remake' into wake_remake
2017-05-01 17:35:51 +12:00
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
978493853d
Merge branch 'Story29' into merge_branch_front
...
# Conflicts:
# src/main/java/seng302/App.java
# src/main/java/seng302/controllers/CanvasController.java
# src/main/java/seng302/controllers/Controller.java
# src/main/java/seng302/controllers/RaceViewController.java
# src/main/java/seng302/models/Boat.java
# src/main/java/seng302/models/Colors.java
# src/main/java/seng302/models/Event.java
# src/main/java/seng302/models/Race.java
# src/main/java/seng302/models/mark/GateMark.java
# src/main/java/seng302/models/mark/Mark.java
# src/main/java/seng302/models/mark/MarkType.java
# src/main/java/seng302/models/mark/SingleMark.java
# src/main/java/seng302/models/parsers/CourseParser.java
# src/main/java/seng302/models/parsers/TeamsParser.java
# src/main/resources/views/MainView.fxml
# src/main/resources/views/RaceView.fxml
# src/test/java/seng302/BoatTest.java
# src/test/java/seng302/ColorsTest.java
# src/test/java/seng302/EventTest.java
# src/test/java/seng302/models/mark/MarkTest.java
# src/test/java/seng302/models/parsers/CourseParserTest.java
2017-05-01 17:06:17 +12:00
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
5fe330bfbb
Boat trials and wakes now work with both fast and slow data sets.
...
Instead of fixed, hard coded thresholds and scale factors dynamically changing values
that scale with the onscreen movement are used to determine how graphical objects
are drawn.
#implement #story[816]
2017-05-01 16:41:58 +12:00
c80cff87f7
Updated import statements after merge
2017-05-01 16:02:09 +12:00
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
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
6a361c0d4b
Documented some RaceObject classes.
...
#documentation
2017-05-01 14:30:41 +12:00
b597f010dc
Added some missing fields. Added missing getters.
...
#story[820]
2017-05-01 00:36:10 +12:00
a670f677e9
Added other email to .mailmap
2017-05-01 00:10:07 +12:00
a77423b937
Added other email to .mailmap
2017-05-01 00:07:56 +12:00
50083a9297
Added tests for reverse and intToBytes
...
#story[829]
2017-04-30 23:54:32 +12:00
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
e7f9954970
Removed unneeded files, also fixed heading calculation
...
Tags #story[829]
2017-04-30 23:29:15 +12:00
ec57851de2
Created annotation slider to display different levels of annotations
...
Removed toggleAnnotations method as abstract from race object and made only for boat group as it didnt make sense for markgroup, at least not currently as they have no annotations to show
#story[558]
2017-04-30 23:24:24 +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
b9900925b8
Fixing wakes, bug caused by attempting to fix a issue with jittery boats actually caused by parser.
...
#bug
2017-04-30 19:00:07 +12:00
d94290c58d
Merge branch 'Mark_to_MarkGroup' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 into Mark_to_MarkGroup
2017-04-30 18:15:24 +12:00
f50aabff7b
Documentation added to graphics classes.
...
#document
2017-04-30 18:15:16 +12:00
d07c660eb9
Merge remote-tracking branch 'origin/Story29' into Story29
2017-04-30 17:47:05 +12:00
6491efec4c
Fixed race status sent in race status messages
...
#story[829]
2017-04-30 17:46:56 +12:00
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
85f461c88c
Fixed bug so XML messages are located and sent properly on the server
...
Imported appache commons to read inputstream to a bytearray
#story[829]
2017-04-30 17:08:06 +12:00
1cf55f3e96
Fixed an issue where buffers aren't being sent properly
...
Tags #Story[829]
2017-04-30 16:16:44 +12:00
9a995ddcc1
Boat status changes to finished when a boat finishes the race
...
Tags: #story[829]
2017-04-30 01:55:49 +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
99e50aa7ac
Merge remote-tracking branch 'origin/Story30b_correcting_boat_movement' into Story30b_correcting_boat_movement
2017-04-29 20:21:49 +12:00
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
6cbff1097b
Fixed error'd tests which were based off old xml data.
2017-04-29 20:16:14 +12:00
246083460e
partway through fixing boat movement to be updated from the data valid timestamp rather than the data sent timestamp #story[820]
2017-04-29 20:13:34 +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
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
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
a0624cfef6
Merge branch 'wake_remake' into Mark_to_MarkGroup
...
# Conflicts:
# src/main/java/seng302/controllers/CanvasController.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/RaceView.fxml
2017-04-29 14:29:12 +12:00
02a35b4c02
Reduced the cost of updating wakes. Improved the logic for controlling indices.
...
#implement #story[820]
2017-04-29 14:20:52 +12:00
80409c08a6
Removed a graphical object added for testing.
2017-04-29 02:17:55 +12:00
Peter Galloway
Zhi You Tan
Kusal Ekanayake
Haoming Yin
Alistair McIntyre
Calum
alistairjmcintyre
Michael Rausch
William Muir
Michael Rausch