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
ffe70a8313
Trying to get laylines to display on proper respective sides of the gate
...
Having a great time here, Not quite working. There was an issue where the laylines are crossed and I think its tied to the fact that sometimes the two seperate points of the gate mark appear to have the same x y coordinate so the line function doesnt work? idk
tags: #story[956] #pair[wmu16]
2017-05-25 00:22: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
e6aed88188
Merge with develop.
...
#story[952]
2017-05-24 18:56:56 +12:00
d032314ddb
Merge branch 'develop' into Story34_Sparklines
...
# Conflicts:
# src/main/java/seng302/controllers/RaceViewController.java
# src/main/java/seng302/models/Yacht.java
2017-05-24 18:56:04 +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
13ff179840
Merge remote-tracking branch 'origin/develop' into issue#5_fix_pre-race_boats_on_leaderboard
2017-05-24 16:18:33 +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
8f93956ff1
Added methods to calculate optimal map size given a geo boundary.
...
- From zoom level 20 to 1, once find a size that contains the whole boundary, then the size will be used to retrieve map image from google
#story[928]
2017-05-24 00:49:03 +12:00
4fe4ac1079
Added get map size (width and height) method in canvasMap with given boundary
...
#story[928]
2017-05-24 00:49:03 +12:00
8a2f0a9f45
Added unit tests for Mercator projection class.
...
- changed its methods to static
- add some documentation for its methods
#story[928]
2017-05-24 00:49:03 +12:00
5cc865f0af
Created Mercator projection to convert between Geo location and planar projection point.
...
- MapGeo and MapPoint encapsulate geo location and planar projection point into classes.
#story[928]
2017-05-24 00:49:03 +12:00
189ba93e64
Created a canvas map class to fetch map image from google
...
- also added Bound class to encapsulate map boundary.
- created TestMapView and its controller just for testing.
#story[928]
2017-05-24 00:49:03 +12:00
89464e033e
Initial work on calculating when a gate is upwind or downwind
...
Need to know if a gate is upwind or downwind to use the appropriate polar table
Currently calculate the angle between the next mark and the vector of the current mark to the wind, if this angle is less than 90 degrees than the next mark should be down wind
Pretty poor implementation currently, just prototype
Doesn't appear to be working as intended currently. Just a prototype for how we could implement further
tags: #story[956]
2017-05-24 00:08:55 +12:00
ca8ea03870
Added method in mark group to draw lay lines, also added next mark to Yacht class.
...
#story[956]
2017-05-23 18:54:42 +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
2686dac62e
Fixed Yacht position initialise. TO-DO: check if the boat is participating before showing up on leaderboard.
2017-05-23 11:53:23 +12:00
ffd40fef6d
Merge remote-tracking branch 'origin/develop' into issue#5_fix_pre-race_boats_on_leaderboard
...
# Conflicts:
# src/main/java/seng302/controllers/RaceController.java
# src/main/java/seng302/controllers/StartScreenController.java
2017-05-23 11:31:18 +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
dec742cf54
Merge remote-tracking branch 'origin/develop' into 38b_LayLines
2017-05-22 18:15:58 +12:00
6f1b0b06c3
Fixed est time to next mark and time from last mark annotation update after commit e0750f53 in BoatGroup.java
...
#story[924] #story[927]
2017-05-22 16:17:52 +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
87150b3c72
Merge remote-tracking branch 'origin/develop' into 38b_LayLines
2017-05-22 15:40:11 +12:00
e385ac5c09
Initial work on static parser class for polar files
...
story[956]
2017-05-22 15:39:53 +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
0367805f0f
fixed bug from merge where est time to next mark was null on some boats #story[923]
2017-05-22 15:01:04 +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
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
07c76f12e1
Merge branch 'develop' into Story34_Sparklines
2017-05-21 17:37:41 +12:00
059c0de1fa
Quickfix for null pointer in boatObject
...
#pair[ptg19,kre39]
2017-05-21 15:58:17 +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
48d58ea660
Sparklines now update when a boat passes a mark.
...
There are issue of initialising the sparkline before the race starts and when the race is being viewed when it starts. It works great though when you join a race halfway.
#story[952]
2017-05-19 18:08:26 +12:00
aaf2e6a3f0
Added boat wakes back to the visualiser
...
#story[923]
2017-05-19 16:57:29 +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
08057edb28
Merge branch 'Issue#4_boat_movement' into issue#10_unifying_marks
...
# Conflicts:
# src/main/java/seng302/controllers/CanvasController.java
# src/main/java/seng302/controllers/RaceViewController.java
# src/main/java/seng302/models/BoatGroup.java
# src/main/java/seng302/models/mark/MarkGroup.java
2017-05-18 17:04:00 +12:00
390aabc78f
Adding race yacht series to the sparkline.
...
Next step is to make the series of the boats update when new position information is received.
#story[952]
2017-05-18 14:44:10 +12:00
a2123df0c5
Fixed Boat selection and lost annotations (Estimated and Leg Time)
...
Trails and Wakes, however, are still not re implemented yet.
story[923]
2017-05-18 14:41:08 +12:00
6f9a8e5581
Merge remote-tracking branch 'origin/develop' into issue#5_fix_pre-race_boats_on_leaderboard
2017-05-18 12:20:02 +12:00
b17bba3629
Fixed leaderboard on start screen and race view to show all boats correctly during pre-race.
...
#story[923]
2017-05-18 12:18:51 +12:00
73eeeb0ef9
Removed extra print stmt and changed default server back to official
2017-05-18 11:45:06 +12:00
0f79353936
fixes from merge #story[923]
2017-05-17 20:15:47 +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
3fd13ddc0a
Adjusted XMLParser to use model Mark objects rather than the simple datatype that existed in the XMLParser previously. Began attempting to implement them into the canvas controller but have issues
...
#[issue10]
2017-05-17 19:46:05 +12:00
2e375978bd
cleaned up code for merging back to develop #story[923]
2017-05-17 19:18:31 +12:00
45db731a60
Fixed a merge issue.
...
#story[923] #bug #refactor
2017-05-17 18:06:36 +12:00
William Muir
Kusal Ekanayake
Zhi You Tan
Michael Rausch
Haoming Yin
Alistair McIntyre
Peter Galloway
alistairjmcintyre
Michael Rausch
Calum