Commit Graph
844 Commits
Author SHA1 Message Date
Erika Savell dc9cdab4d7 Merge branch 'AuditRefactors' into 'sprint4_master'
Audit Refactors

- Created AC35RaceStatus class
- Deleted wait loop into a Thread.sleep()
- Deleted Entirely commented out class....
- Deleted duplicate draw that appeared again
#story[873]

See merge request !4
2017-05-25 00:49:07 +12:00
Fan-Wu Yang 6e3d8dc75b Merged Refactors with master 2017-05-24 23:50:17 +12:00
Fan-Wu Yang 22e5996e64 Merge remote-tracking branch 'origin/sprint4_master' into AuditRefactors
# Conflicts:
#	visualiser/src/main/java/seng302/VisualiserInput.java
2017-05-24 23:49:00 +12:00
Connor Taylor Brown 37828ef0fe Merge branch 'Story877' into 'sprint4_master'
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]

See merge request !5
2017-05-24 23:45:50 +12:00
Fan-Wu Yang ba5e74ab9c Merge with master complete
- merged with master
#story[877]
2017-05-24 23:13:59 +12:00
Fan-Wu Yang 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
2017-05-24 22:57:31 +12:00
Fan-Wu Yang 8a674bcaec Merge branch 'sprint4_master' into Story877 2017-05-24 22:30:23 +12:00
Fan-Wu Yang e3c3def184 Fixed capitalisation that was pointed out by Erika in the Tests
- LegTest.java ORIGIN_Compound_MARKER is now ORIGIN_COMPOUND_MARKER
#story[877]
2017-05-24 22:29:51 +12:00
Fan-Wu Yang 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]
2017-05-24 22:24:37 +12:00
fjc40 7f3500202f Mock.Polars:
Moved some code into isBearingInsideInterval and isFlippedInterval utility functions.

Mock.Race:
Appear to have fixed the boats going out bounds issue at last, by fixing a few bugs, simplifying the code, and removing the boat turning speeds.
2017-05-24 19:20:30 +12:00
Hamish Ball adbb8f0a64 Merge branch 'story36' into 'sprint4_master'
Story36



See merge request !9
2017-05-24 18:05:04 +12:00
hba56 dc7aa359d7 boat time now saves
#story[878]
2017-05-24 17:59:02 +12:00
fjc40 824a5ed3a2 Merge branch 'boat_boundarty_fix' into story36
# Conflicts:
#	mock/src/main/java/seng302/Model/Race.java
Resolved.
2017-05-23 18:35:39 +12:00
David Wu 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]
2017-05-23 17:49:00 +12:00
hba56 2ac932b4f3 fix to keep boats in the bounds
#story[#874, 873]
2017-05-23 15:17:19 +12:00
hba56 db3f4a5b2b fix to keep boats in the bounds
#story[#874, 873]
2017-05-23 14:56:07 +12:00
hba56 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]
2017-05-23 13:19:48 +12:00
hba56 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]
2017-05-23 13:19:11 +12:00
Jessica McAuslin e9ecdf5cbc Merge branch 'noDependencyArrow' into 'sprint4_master'
story48

sprint4_master <- noDependencyArrow if DoD == true

See merge request !8
2017-05-23 12:52:51 +12:00
Joseph aa2f234393 Annotations are now clickable #fix 2017-05-23 12:22:30 +12:00
Joseph 6a598c8a04 Arrow fxml I forgot to push 2017-05-23 11:17:54 +12:00
hba56 7c9b9c6426 Merge commit message was wrong, i wasn't watching the start up time
-small fix to java doc
#story[878]
2017-05-22 17:56:47 +12:00
hba56 139d7b41fb re added story36 racefxml changes after merge
#story[878]
2017-05-22 17:46:51 +12:00
hba56 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]
2017-05-22 17:45:45 +12:00
Joseph Gardner 06359fb138 Had to changed race to fit the merge 2017-05-22 16:39:26 +12:00
Joseph Gardner 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
2017-05-22 15:28:53 +12:00
Joseph Gardner e9a6c34e68 Merge branch 'story31.2_alternateTack' into 'sprint4_master'
story 31.1, 31.2, 32 merge request



