cbt24
e40bb6c4cb
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
...
# Conflicts:
# visualiser/src/main/java/seng302/VisualiserInput.java
9 years ago
cbt24
2e7527b325
Update boat position according to boat location messages in StreamedRace
...
- Added StreamedRace constructor accepting VisualiserInput
- Modified VisualiserInput constructor to accept Socket
- Refactored controller setup of Race
#story[782]
9 years ago
Joseph Gardner
2a2fe6de59
Race clock now works and the setup for the racestart now checks if the tag has "Start" or "Time". #story[782]
9 years ago
Joseph Gardner
41a94495aa
Changed the XML reader to take an InputStream rather than InputSource- this has changed everything that used an InputSource to use an InputStream. Made the XML Readers actually read after they received a new InputStream. Changed it so the table updates when the boats in the race change. #pair[jjg64, cbt24] #story[782]
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
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
fjc40
ecebace9f1
Merge branch 'splitIntoTwoModules' of eng-git.canterbury.ac.nz:seng302-2017/team-7 into splitIntoTwoModules
9 years ago
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]
9 years ago
Erika Savell
83dfe1a60c
Renamed some directories, optimized imports, general code clean up
...
#story[778]
9 years ago
Joseph Gardner
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
Joseph Gardner
84c518f89f
Timer now shows and updates correctly on the start menu. #story[761]
9 years ago
cbt24
a59342a668
Modified RaceClock to support arbitrary start times
...
- Amended RaceDataSource interface to require time instead of mark for calculating time.
#story[758]
9 years ago
Erika Savell
a584400e24
Actually added sub modules this time
...
#story[778]
9 years ago