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
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
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
6a6ed3ed44
Server sends mark locations to test
...
- Added a timer to send boat location messages containing the mark locations to test the receiver
#story[891]
2017-05-18 13:32:24 +12:00
b87008f590
Merge branch 'develop' into Story34_Sparklines
2017-05-18 13:22:51 +12:00
ecc0e722b5
Started sparkline prototype
...
#story[952]
2017-05-18 13:19:59 +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
95e353c14e
fixed initialization bug #story[923]
2017-05-17 17:55:21 +12:00
8a3a41294a
Fixed error causing build failure.
...
#story[923] #bug #refactor
2017-05-17 17:41:45 +12:00
f41858e2c7
Tidied variable names.
2017-05-17 17:35:59 +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
e5eab0a6c8
Merge remote-tracking branch 'origin/develop' into issue#1_wakes_3.0
...
# Conflicts:
# src/main/java/seng302/App.java
# src/main/java/seng302/models/BoatGroup.java
2017-05-17 17:27:34 +12:00
7c39368126
Removed unnecessary constant
2017-05-17 17:23:10 +12:00
ade926e2f2
StreamParser class now only shares thread safe classes.
...
#story[923] #bug
2017-05-17 16:44:05 +12:00
c63c8e4d73
Stripped out excess code in Wake class.
2017-05-17 16:33:45 +12:00
3c418b2aa4
Changed boat location message to milliseconds
2017-05-17 14:57:31 +12:00
6e3d037021
Merge branch 'develop' into 38a_Select_Boats
2017-05-17 14:34:10 +12:00
7d160eaf54
Removed unused imports from controller.java
2017-05-17 13:16:00 +12:00
4da8c1645e
Split Start Screen out from Main View view and controller.
...
#story[923]
2017-05-17 12:56:13 +12:00
1c01aab1e7
Merge on to develop
...
story[955]
2017-05-17 10:34:00 +12:00
6a85b0800f
Merge on to develop
...
story[955]
2017-05-17 10:06:50 +12:00
1acb0fbac4
Merge on to develop
...
story[955]
2017-05-17 10:04:28 +12:00
2b294702a9
Merge remote-tracking branch 'origin/develop' into 38a_Select_Boats
...
# Conflicts:
# src/main/java/seng302/controllers/RaceViewController.java
# src/main/java/seng302/models/BoatGroup.java
2017-05-17 09:53:18 +12:00
afd97d6e05
Reformating of code to google style.
...
#story[955]
2017-05-17 00:34:36 +12:00
2d5a7a8a49
Large tidying of RaceViewController class. Fixing updating for combo boxes
...
#story[955]
2017-05-16 15:06:01 +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
a9de005e1a
Removed a extraneous print stmt
2017-05-15 18:41:44 +12:00
e03e121da4
Merge branch 'develop' into Story47CourseLimits
...
Conflicts:
src/main/java/seng302/App.java
2017-05-15 18:37:31 +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
110143ae6e
Added a dynamically updating course limits file to the model.
...
This will make manual testing of the course limits easier. When the race starts, the limits encapsulate the start line but soon after the race starts the course limits close off around the start line (this is for the model). This means the model acts in a very similar way to the actual live stream.
#story[889]
2017-05-15 17:09:12 +12:00
51f090324a
CSS on annotation selection and minor bug fixes. Changed annotation slider to only have None, important and All
...
#story[955]
2017-05-15 16:44:28 +12:00
5fa47ff65b
Implemented elapsed time since last mark on annotation.
...
#story[927]
2017-05-15 16:31:04 +12:00
3a1c1a5e43
Merge remote-tracking branch 'origin/develop' into story36_elapsed_time
...
# Conflicts:
# src/main/java/seng302/models/BoatGroup.java
2017-05-15 15:54:44 +12:00
2e914a7704
Fixed estimate time to next mark to match acceptance criteria which is countdown in minutes and seconds.
...
#story[924]
2017-05-15 15:49:21 +12:00
Kusal Ekanayake
Michael Rausch
Alistair McIntyre
William Muir
Zhi You Tan
Peter Galloway
alistairjmcintyre
Calum
Michael Rausch