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
8a674bcaec
Merge branch 'sprint4_master' into Story877
9 years ago
e3c3def184
Fixed capitalisation that was pointed out by Erika in the Tests
...
- LegTest.java ORIGIN_Compound_MARKER is now ORIGIN_COMPOUND_MARKER
#story[877]
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
adbb8f0a64
Merge branch 'story36' into 'sprint4_master'
...
Story36
See merge request !9
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
2ac932b4f3
fix to keep boats in the bounds
...
#story[#874 , 873]
9 years ago
db3f4a5b2b
fix to keep boats in the bounds
...
#story[#874 , 873]
9 years ago
6a74b5fe36
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
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
e9ecdf5cbc
Merge branch 'noDependencyArrow' into 'sprint4_master'
...
story48
sprint4_master <- noDependencyArrow if DoD == true
See merge request !8
9 years ago
aa2f234393
Annotations are now clickable #fix
9 years ago
6a598c8a04
Arrow fxml I forgot to push
9 years ago
7c9b9c6426
Merge commit message was wrong, i wasn't watching the start up time
...
-small fix to java doc
#story[878]
9 years ago
139d7b41fb
re added story36 racefxml changes after merge
...
#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
06359fb138
Had to changed race to fit the merge
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
e9a6c34e68
Merge branch 'story31.2_alternateTack' into 'sprint4_master'
...
story 31.1, 31.2, 32 merge request
See merge request !3
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
1234cbbb1f
Merge branch 'story34_v2' into 'sprint4_master'
...
Story34 v2
See merge request !7
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
abcaca719c
Javadoc fix
...
#story[878]
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
a24dda2fd8
boats have an annotation beside them that shows time since last mark passed
...
#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
de0abf94e0
Mock.Race:
...
Fixed an issue where boats sometimes sailed towards the wind when attempting to turn from bearing just under 360 degrees to a bearing just over 360 degrees.
This required an update to the boundary detection code.
Visualiser:
Appear to have fixed issue where clock didn't display correctly. Previous commit only fixed certain circumstances.
#story[873]
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
c011ccb11b
Did some minor refactoring of Mock module...
...
Added comments/documentation to most classes.
Cleaned up heaps of repeated code, dead code, redundant stuff, etc...
Mock.App:
Now actually exits the program if catastrophic errors occur, rather than silently doing nothing.
Mock.Constants:
Added race prestart and preparatory times.
Removed TEST_VELOCITIES.
Mock.PolarParser:
Now uses Bearing class.
Mock.Angle:
Now implements the Comparable interface.
Also supports .equals.
Mock.Azimuth and Bearing:
Can convert between them easily.
Mock.Boat:
Now uses Bearing, and has some helper functions like setVMG, calculateMetersTravelled(time), moveforwards(distance, time).
Mock.Marker:
Removed. This wasn't really used, and was redundant.
Mock.GPSCoordinate:
Moved a lot of helper GPS related functions into the GPSCoordinate class, instead of being scattered around the codebase.
Mock.Polars:
Polars now uses Bearing.
Mock.VMG:
Now uses Bearing.
Mock.Race:
Added a RaceStatusEnum member.
Added a RaceTypeEnum member.
Now uses Bearing/Azimuth.
Moved the message creation/sending into their own functions.
The RaceStatus updates correctly through out the race (Prestart, Warning, Preparatory, Started, Finished).
Network.RaceStatusEnum:
Added race status enum.
Network.RaceTypeEnum:
Added.
9 years ago
a0468f251b
Merge remote-tracking branch 'origin/story33-estimateTime' into sp4_s31_cleanups
...
# Conflicts:
# mock/src/main/java/seng302/Model/Race.java
Resolved.
9 years ago
aa7337dc6c
Merge branch 'story31.2_alternateTack' into sp4_s31_cleanups
...
# Conflicts:
# mock/src/main/java/seng302/Model/Race.java
Resolved conflict manually.
9 years ago
d88c353213
Brought in some fixes from the story31.2_merge branch.
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
cc54c92d5b
Added Mock.Angle, Mock.Azimith, Mock.Bearing. These encapsulate the relevant angle type, to allow for better type safety (e.g., to avoid passing a bearing into an azimuth function).
...
Added more comments to Mock.Boat.
Moved calculateAzimuth to GPSCoordinate, from Boat.
9 years ago
27d4040a54
Cleaned up updatePosition in Mock.Race to simplify time estimation.
...
#story[875]
9 years ago
60458f0f7a
Merge commit '7990ac9d2ee8c71d50606813e21a0674f442464f' into story31.2_alternateTack.
...
This commit (7990ac9d2e
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
7d27a098ac
Fixed wind direction code missing due to past merges (?)
...
#story[882]
9 years ago
0c790c1721
Mock.Polars:
...
Was accidentally using testng in the PolarsTest. Changed it to junit.
#story[873]
9 years ago
be9f19eae5
Mock.Polars:
...
Finished PolarsTest test cases.
Fixed a number of javadoc errors across the codebase.
#story[873]
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
Fan-Wu Yang
Hamish Ball
David Wu
Jessica McAuslin
Joseph
fjc40
Erika Savell
cbt24