fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
472 Commits 1 Branch 0 Tags
862391d7ef288ac051181eef2bb34b4f5bfde088
Commit Graph
106 Commits
Author SHA1 Message Date
Fan-Wu Yang 0fc1da4090 Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules 2017-05-01 19:21:48 +12:00
Fan-Wu Yang 560af8c21d Added more data types to Visualiser Input that can be take from InputStream 
-Added AverageWind
-Added CourseWinds
-Added MarkRounding
-Added RaceStartStatus
#story[782]
 2017-05-01 19:21:43 +12:00
Joseph Gardner 18e9234240 Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules 2017-05-01 19:15:44 +12:00
Joseph Gardner f0943d232a Date formatting now supports both old and new formatting and dnf has been added to boat. #story[782] 2017-05-01 19:15:33 +12:00
cbt24 e40bb6c4cb Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules 
# Conflicts:
#	visualiser/src/main/java/seng302/VisualiserInput.java
 2017-05-01 18:55:08 +12:00
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]
 2017-05-01 18:52:52 +12:00
Erika Savell 4b485fe5ca Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules 2017-05-01 18:47:48 +12:00
Erika Savell 060db182a8 Minor tweaks to get streaming from mock working 
- Key point there being boats, raceand regatta xml files are being read from mock

#story[778]
 2017-05-01 18:35:39 +12:00
Fan-Wu Yang 2c414d3061 Added way to get the Race Status and Boat Status' 
- Added getters in Visualiser Input
- Added Hashmap for boat status messages
#story[782]
 2017-05-01 18:35:15 +12:00
Erika Savell 0ef96258ad Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules 2017-05-01 18:21:37 +12:00
Joseph Gardner 2a2fe6de59 Race clock now works and the setup for the racestart now checks if the tag has "Start" or "Time". #story[782] 2017-05-01 18:16:21 +12:00
Erika Savell 185c65e54d Editing MockOutput to send actual generated boat/race/regatta xmls 
- Was previously sending from a static source file

#story[778]
 2017-05-01 18:15:36 +12:00
hba56 8bbea28cab refactored the boat message to not use boats 
#story[778]
 2017-05-01 17:35:30 +12:00
Joseph Gardner 8117e11ff2 Merge branch 'NetworkedVisualiser' into splitIntoTwoModules 
# Conflicts:
#	visualiser/src/main/java/seng302/VisualiserInput.java
 2017-05-01 16:51:03 +12:00
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] 2017-05-01 16:42:47 +12:00
cbt24 3f42d56502 Merge remote-tracking branch 'remotes/origin/splitIntoTwoModules' into NetworkedVisualiser 
# Conflicts:
#	visualiser/src/main/java/seng302/VisualiserInput.java
 2017-05-01 16:00:11 +12:00
cbt24 b1db9ee5be Merge remote-tracking branch 'remotes/origin/splitIntoTwoModules' into NetworkedVisualiser 
# Conflicts:
#	visualiser/src/main/java/seng302/VisualiserInput.java
 2017-05-01 15:55:19 +12:00
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]
 2017-05-01 15:21:12 +12:00
Erika Savell e927242707 Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules 2017-05-01 15:07:41 +12:00
Erika Savell 3f748bfdb6 Removed BoatInRace from shared model, refactored 
#story[778]
 2017-05-01 15:06:56 +12:00
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