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
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
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
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
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
afe0c9f1a6
Merge branch 'develop' into Story47CourseLimits
...
# Conflicts:
# src/main/resources/views/RaceView.fxml
2017-05-15 10:33:22 +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
ae5678482b
changed package "parsers" to be called "stream" #story[923]
2017-05-14 20:26:49 +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
4a75c062ce
Making the course limits change when a new xml packet is received..
...
#story[889]
2017-05-11 15:49:49 +12:00
fe90a3bf13
Merge branch 'master' into story35_create_annotation_view
2017-05-11 13:43:02 +12:00
6d7697a0eb
commented out the problematic buffering functionality #story[923]
2017-05-10 13:58:10 +12:00
b529d621e9
changed course size to 720x720
2017-05-04 16:42:23 +12:00
24667991f1
Merge on to master
...
Final Push
2017-05-04 14:39:29 +12:00
6935bd514e
Reimplemented race position in the race view. Removed Boat class and Yacht class is replaced completely. Race position "-" shows properly on start screen. Removed BoatTest and TeamsParserTest. Fixed estimated time till finish on server.
...
#story[818]
2017-05-04 13:50:06 +12:00
a4cc5f222c
Refactored course boundary to be a shade rather than a line and made the stream parser and stream receiver exit gracefully before the app closes.
...
#story[820]
2017-05-04 13:29:53 +12:00
7f40fb6283
Fixed bug left in last commit
2017-05-04 11:00:57 +12:00
83316f7a17
Merge branch 'develop' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 into develop
...
# Conflicts:
# src/main/java/seng302/App.java
# src/main/java/seng302/controllers/Controller.java
2017-05-04 10:48:06 +12:00
a56e55ae70
Fix for some movement on racestart issues
...
#bug
2017-05-04 10:38:04 +12:00
d992422efd
Various bug fixes
...
- Made canvas fill entire screen
- Made window scale to screens that aren't 1920x1080
- Changed boat speeds in mock so they aren't too fast
- Added command line options to switch server
Tags: #story[829]
2017-05-03 21:56:51 +12:00
d063a41ad4
Merge remote-tracking branch 'origin/wake_remake' into develop
...
# Conflicts:
# src/main/java/seng302/App.java
2017-05-02 22:09:03 +12:00
6d02f05f05
Quick change to stop adding course markers as they are dynamic and add them in the previous way
2017-05-02 21:51:04 +12:00
b3a89279d6
Quick change to stop adding course markers as they are dynamic and add them in the previous way
2017-05-02 21:31:38 +12:00
fe824a8f71
Finished implementing drawing of border from XML
...
Border is drawn onto canvas, it is static.
#story[469]
2017-05-02 21:05:53 +12:00
04ce6f6103
Removed white behind fps counter
2017-05-02 14:18:40 +12:00
c5c2d4375d
Changed the canvas controller to read marks from the XML as received from the server (PROTOTYPE)
...
Gates appear to draw in the correct places although a bit jittery for some reason
Boundary marks are a bit sporadic and still need lines drawn in between
Large refactor of canvas controller and XMLParser still required if these two are going to work together well. Currently canvas controller is a bit of a mess.
#story[469]
2017-05-01 23:10:15 +12:00
33ae7beeb4
merging with wake remake #story[820]
2017-05-01 20:09:51 +12:00
130efa3a51
Merge branch 'wake_remake' into Story30b_correcting_boat_movement
...
# Conflicts:
# src/main/java/seng302/controllers/CanvasController.java
# src/main/java/seng302/models/BoatGroup.java
# src/main/java/seng302/models/parsers/StreamParser.java
2017-05-01 19:09:09 +12:00
7df55fc1a3
problems appear to be fixed and the boats are updating properly from the timeValid field of the boat location. #story[820]
2017-05-01 18:55:21 +12:00
a5ca9218da
Discovered the time valid timestamp in the boat location packet is quite inconsistent and either the stream or my implementation is making the display really buggy. Because the way it was before I changed things is more reliable at the moment, I have decided to wait until our mock stream is merged before continuing this development. #story[820]
2017-05-01 16:56:53 +12:00
5fe330bfbb
Boat trials and wakes now work with both fast and slow data sets.
...
Instead of fixed, hard coded thresholds and scale factors dynamically changing values
that scale with the onscreen movement are used to determine how graphical objects
are drawn.
#implement #story[816]
2017-05-01 16:41:58 +12:00
Calum
Alistair McIntyre
Peter Galloway
alistairjmcintyre
Michael Rausch
Kusal Ekanayake
Michael Rausch
William Muir
Zhi You Tan