See merge request !3
2017-05-22 15:01:07 +12:00
fjc40 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.
2017-05-22 14:26:45 +12:00
Erika Savell 1234cbbb1f Merge branch 'story34_v2' into 'sprint4_master'
Story34 v2



See merge request !7
2017-05-22 14:16:39 +12:00
Joseph 2242b44398 forgot to remove imports 2017-05-22 11:53:38 +12:00
Joseph b678152cf8 Removed breaking dependency and made it so app doesn't need the breaking dependency any more. 2017-05-22 11:49:40 +12:00
hba56 abcaca719c Javadoc fix
#story[878]
2017-05-22 11:05:36 +12:00
Fan-Wu Yang 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]
2017-05-22 03:51:14 +12:00
zwu18 b9d696ef12 Sparkline has a set x-axis now to prevent sparkline constantly re-adjusting axis.
#story[876]
2017-05-21 23:06:51 +12:00
hba56 4b2e90f54b can now toggle the boats time on and off
#story[878]
2017-05-20 21:04:03 +12:00
hba56 a24dda2fd8 boats have an annotation beside them that shows time since last mark passed
#story[878]
2017-05-20 20:40:08 +12:00
hba56 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]
2017-05-20 17:22:52 +12:00
fjc40 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]
2017-05-20 00:18:42 +12:00
fjc40 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).
2017-05-19 21:50:14 +12:00
Jessica McAuslin ef9d8884d4 Sparkline methods Javadoc'd
- createSparkline
- updateSparkline

#story[876]
2017-05-19 21:39:25 +12:00
Jessica McAuslin 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]
2017-05-19 21:21:00 +12:00
fjc40 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.
2017-05-19 16:12:47 +12:00
Fan-Wu Yang 044d786043 Added Refactors that the Audit suggested
- Created AC35RaceStatus class
- Deleted wait loop into a Thread.sleep()
- Deleted Entirely commented out class....
- Deleted duplicate draw that appeared again
#story[873]
2017-05-19 01:05:45 +12:00
fjc40 a0468f251b Merge remote-tracking branch 'origin/story33-estimateTime' into sp4_s31_cleanups
# Conflicts:
#	mock/src/main/java/seng302/Model/Race.java
Resolved.
2017-05-18 23:41:17 +12:00
fjc40 aa7337dc6c Merge branch 'story31.2_alternateTack' into sp4_s31_cleanups
# Conflicts:
#	mock/src/main/java/seng302/Model/Race.java
Resolved conflict manually.
2017-05-18 17:16:06 +12:00
fjc40 d88c353213 Brought in some fixes from the story31.2_merge branch. 2017-05-18 17:03:52 +12:00
Joseph Gardner eba2eb3cd6 Boats no longer change colour during a race and fixed the sparklines for the boats to be in the correct position #story[876] 2017-05-18 16:39:16 +12:00
fjc40 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.
2017-05-18 14:49:56 +12:00
cbt24 27d4040a54 Cleaned up updatePosition in Mock.Race to simplify time estimation.
#story[875]
2017-05-18 14:42:27 +12:00
fjc40 60458f0f7a Merge commit '7990ac9d2ee8c71d50606813e21a0674f442464f' into story31.2_alternateTack.
This commit (7990ac9d2e) was the commit from master that story49 was merged into.
Everything appears to be working.

# Conflicts:
#	mock/src/main/java/seng302/App.java
#	mock/src/main/java/seng302/Constants.java
#	mock/src/main/java/seng302/DataInput/RaceXMLReader.java
#	mock/src/main/java/seng302/DataInput/RegattaXMLReader.java
#	mock/src/main/java/seng302/Model/Boat.java
#	mock/src/main/java/seng302/Model/Event.java
#	mock/src/main/java/seng302/Model/Race.java
#	mock/src/test/java/seng302/Data/BoatDataTest.java
#	mock/src/test/java/seng302/Data/RaceDataTest.java
#	mock/src/test/java/seng302/Model/BoatTest.java
#	mock/src/test/java/seng302/Model/RaceXMLTest.java
#	visualiser/src/main/java/seng302/Controllers/StartController.java
#	visualiser/src/main/java/seng302/RaceXMLReader.java
Manually resolved conflicts. :(
2017-05-18 13:44:02 +12:00