Erika Savell
e9f3467d97
Reverted commits pushed to master accidentally
...
#story[875]
9 years ago
Erika Savell
230b458e5d
Cherrypicked changes allowing vis to display est time from bugged branch to current master.
...
#story[875]
9 years ago
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]
9 years ago
Joseph Gardner
06359fb138
Had to changed race to fit the merge
9 years ago
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]
9 years ago
Jessica McAuslin
43757b34d1
General code tidy up (Visualiser)
...
- access modifiers adjusted
- unused declarations removed
- spelling fixes
- removed redundant code
9 years ago
Jessica McAuslin
2d983eccfd
General code tidy up
...
- access modifiers adjusted
- unused declarations removed
- spelling fixes
- removed redundant code
9 years ago
Connor Taylor-Brown
1723d0c27f
Fixed scaling of wakes (note issues with velocity data)
...
- Official stream provides speeds of 0 kn
- Mock provides speeds that do not correlate with motion
#story[782]
9 years ago
Joseph Gardner
f0943d232a
Date formatting now supports both old and new formatting and dnf has been added to boat. #story[782]
9 years ago
Joseph Gardner
8117e11ff2
Merge branch 'NetworkedVisualiser' into splitIntoTwoModules
...
# Conflicts:
# visualiser/src/main/java/seng302/VisualiserInput.java
9 years ago
cbt24
ccbe467090
Synchronised GUI with VisualiserInput thread.
...
- Made StreamedCourse extend Observable
- Initialised StartController after data pulled from network
- Moved VisualiserInput to visualiser module
- Deleted Networking subpackage from visualiser module
#story[782]
9 years ago
Erika Savell
3f748bfdb6
Removed BoatInRace from shared model, refactored
...
#story[778]
9 years ago
Joseph Gardner
d977d3f146
Merge branch 'visualiserAndDataLink' into splitIntoTwoModules
...
# Conflicts:
# visualiser/src/main/java/seng302/Controllers/RaceController.java
# visualiser/src/main/java/seng302/Controllers/StartController.java
# visualiser/src/main/java/seng302/Mock/BoatXMLReader.java
# visualiser/src/main/java/seng302/Mock/StreamedBoat.java
# visualiser/src/main/java/seng302/Mock/StreamedCourse.java
# visualiser/src/main/java/seng302/Mock/StreamedRace.java
# visualiser/src/main/java/seng302/Model/BoatInRace.java
# visualiser/src/main/java/seng302/Model/ConstantVelocityRace.java
# visualiser/src/main/java/seng302/Model/Race.java
# visualiser/src/main/java/seng302/RaceXMLReader.java
# visualiser/src/test/java/seng302/Model/ConstantVelocityRaceTest.java
9 years ago
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]
9 years ago
Joseph
033198ca2c
Linked the streamedRace course to the visualiser, linked the boats to the visualiser (this needs to be tests) #story[768]
9 years ago
Erika Savell
83dfe1a60c
Renamed some directories, optimized imports, general code clean up
...
#story[778]
9 years ago
Joseph
22075ee415
Started on the boat XML parser, reads only boat data from the XML and makes a StreamedBoat for each boat in the XML. #story[861]
9 years ago
Erika Savell
a584400e24
Actually added sub modules this time
...
#story[778]
9 years ago