8e147bd1bd
Making the boat sparkline initialise after the race screen is shown.
...
#story[952]
2017-05-21 14:56:05 +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
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
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
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
73eeeb0ef9
Removed extra print stmt and changed default server back to official
2017-05-18 11:45:06 +12:00
45db731a60
Fixed a merge issue.
...
#story[923] #bug #refactor
2017-05-17 18:06:36 +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
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
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
9c7144c918
Removed dud print statement
...
#story[889]
2017-05-15 17:55:06 +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
8fbb9d6d4e
Added/improved documentation
...
#chore
2017-05-15 15:36:18 +12:00
081d7e3dcb
Fixed the parsing of bytes being off by one byte in the stream parser fr the race status packet.
...
#story[924] #pair[kre39,zyt10]
2017-05-15 14:52:57 +12:00
764ae37ce4
Gave the boatgroups a selection attribute, allowing them to be highlighted upon clicking
...
Boats can be clicked on canvas or from selection drop down on the side
#story[955]
2017-05-15 14:09:09 +12:00
e62a609b6b
Prepared StreamParser.java, BoatGroup.java, Yacht.java for leg timer annotation (story 36)
...
#story[927]
2017-05-15 13:47:30 +12:00
94d1982670
Shifted the canvas to the back of the window when updated.
...
This is to preserve the way the boats are still shown on the front when the course i reloaded.
As the main live stream has been down, this still needs to be tested.
2017-05-15 10:46:28 +12:00
39efafc75f
Fixed Annotation.java, ImportantAnnotationController.java, RaceViewController.java to include estimate time to next mark after merge
...
#story[924]
2017-05-15 10:36:20 +12:00
afe0c9f1a6
Merge branch 'develop' into Story47CourseLimits
...
# Conflicts:
# src/main/resources/views/RaceView.fxml
2017-05-15 10:33:22 +12:00
04b105d74b
Merge branch 'develop' into story33_add_estimated_time_annotation
...
# Conflicts:
# src/main/java/seng302/controllers/RaceViewController.java
2017-05-15 10:19:58 +12:00
1ab6351d48
Fixed estimated time to next mark (annotation) to update correctly
...
#story[924]
2017-05-15 10:11:19 +12:00
ff6bfc9516
Important annotations are displayed correctly when updated.
...
- Important annotations can be selected, the live view updates in real time
- Change local time text colour to white
- Split the important annotations state into a separate class
Tags: #story[926]
2017-05-14 20:27:25 +12:00
89ef6e5277
Wake calculation now changed to be based off of the separation between wakes.
...
This allows wakes to auto correct their position better and stops the system reliance on "realistic data".
Wakes have several options for behaviour until the ideal settings are decided upon.
Note that MarkGroup position updating is currently disabled.
#implement #refactor #issue[1] #story[923]
2017-05-14 17:24:15 +12:00
47880d09bc
Implemented estimated time to next mark. Added checkbox for estimated time to next mark. To be fix: change from long to human readable time, update time every second
...
#story[923]
2017-05-12 20:04:09 +12:00
5472765b95
Removed unused methods in RaceViewController.java
...
#story[923]
2017-05-12 18:24:28 +12:00
14d975dce4
Fixed a bug where clicking "watch race" before race starts will cause boats to travel in unexpected ways.
...
#story[923]
2017-05-12 17:41:47 +12:00
a23bdd0c53
Added functionality to select important annotations and ui changes
...
- Added CSS for the race view & welcome screen
- Added view to select important annotations
- Annotations are enabled/disabled when the user changes the important annotations
Tags: #story[926]
2017-05-11 21:44:56 +12:00
4a75c062ce
Making the course limits change when a new xml packet is received..
...
#story[889]
2017-05-11 15:49:49 +12:00
Kusal Ekanayake
Michael Rausch
Calum
Zhi You Tan
William Muir
Michael Rausch