Joseph Gardner
3d284c4a2b
Merge branch 'splitIntoTwoModules' into visualiserAndDataLink
...
# Conflicts:
# visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java
9 years ago
Connor Taylor-Brown
7f273f8ba0
Fixed time source for visualiser, replacing local time
...
- StreamedCourse now provides start time for clock from XML
#story[782]
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
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
073102d1a3
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock
9 years ago
Erika Savell
e30aa02aac
Commented and javadoc-ed RegattaData and BoatData
...
#story[9]
9 years ago
Erika Savell
19224ba840
Refactored RegattaData
...
#story[778]
9 years ago
Erika Savell
ba5c965fd6
Refactored BoatData
...
#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
cbt24
cb40302c13
Merge remote-tracking branch 'remotes/origin/story30_XMLs' into splitIntoTwoModules
9 years ago
cbt24
1653003cf0
Implemented Leg generation from Race.xml format
...
- StreamedCourse now utilises StreamedCourseXMLReader as data source
#story[758]
9 years ago
Erika Savell
302f2c6869
Javadoc and commented RaceData class
...
#story[778]
9 years ago
Erika Savell
3542827c29
Refactored RaceData class
...
#story[778]
9 years ago
Joseph Gardner
84c518f89f
Timer now shows and updates correctly on the start menu. #story[761]
9 years ago
Erika Savell
03f63b2c61
Added boat data xml tests
...
#story[778]
9 years ago
Joseph Gardner
26380f2677
Merge branch 'story30_XMLs' into splitIntoTwoModules
9 years ago
Joseph Gardner
e89a269565
initialised time in raceclock (1 line)
9 years ago
Erika Savell
d05d7271fc
Removed output stream, started refactoring BoatDataClass
...
#story[778]
9 years ago
Joseph Gardner
a3e87f2c61
Got rid of test using a deprecated method
9 years ago
Joseph Gardner
ea79f47c83
Merge branch 'story30_XMLs' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story30_XMLs
9 years ago
Joseph Gardner
3461a2c0b7
Added the ability to reads boats from both race.xml and boat.xml. Linked the two xmls via the StreamedCource class. #story[782]
9 years ago
cbt24
858db3f45e
Fixed interface implementation for StreamedCourse
...
#story[758]
9 years ago
Erika Savell
6a35c40f77
Commented out test causing CI issues
...
#story[778]
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
a9f98b48b2
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock
9 years ago
Erika Savell
744caf0d29
Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock
9 years ago
hba56
e9578fc63b
refactored networking code from networkingTest
...
#story[778, 782]
9 years ago
David Wu
d14446a12e
Added extra constructor in Race.
...
-Constructor is used for junit testing for Race class.
#story[778]
9 years ago
Erika Savell
896589d1a5
Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock
9 years ago
Erika Savell
0719720585
Moved boat xml creation from Event class to BoatData class
...
#story[778]
9 years ago
David Wu
c2183a68a0
Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock
9 years ago
David Wu
0fd4de7ec7
Fixed previously broken tests due to refactoring app.
...
-ConstantVelocityRace doesn't exist anymore so tests had to be change to compensate for this.
-Boat in race had to be change due to the addition of the sourceID for each boat.
#story[778]
9 years ago
hba56
67b73ec1db
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
9 years ago
Erika Savell
721fb5f28a
Removed regatta xml creation from Event class into RegattaData class
...
#story[778]
9 years ago
hba56
4b5ebbd9e4
refactored networking code from networkingTest branch
...
#story[778, 782]
9 years ago
Erika Savell
7f2d8107b8
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
David Wu
d995d5df45
Fixed RegattaDataSource missing.
...
-RegattaDataSource failed to push from before. It is now created and working.
#story[778]
9 years ago
fjc40
2876eec1e4
Added some exception classes to encapsulate the internal exceptions that can occur when sending Boat/race/regatta data.
...
#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
fjc40
bf5ea193af
Mock App now passes an OutputStream into the "Event" class. This is where data is written to (i.e., writing data over tcp socket).
...
Updated Event and Race class to write to this stream, and added some TODO notes which point out where we need to properly serialize messages, when merged with networking code.
9 years ago
fjc40
2ce84e3be4
Added myself to the .mailmap file.
9 years ago
fjc40
091ee4735b
Race.simulateRace() function now generates a BoatLocationMessage after updating the position of each boat. Currently we just print the message to stdout.
...
Added functions to convert knots (as a double) to mm/sec (as an int) to BoatLocationMessage class.
Added toString function to BoatLocationMessage class.
Added a sequence number member to the BoatInRace class.
Added Knots to meters per second conversion factor to Contants class.
#story[788]
9 years ago
zwu18
c5df90d276
Created RegattaDataSource and regattaTest.xml.
...
-Event regattaData will now get data from the XML instead of having static data.
#story[778]
9 years ago
Erika Savell
5304f7df7d
removed problematic import
...
#story[778]
9 years ago
Erika Savell
3ff2a07680
Temporarily ignored some tests in mock
...
#story[778]
9 years ago
Erika Savell
a7913a16f9
Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock
9 years ago
Erika Savell
9764f448eb
Added participants field to xml generator
...
#story[778]
9 years ago
Erika Savell
c365d5a344
Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock
9 years ago
David Wu
1d9b098f2b
Create XML Object for regatta data.
...
-Regatta data XML is generated in class Event.
-Regatta data is static as there isn't any information regarding it.
#story[778]
9 years ago
Erika Savell
fdba50f9d2
Added course limit, course and marker seq field to xml fiule of race info
...
#story[778]
9 years ago