65223ceaaf
shifted annotation layers. Merged with dev.
2017-05-25 16:29:27 +12:00
b73e4c89db
Merge remote-tracking branch 'origin/develop' into remove_observers
...
# Conflicts:
# src/main/java/seng302/controllers/CanvasController.java
# src/main/java/seng302/controllers/RaceViewController.java
# src/main/java/seng302/fxObjects/BoatGroup.java
# src/main/java/seng302/fxObjects/MarkGroup.java
# src/main/java/seng302/models/Yacht.java
2017-05-25 14:52:54 +12:00
6e903bfbed
Merge branch 'develop' into 38b_LayLines
...
# Conflicts:
# src/main/java/seng302/App.java
# src/main/java/seng302/models/Yacht.java
# src/main/java/seng302/models/stream/StreamParser.java
2017-05-25 14:16:55 +12:00
53f6a6b8c5
Implimented a new way to determine positions
...
#story[952]
2017-05-25 14:06:33 +12:00
af81bf5891
Merge remote-tracking branch 'origin/develop' into 38b_LayLines
...
# Conflicts:
# src/main/java/seng302/models/BoatGroup.java
# src/main/java/seng302/models/Event.java
# src/main/java/seng302/models/mark/Mark.java
# src/main/java/seng302/models/stream/StreamParser.java
2017-05-25 13:56:08 +12:00
adbb9ffe3b
Removed completed TODO request.
2017-05-25 10:31:37 +12:00
4d29354797
Merge branch 'develop' into remove_observers
...
# Conflicts:
# src/main/java/seng302/controllers/CanvasController.java
# src/main/java/seng302/fxObjects/BoatGroup.java
# src/main/java/seng302/models/stream/StreamParser.java
2017-05-25 10:25:54 +12:00
a6d9c66fc9
Removed unused import statements and class variables. Removed non error print statements.
2017-05-25 10:20:39 +12:00
68c3e3e999
Merged develop onto this branchk
...
tags: #story[956]
2017-05-25 09:21:47 +12:00
67b5650288
Merge branch 'develop' into 38b_LayLines
...
# Conflicts:
# src/main/java/seng302/controllers/RaceViewController.java
# src/main/java/seng302/models/Yacht.java
2017-05-25 09:19:42 +12:00
3085125f3e
Merged with develop
2017-05-25 01:21:40 +12:00
5e26ad7c36
Merge remote-tracking branch 'origin/develop' into remove_observers
...
# Conflicts:
# src/main/java/seng302/App.java
# src/main/java/seng302/controllers/CanvasController.java
# src/main/java/seng302/controllers/RaceViewController.java
# src/main/java/seng302/models/Yacht.java
2017-05-25 01:12:10 +12:00
765ea06c3b
Several tweaks and improvements to a annotations and other visual aspects of them program. Fixed bug causing minimization crashes.
...
#implement #refactor #issue[23]
2017-05-25 01:02:33 +12:00
b3fd735f5c
Merge branch 'develop' into Story34_Sparklines
...
# Conflicts:
# src/main/java/seng302/controllers/CanvasController.java
2017-05-24 21:50:15 +12:00
3cbbdb070f
Basic implementation for mapping windspeed to draw a polar on a gate complete
...
Created functionality to grab the closest windspeed value to map to VMG values based off the current wind speed in the Polar Table
Created new RaceXML mark object which contains ALL marks for purposes of sequencing
Displaying correct (?) polars for one point only on a gate
Created functionality to receive leg data for each boat and then map that to the next gate. This may only work for the current race due to a slight fudge factor
Created functionality to receive wind speed
tags: #story[956] #pair[wmu16, mra106]
2017-05-24 20:31:07 +12:00
d2e55bf964
Removed the FPS background, and lowered the update frequency so it doesn't flip too fast.
...
#story[923]
2017-05-24 19:33:24 +12:00
81c021b59a
Merge branch 'develop' into Story34_Sparklines
...
# Conflicts:
# src/main/java/seng302/App.java
# src/main/resources/views/RaceView.fxml
2017-05-24 18:45:01 +12:00
14a7305a2d
Made FPS marker not draw on canvas.
...
Have to revert the use of the observer pattern since there is no time to change how and when data is passed.
2017-05-24 17:17:06 +12:00
71637d7286
Removed dead code from canvas controller and canvas map
...
Tags: #story[928]
2017-05-24 15:04:12 +12:00
1cac7cc189
Calculation of upwind downwind leg given a boat, wind and next mark now works. created GeometryUtils class
...
Can accurately calculate if a boat is going upwind or downward using a line function for the wind vector from the gate and the boat position from the gate.
Requires knowledge of the next mark which requires the boat to have passed a mark. This could be fixed by extracting the leg number from the race status packet and mapping these to gates in an initalisation step
tags: #story[956]
2017-05-24 14:57:22 +12:00
f85d3bf5fe
Plugged Canvas map to canvas view controller to display map
...
- rebase on the latest develop status
- optimised the scaling factor the map to fit the canvas view
- a new image containing map image is displayed under race canvas
#story[928]
2017-05-24 13:52:49 +12:00
d22d758757
Fix issues caused by not updating the time since last mark value frequently. BoatAnnotations now has an update() function that must be called somewhat regularly.
2017-05-24 03:23:02 +12:00
acbde5aad8
Moved boat annotations into their own class. Implemented observer pattern.
...
Observer pattern appears to have caused issues with updating Text objects.
Made annotations look nicer. Kinda.
#refactor
2017-05-24 03:09:11 +12:00
3f57adb9cf
Merge branch 'develop' into Story34_Sparklines
...
# Conflicts:
# src/main/java/seng302/App.java
# src/main/java/seng302/controllers/CanvasController.java
# src/main/java/seng302/controllers/RaceViewController.java
# src/main/resources/views/RaceView.fxml
2017-05-23 14:06:24 +12:00
e1b8e19966
Initial work on finding next marks for boats as from mark rounding messages
...
Marks were very difficult to extend, need large refactor
Marks now have a compound ID as well as their sourceID. They need this compound ID to be identifiable by the
mark rounding messages.
tags: #story[956] #pair[wmu16, mra106]
2017-05-22 18:54:07 +12:00
e51c966969
Made sure only boats in participant list are replaced. Also removed mark coloring as it wasn't as accurate as was necessary.
...
#story[923]
2017-05-22 16:05:24 +12:00
c30629542b
Merged develop into issue10 branch. Fixed merge issues and completed manual testing before merge request.
...
#story[923]
2017-05-22 15:27:23 +12:00
3f9fa24c69
Merge branch 'develop' into issue#10_unifying_marks
...
# Conflicts:
# src/main/java/seng302/App.java
# src/main/java/seng302/controllers/CanvasController.java
2017-05-22 15:13:48 +12:00
78573fa837
Made start/finish lines a different color.
...
#story[923]
2017-05-22 15:10:05 +12:00
e0750f5341
Merge branch 'develop' into Issue#4_boat_movement
...
# Conflicts:
# src/main/java/seng302/controllers/CanvasController.java
# src/main/java/seng302/models/BoatGroup.java
# src/main/java/seng302/models/Race.java
2017-05-22 14:56:08 +12:00
80528c9c42
fixed bug in canvas controller
...
#bug
2017-05-22 14:30:31 +12:00
be633c0e60
Marks display correctly on the canvas, no double ups or anything like that left.
...
#[issue10]
2017-05-22 13:22:55 +12:00
68a243725b
Fixed a bug where an error was caused when attempting to flip the race around the prime meridian.
...
All x values are now flipped horizontally if the difference between the smallest lon, e.g. -179.5 and the largest e.g. 179.5 is greater than 180.
#story[923] #bug
2017-05-22 05:39:36 +12:00
8f81060a18
Managed to make the sparklines coordinate with their colour.
...
However the symbols had to be removed. The sparkline can also be intialised at any time now but this might need to be tested further to ensure that it works.
#story[952]
2017-05-21 19:49:11 +12:00
8e147bd1bd
Making the boat sparkline initialise after the race screen is shown.
...
#story[952]
2017-05-21 14:56:05 +12:00
937b309b07
Added boat trails to the boat group, fixed annotations
...
- Set colours for the annotations
- Added boat trails back into the boat group
- Re-added time until next mark and time since last mark rounding
#story[923]
2017-05-19 20:55:02 +12:00
422dcd4501
Sparklines now update with boat position change.
...
Need to make it work for any amount of boats in the race and to work when the race first starts as it currently only shows one boat.
#story[952]
2017-05-19 15:15:05 +12:00
951a726309
The line chart now has series which display on it.
...
Need to get the right data to display on the linechart when it updates.
#story[952]
2017-05-18 20:56:42 +12:00
b692ddcbe6
Marks and gates correctly displaying from XML messages and mark(boat) position packets. Will need a little polishing but marks and gates are moving around.
...
#story[923] #pair[ajm412, ptg19]
2017-05-18 18:39:23 +12:00
5d6b356602
all marks displaying except currently gate marks are displaying as a single dot
...
#story[923] #pair[ajm412, ptg19]
2017-05-18 18:02:25 +12:00
38b44fa92b
Merge branch 'develop' into Issue#4_boat_movement
...
# Conflicts:
# src/main/java/seng302/controllers/Controller.java
# src/main/java/seng302/controllers/RaceController.java
# src/main/java/seng302/controllers/RaceViewController.java
# src/main/java/seng302/models/BoatGroup.java
# src/main/java/seng302/models/mark/MarkGroup.java
# src/main/java/seng302/models/stream/StreamParser.java
# src/test/java/seng302/models/stream/StreamReceiverTest.java
2017-05-17 20:05:40 +12:00
2e375978bd
cleaned up code for merging back to develop #story[923]
2017-05-17 19:18:31 +12:00
95e353c14e
fixed initialization bug #story[923]
2017-05-17 17:55:21 +12:00
aaa3dc93f1
boat movement working reliably now, still need to fix one bug at initialization #story[923]
2017-05-17 17:34:47 +12:00
9e3036e134
Stripped down the boatgroup to the basic movement components and then tried to adjust how position updates are being dealt with to make everything more logically understandable. I made some progress in terms of understanding but the position update is still not as reliable as I would like. I will be explaining to other team members how this part of the code is working so the time I have spent is not completely wasted #story[923]
2017-05-15 23:17:36 +12:00
fc3ca70e5d
Merge branch 'issue#10_unifying_marks' into Issue#4_boat_movement
...
# Conflicts:
# 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/stream/StreamPacket.java
# src/main/java/seng302/models/stream/StreamParser.java
2017-05-15 18:09:47 +12:00
9c7144c918
Removed dud print statement
...
#story[889]
2017-05-15 17:55:06 +12:00
ed8d70c3b3
commented out buffered code and cleaned up some other areas to try and make the boatgroup clear enough to modify #story[923]
2017-05-15 17:53:11 +12:00
fa501460cb
Cleaned up code for merge.
...
#story[889]
2017-05-15 17:21:56 +12:00
ccda5f2a2e
changing branch name #story[923]
2017-05-15 12:40:11 +12:00
Calum
Kusal Ekanayake
Michael Rausch
William Muir
Haoming Yin
Alistair McIntyre
Peter Galloway
alistairjmcintyre
Michael Rausch