fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
375 Commits 1 Branch 0 Tags
0bfc9a5a39f9a051cef481f467ed216c6ff85dba
Commit Graph
36 Commits
Author SHA1 Message Date
Joseph Gardner 10dd066302 Removed error checking within XML readers and ensured XML readers fail. Did this so an XML reader is not made with an invalid file. #story[782] 2017-05-01 14:15:34 +12:00
Connor Taylor-Brown 06e65c2cd2 Generate StreamedCourse from VisualiserInput 
- Allow Race to get boat location messages (added last commit)
- Removed faulty import statement (this commit)

#story[782]
 2017-04-28 20:33:58 +12:00
Connor Taylor-Brown 68a8f64fd3 Generate StreamedCourse from VisualiserInput 
#story[782]
 2017-04-28 20:29:03 +12:00
Joseph Gardner bbd725d069 Merge 2017-04-28 13:27:32 +12:00
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
 2017-04-28 13:26:12 +12:00
Joseph Gardner 39d3cc7c28 Removed boats being able to store colour, this is now down the in the ResizableRaceCanvas. #refactor #story[782] 2017-04-28 12:44:53 +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
cbt24 7d35312644 Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules 2017-04-28 11:30:58 +12:00
cbt24 5f3f3770bb Temporarily ignore out-of-bound race markers in testing. 
#story[758]
 2017-04-28 11:30:50 +12:00
Joseph Gardner 3d284c4a2b Merge branch 'splitIntoTwoModules' into visualiserAndDataLink 
# Conflicts:
#	visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java
 2017-04-28 11:23:59 +12:00
fjc40 ecebace9f1 Merge branch 'splitIntoTwoModules' of eng-git.canterbury.ac.nz:seng302-2017/team-7 into splitIntoTwoModules 2017-04-28 11:22:05 +12:00
Connor Taylor-Brown 7f273f8ba0 Fixed time source for visualiser, replacing local time 
- StreamedCourse now provides start time for clock from XML

#story[782]
 2017-04-28 02:37:50 +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 033198ca2c Linked the streamedRace course to the visualiser, linked the boats to the visualiser (this needs to be tests) #story[768] 2017-04-28 00:53:07 +12:00
fjc40 06d786d581 Merge remote-tracking branch 'origin/networkingTest' into splitIntoTwoModules 
# Conflicts:
#	mock/src/main/java/seng302/RaceEventMessages/BoatLocationMessage.java
#             Selected copy from splitIntoTwoModules.
 2017-04-27 20:02:18 +12:00
Erika Savell 83dfe1a60c Renamed some directories, optimized imports, general code clean up 
#story[778]
 2017-04-25 17:41:10 +12:00
Erika Savell 073102d1a3 Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock 2017-04-25 17:19:28 +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
cbt24 cb40302c13 Merge remote-tracking branch 'remotes/origin/story30_XMLs' into splitIntoTwoModules 2017-04-25 15:56:44 +12:00
cbt24 1653003cf0 Implemented Leg generation from Race.xml format 
- StreamedCourse now utilises StreamedCourseXMLReader as data source

#story[758]
 2017-04-25 15:51:44 +12:00
Joseph Gardner 84c518f89f Timer now shows and updates correctly on the start menu. #story[761] 2017-04-25 15:04:42 +12:00
Erika Savell 03f63b2c61 Added boat data xml tests 
#story[778]
 2017-04-25 14:42:14 +12:00
Joseph Gardner 26380f2677 Merge branch 'story30_XMLs' into splitIntoTwoModules 2017-04-25 14:01:09 +12:00
Joseph Gardner e89a269565 initialised time in raceclock (1 line) 2017-04-25 14:00:41 +12:00
Joseph Gardner a3e87f2c61 Got rid of test using a deprecated method 2017-04-25 13:20:10 +12:00
Joseph Gardner ea79f47c83 Merge branch 'story30_XMLs' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story30_XMLs 2017-04-25 13:15:23 +12:00
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] 2017-04-25 13:14:59 +12:00
cbt24 858db3f45e Fixed interface implementation for StreamedCourse 
#story[758]
 2017-04-25 13:08:57 +12:00
cbt24 a59342a668 Modified RaceClock to support arbitrary start times 
- Amended RaceDataSource interface to require time instead of mark for calculating time.
#story[758]
 2017-04-25 13:00:45 +12:00
hba56 e9578fc63b refactored networking code from networkingTest 
#story[778, 782]
 2017-04-25 12:38:13 +12:00
hba56 4b5ebbd9e4 refactored networking code from networkingTest branch 
#story[778, 782]
 2017-04-25 11:50:22 +12:00
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] 2017-04-25 02:13:57 +12:00
Joseph Gardner 0d0b9e143f Worked on XML reader to read a given race.xml in the format for the AC35. Added the ability to read the course limit and race settings #Pair[jjg64, cbt24] #Story[782] 2017-04-21 16:43:35 +12:00
Joseph Gardner 9e3ca68df8 added skeleton for StreamedRace and StreamedCourse #Pair[jjg64, cbt24] #Story[782] 2017-04-21 13:28:55 +12:00
Joseph Gardner a85bf292d5 new branch for xml readers for the visuliser 2017-04-21 12:23:02 +12:00
Erika Savell a584400e24 Actually added sub modules this time 
#story[778]
 2017-04-20 11:16:19 +12:00