ba5e74ab9c
Merge with master complete
...
- merged with master
#story[877]
9 years ago
a3ccd75f4c
Merge remote-tracking branch 'origin/sprint4_master' into Story877
...
# Conflicts:
# mock/src/main/java/seng302/DataInput/BoatXMLReader.java
# mock/src/main/java/seng302/DataInput/XMLReader.java
# mock/src/main/java/seng302/Model/Boat.java
# mock/src/main/java/seng302/Model/CompoundMark.java
# mock/src/main/java/seng302/Model/Leg.java
# mock/src/main/java/seng302/Model/Mark.java
# mock/src/main/java/seng302/Model/Marker.java
# mock/src/main/java/seng302/Model/Race.java
# mock/src/test/java/seng302/Model/LegTest.java
# visualiser/src/main/java/seng302/Controllers/RaceController.java
# visualiser/src/main/java/seng302/Mock/StreamedRace.java
# visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java
# visualiser/src/main/resources/scenes/race.fxml
9 years ago
debc5d9c38
Added adjustments that PO requested
...
- hide will not deselect all checkboxes
- visible will now show all checkboxes that were deselected when hidden
- partial will now select abbreviation and speed only
- when another checkbox is selected/deselected from partial,hidden or important it will immediately jump to visible radio button.
#story[877]
9 years ago
dc7aa359d7
boat time now saves
...
#story[878]
9 years ago
9076606030
Fixed show all annotation not toggling annotations.
...
-Problem found with if statement to fix annotation toggling.
-Sparkline graph x-axis also increased slightly.
#story[878]
9 years ago
2a7f264444
Merge remote-tracking branch 'remotes/origin/sprint4_master' into story36
...
# Conflicts:
# visualiser/src/main/java/seng302/Controllers/RaceController.java
# visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java
#story[878]
9 years ago
748a516d16
Boats not moving working on fix
...
Merge remote-tracking branch 'remotes/origin/sprint4_master' into story36
# Conflicts:
# mock/src/main/java/seng302/DataInput/XMLReader.java
# visualiser/src/main/java/seng302/Controllers/RaceController.java
# visualiser/src/main/java/seng302/Mock/StreamedRace.java
# visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java
# visualiser/src/main/resources/scenes/race.fxml
#story[878]
9 years ago
40421e5a83
Merge branch 'sprint4_master' into noDependencyArrow
...
# Conflicts:
# mock/src/main/java/seng302/Model/Race.java
# network/src/main/java/seng302/Networking/Messages/RaceStatus.java
# visualiser/src/main/java/seng302/Controllers/RaceController.java
# visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java
# visualiser/src/main/resources/scenes/race.fxml
9 years ago
c8157f3476
Merge remote-tracking branch 'origin/sprint4_master' into story31.2_alternateTack
...
# Conflicts:
# visualiser/src/main/java/seng302/Mock/StreamedRace.java
# visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java
Resolved.
9 years ago
2242b44398
forgot to remove imports
9 years ago
b678152cf8
Removed breaking dependency and made it so app doesn't need the breaking dependency any more.
9 years ago
671d62aeb1
Added Important and Partial Annotations and other refactors and documentation.
...
- Important, Partial, Hidden, Visible are all radiobuttons
- Fixed bug where the Visualiser would end the race before the last boat had finished
- Refactored the visualiser and the mock to use the race finished status message
- Added and Changed many Javadocs
#story[877]
9 years ago
b9d696ef12
Sparkline has a set x-axis now to prevent sparkline constantly re-adjusting axis.
...
#story[876]
9 years ago
4b2e90f54b
can now toggle the boats time on and off
...
#story[878]
9 years ago
9eb4e3daea
boats now calculate the time since last mark
...
-the raceclock is passed around so that the time can be tracked
-time from start to mark 1 is wrong
#story[878]
9 years ago
81ed07330b
Fixed the bug where the race clock wasn't visible some of the time.
...
It appears to have been due to a threading/javaFX thread issue with prop1.bind(prop2).
9 years ago
ef9d8884d4
Sparkline methods Javadoc'd
...
- createSparkline
- updateSparkline
#story[876]
9 years ago
3f2ad8886e
Fixed FPS issues and beautified sparkline display
...
- set upper and lower bounds for axis height
- formatted Y axis to show/hide necessary info
- reduced some looped actions
- added conditions for the first leg
- all boats start in 'last' place
#story[876]
9 years ago
eba2eb3cd6
Boats no longer change colour during a race and fixed the sparklines for the boats to be in the correct position #story[876]
9 years ago
74d3996f6c
Merge remote-tracking branch 'origin/story34_v2' into story34_v2
...
# Conflicts:
# visualiser/src/main/java/seng302/Controllers/RaceController.java
# visualiser/src/main/java/seng302/Mock/StreamedRace.java
9 years ago
f19a543b68
Changed line appearance and colour.
...
-Line displayed will no longer plot a point every update.
-Line colours are based on the colours displayed in the race.
-Race colours defined in ResizableRaceCanvas have been used for the lines.
-As boats change colour depending on placement (unintended), the lines will also do this.
#story[876]
9 years ago
2e1f8a2e9a
Lowered frequency sparkline updates
...
- sparkline only updates when a boat passes a point
- all lines start in the middle
- slow frame rate issue resolved
#story[876]
9 years ago
f999967cd5
Implemented functionality for sparkline to update throughout race.
...
-Sparkline reads in initial boats in race.
-Sparkline updates throughout the race.
-Sparkline updates are displayed on GUI.
#story[876]
9 years ago
7647a93d7a
Implemented an updating sparkline
...
- sparkline is set with X number of lines
- sparkline height fits X lines
- lines are updated regularly
- size is adjusted relevant to plotted points
#story[876]
9 years ago
5d34b49316
Merge branch 'master' into submission
...
# Conflicts:
# mock/src/main/java/seng302/Model/Race.java
# mock/src/test/java/seng302/Model/RaceTest.java
# visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java
9 years ago
12bff9a1e8
trying new dependency
9 years ago
f011b4117e
Added and removed javadoc tests that were making errors in the code, #story[881]
9 years ago
3570e1283f
Deleted Race class
...
- Delete dependency on Race class from Streamed Race as there is no need for extention after the split of Visualiser and Mock.
#story[881]
9 years ago
3bc8ad0a07
Arrow is now displayed on screen more vividly, the arrow can be customised to a different colour scheme if needed. #story[882]
9 years ago
9e19ddb1f4
Story 49 Marks move with boat location.
...
- Commented out blocking array as it was unecessary
- Added Observable list for markers to the race canvas
- Added SourceId's to Marker
- Added updating Markers from the Streamed Race loop.
#story[881] #pair[fwy13, jam339]
9 years ago
2d983eccfd
General code tidy up
...
- access modifiers adjusted
- unused declarations removed
- spelling fixes
- removed redundant code
9 years ago
a32775eab6
Fixed a few javadoc issues.
9 years ago
020c0329b0
Merge remote-tracking branch 'origin/TCPDisconnection' into submission
9 years ago
61ecdc2269
Merge branch 'submission' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into submission
...
# Conflicts:
# visualiser/src/main/java/seng302/Controllers/MainController.java
# visualiser/src/main/java/seng302/Controllers/StartController.java
# visualiser/src/main/java/seng302/Model/Race.java
9 years ago
61afe8d608
Created finish view to see when a race finishes.
...
-Implemented FinishController
-Fixed mock not sending Finish race status.
#Story[782]
9 years ago
a6adfb4960
Refactored RaceClock to act as central source of time and duration information throughout visualiser.
...
- StartController and RaceController use same RaceClock instance
- RaceClock updates automatically as Runnable for consistent operation
- Duration between starting and current time is now an observable property of RaceClock
#story[782]
9 years ago
bdf215d0f1
TCP connection at the front menu will no longer bug out if the socket is bugged.
...
- Timeout set on connection socket so that the socket will return false after 5 seconds.
#story[782]
9 years ago
a20dafea11
Annotations go on top and boundaries now update
...
- Fixed FPS and other annotations being hidden under the map
- Fixed boundaries not updating with the visualiser.
#story[782]
9 years ago
862391d7ef
Canvas Layer Created
...
- Canvas is created via layering.
- Resizable canvas is now a seperate abstract class
#story[782]
9 years ago
62ecd40967
fixed all java doc errors
...
#story[782]
9 years ago
23dfc6a6bf
Fixed annotation toggles displaying behind course
...
#story[782]
9 years ago
577dea2a56
Fixed time zone label on RaceController.
...
#story[782]
9 years ago
2e7527b325
Update boat position according to boat location messages in StreamedRace
...
- Added StreamedRace constructor accepting VisualiserInput
- Modified VisualiserInput constructor to accept Socket
- Refactored controller setup of Race
#story[782]
9 years ago
f377cf6471
Changed it so Boat can be used as a superclass for StreamedBoat and BoatInRace properly and removed ConstantVelocityRace. Everything that used to use BoatInRace or StreamedBoat now uses it superclass (boat). #pair[jjg64, cbt24] #refactor #story[782]
9 years ago
02511db2b9
Implemented marker visualisation from XML in ResizableRaceCanvas
...
- Replaced and deprecated Constants
- Added getMarkers to RaceDataSource interface
- Added boundary testing for source data
#story[782]
9 years ago
c328c4f3bc
Linked raceData from new xml formats to current program. Current app now shows the starting list and course boundary. #story[782]
9 years ago
a59342a668
Modified RaceClock to support arbitrary start times
...
- Amended RaceDataSource interface to require time instead of mark for calculating time.
#story[758]
9 years ago
a584400e24
Actually added sub modules this time
...
#story[778]
9 years ago
Fan-Wu Yang
hba56
David Wu
Joseph Gardner
fjc40
Jessica McAuslin
cbt24
Erika Savell