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
8dec458ba9
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-15 19:57:23 +12:00
da07d885da
Merge branch 'Story47CourseLimits' into 'develop'
...
Story47 course limits
The idea was to have the course canvas update whenever we receive a new xml packet for the race data. Specifically for a few seconds after the race where the course boundaries change, going from a boundary which contains the start line to cutting off the start line as soon as the boats start.
See merge request !30
2017-05-15 18:43:49 +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
eda3d76077
Added get map size (width and height) method in canvasMap with given boundary
...
#story[928]
2017-05-15 17:06:28 +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
335540ff4a
Merge branch 'story36_elapsed_time' into 'develop'
...
Story36 elapsed time
Implemented time elapsed since last mark on annotation
See merge request !29
2017-05-15 16:33:21 +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
4c7f530458
Merge branch 'story33_add_estimated_time_annotation' into 'develop'
...
Story33 add estimated time annotation
Added estimated time to next mark to annotation
See merge request !28
2017-05-15 15:50:46 +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
23bc643c91
Removed some unused functions and imports caused by code refactor.
...
#chore
2017-05-15 15:20:21 +12:00
c4fe116267
MarkGroups refactored to be independent of BoatGroups as their functionality has diverged.
...
#issue[10] #refactor
2017-05-15 15:17:54 +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
4b1a4aae87
Added unit tests for Mercator projection class.
...
- changed its methods to static
- add some documentation for its methods
#story[928]
2017-05-15 13:23:04 +12:00
ccda5f2a2e
changing branch name #story[923]
2017-05-15 12:40:11 +12:00
3fd8b1b855
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-15 12:24:36 +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
9c348df5a5
Merge branch 'merge_request_test' into 'master'
...
Added .codeclimate.yml for static code analysis
See merge request !26
2017-05-15 01:28:57 +12:00
256ec046fc
adjusted givePointsXY to try and use the marks from the XML parser, stopped partway as the marks from the XML parser and the standard marks need to be merged before this can be fixed properly #story[923]
2017-05-14 22:12:16 +12:00
85d4d63287
Merge branch 'story35_create_annotation_view' into 'develop'
...
Story35 create annotation view
## Addresses issue #9 and story 35
# Change Log
* Styled application using CSS (Issue #9 )
* User can select to only show important annotations using the annotation slider
* Added view to select important annotations
* Important annotations are updated in real-time
# Testing
* Unit tests in test/java/seng302/visualizer/annotations/*
* Controllers have been tested manually
# Acceptance Criteria
* There is a mechanism to chose the ‘important’ annotations while viewing a race.
* Any number of annotations (from zero to the number of annotations) can be chosen.
* If the partial annotations toggle is active, choosing an annotation makes that annotation immediately visible for all boats, and deselecting an annotation should likewise remove it from all boats.
* When the partial annotations toggle becomes active, all annotations chosen as ‘important’, and only those annotations, should be shown.
See merge request !27
2017-05-14 22:00:02 +12:00
213d36ed56
Merge remote-tracking branch 'origin/develop' into story35_create_annotation_view
2017-05-14 21:05:48 +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
ae5678482b
changed package "parsers" to be called "stream" #story[923]
2017-05-14 20:26:49 +12:00
63514cfafb
deleted duplicated packet type class #story[923]
2017-05-14 20:20:14 +12:00
03ca60f2e1
deleted a whole bunch of legacy code, primarily the old controllers and old parsers #story[923]
2017-05-14 20:12:35 +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
William Muir
Peter Galloway
Haoming Yin
Michael Rausch
Michael Rausch
Kusal Ekanayake
Zhi You Tan
Calum