Jessica McAuslin
cf0adb8511
Fixed JavaDoc, spelling errors, and redundant classes
...
- Removed some default templates (eg: created by X)
- Wrote JavaDoc for classes that had none
- Made JavaDoc more clear for classes
- Linked JavaDoc to other classes
- Minor spelling errors fixed
- BoatInRace and BoatInRaceTest commented out (to be removed)
#story[1003]
2017-06-28 20:37:01 +12:00
Jessica McAuslin
fdeec19b20
Wind Arrow direction fixed
...
- arrow shows wind direction as from instead of to
- removed old unused displayArrow method
- renamed displayFancyArrow to displayWindArrow
- removed coordinates parameter not used
#story[882, 1003]
2017-06-24 13:41:03 +12:00
fjc40
234748d056
Visualiser:
...
Fixed the issue where a boat's time since last mark started counting from when the race screen loaded.
It now starts counting when the race actually starts.
2017-05-25 14:41:51 +12:00
Erika Savell
5f23f335e5
Added est time annotation to annotations that can be hidden and shown
...
#story[875]
2017-05-25 02:29:56 +12:00
Erika Savell
92e5dc4490
Cherrypicked changes allowing vis to display est time from bugged branch to current master.
...
#story[875]
2017-05-25 01:34:23 +12:00
Erika Savell
e9f3467d97
Reverted commits pushed to master accidentally
...
#story[875]
2017-05-25 01:23:44 +12:00
Erika Savell
f0da2d4fee
Merge remote-tracking branch 'origin/sprint4_master' into 33CherryPick
2017-05-25 01:15:14 +12:00
Erika Savell
230b458e5d
Cherrypicked changes allowing vis to display est time from bugged branch to current master.
...
#story[875]
2017-05-25 01:14:54 +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
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
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
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
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
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
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
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
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
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
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
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
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
60458f0f7a
Merge commit '7990ac9d2ee8c71d50606813e21a0674f442464f' into story31.2_alternateTack.
...
This commit (7990ac9d2e
2017-05-18 13:44:02 +12:00
fjc40
be9f19eae5
Mock.Polars:
...
Finished PolarsTest test cases.
Fixed a number of javadoc errors across the codebase.
#story[873]
2017-05-17 13:33:34 +12:00
Joseph Gardner
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
2017-05-15 16:08:46 +12:00
Jessica McAuslin
d294ee7994
Deleted redundant and deprecated code (Visualiser)
...
- References to deprecated objects replaced
- Deprecated Constants class removed
- general redundant code deleted
2017-05-11 15:44:58 +12:00
Joseph Gardner
3bc8ad0a07
Arrow is now displayed on screen more vividly, the arrow can be customised to a different colour scheme if needed. #story[882]
2017-05-10 16:30:32 +12:00
Fan-Wu Yang
045e69a637
Deleted and Fixed some redundant code
...
- Deleted some unused functions
- Fixed NullPointerException for Marks
#story[881] #pair[fwy13,jam339]
2017-05-10 15:51:55 +12:00
Fan-Wu Yang
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]
2017-05-10 14:45:42 +12:00
Jessica McAuslin
2d983eccfd
General code tidy up
...
- access modifiers adjusted
- unused declarations removed
- spelling fixes
- removed redundant code
2017-05-08 20:21:20 +12:00
Joseph Gardner
e1ba2ae5b6
Now reads course wind direction from the live stream, so the wind arrow now changes when the wind changes. #story[882]
2017-05-08 17:23:55 +12:00
hba56
12e457824d
fix for issue #5 gate lines
...
-removed drawing of lines between the marks as only the start and finish line should have a line drawn
#story[782]
2017-05-06 16:31:40 +12:00
Fan-Wu Yang
862391d7ef
Canvas Layer Created
...
- Canvas is created via layering.
- Resizable canvas is now a seperate abstract class
#story[782]
2017-05-04 16:54:06 +12:00
hba56
e409c8752c
Fix for now - Need to change
2017-05-04 14:56:54 +12:00
Fan-Wu Yang
874953f763
Fixed issue win ResizableRaceCanvas
...
- Issue where the boat position may mess up if it is called before the server has sent us information about hte location.
#story[782]
2017-05-04 13:07:05 +12:00
Erika Savell
eb58581e83
Fixed velocity issues with mock data
...
-Was accidentally sending scaled velocity
#story[778]
2017-05-04 10:16:10 +12:00
Connor Taylor-Brown
0e1bf64177
Fixed boat track rendering (points were added before boat position set)
...
#story[782]
2017-05-03 22:31:34 +12:00
Fan-Wu Yang
5444b872bd
Fixed GPs Coordinates as well as got Boats to display
...
- Fixed GPS conversion number being wrong (extra 1)
- Fixed Boats displaying as the boat = null (cough Joseph) was stopping it from working as well as track is broken.
#story[782]
2017-05-01 20:13:16 +12:00
Joseph Gardner
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]
2017-04-28 12:35:00 +12:00
Connor Taylor-Brown
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]
2017-04-28 01:58:55 +12:00
Joseph Gardner
c328c4f3bc
Linked raceData from new xml formats to current program. Current app now shows the starting list and course boundary. #story[782]
2017-04-25 16:06:24 +12:00
Erika Savell
a584400e24
Actually added sub modules this time
...
#story[778]
2017-04-20 11:16:19 +12:00
Jessica McAuslin
fjc40
Erika Savell
Fan-Wu Yang
David Wu
hba56
Joseph Gardner
Connor Taylor-Brown