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
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
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
60458f0f7a
Merge commit '7990ac9d2ee8c71d50606813e21a0674f442464f' into story31.2_alternateTack.
...
This commit (7990ac9d2e
9 years ago
be9f19eae5
Mock.Polars:
...
Finished PolarsTest test cases.
Fixed a number of javadoc errors across the codebase.
#story[873]
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
d294ee7994
Deleted redundant and deprecated code (Visualiser)
...
- References to deprecated objects replaced
- Deprecated Constants class removed
- general redundant code deleted
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
045e69a637
Deleted and Fixed some redundant code
...
- Deleted some unused functions
- Fixed NullPointerException for Marks
#story[881] #pair[fwy13,jam339]
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
e1ba2ae5b6
Now reads course wind direction from the live stream, so the wind arrow now changes when the wind changes. #story[882]
9 years ago
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]
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
e409c8752c
Fix for now - Need to change
9 years ago
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]
9 years ago
eb58581e83
Fixed velocity issues with mock data
...
-Was accidentally sending scaled velocity
#story[778]
9 years ago
0e1bf64177
Fixed boat track rendering (points were added before boat position set)
...
#story[782]
9 years ago
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]
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
a584400e24
Actually added sub modules this time
...
#story[778]
9 years ago
David Wu
hba56
Joseph Gardner
fjc40
Jessica McAuslin
Fan-Wu Yang
Erika Savell
Connor Taylor-Brown