fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
434 Commits 1 Branch 0 Tags
618073d04e7c90c5bfa9e6954de5dc555039d620
Commit Graph
70 Commits
Author SHA1 Message Date
Joseph Gardner 618073d04e Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules 2017-05-04 12:11:47 +12:00
Joseph Gardner 94ad164a45 Boat table and positions now update. #story[782] 2017-05-04 12:11:36 +12:00
Joseph Gardner e43353c322 Boat table and positions now update. #story[782] 2017-05-04 12:10:13 +12:00
cbt24 09483fff2c Added blocking loop to wait 
- waits for the InputStream to be populated for at least 15 bytes of size before reading in case of header size error potentially crashing the program.
#story[782]
 2017-05-04 11:49:16 +12:00
Erika Savell eb58581e83 Fixed velocity issues with mock data 
-Was accidentally sending scaled velocity

#story[778]
 2017-05-04 10:16:10 +12:00
Connor Taylor-Brown 7d81fc810c Display name of race in lobby. 
- Moved Regatta properties and accessors to RegattaXMLReader
- StartController update now tolerates any permutation of types of XML messages

#story[782]
 2017-05-04 01:32:28 +12:00
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]
 2017-05-04 00:32:06 +12:00
Connor Taylor-Brown 0e1bf64177 Fixed boat track rendering (points were added before boat position set) 
#story[782]
 2017-05-03 22:31:34 +12:00
Connor Taylor-Brown e7008ab6db Fixed race playback issue, removed obsolete detail from UI. 
- Removed race scaling options
- Refactored start screen timer formatting for clarity
- Removed incomplete countdownTimer override in Streamed Race

#story[782]
 2017-05-03 22:04:08 +12:00
Connor Taylor-Brown 5a92dd68f5 Fixed build and interface problems. 
- Ignore online host test (fails on CI)
- Disable connect button on startup to prevent bad socket

#story[782]
 2017-05-03 19:31:00 +12:00
Connor Taylor-Brown ac4fbda848 Added connection screen to allow users to select available hosts from a preconfigured list. 
- Added ConnectionController for initial client setup
- Added RaceConnection class for socket data and checking
- Configures StartController with a socket drawn from a host table

#story[782]
 2017-05-03 03:40:36 +12:00
cbt24 ad58407021 Began work on ConnectionController for selecting active hosts on startup via GUI. 
#story[782]
 2017-05-03 00:35:46 +12:00
cbt24 577dea2a56 Fixed time zone label on RaceController. 
#story[782]
 2017-05-02 22:41:51 +12:00
Erika Savell 08f203a0f8 Added race statuses for before the race has started. 3 min -> 1 min is warning, 1 min -> 0 min is preparatory. 
-Boat locations (spread across start line) are also broad casted

#story[778]
 2017-05-02 20:13:39 +12:00
Erika Savell 42ad1f78fc Added heading to boatlocation messages 
#story[778]
 2017-05-02 19:21:43 +12:00
Erika Savell f2e0eec212 Fixed date time parsing problem 
#story[778]
 2017-05-02 16:50:09 +12:00
Erika Savell 7d1f4209e4 Got mock data being used by visualiser. 
- Issue with zonedTimeDate not parsing
- Fixed race crashing once one boat finished

#story[778]
 2017-05-01 20:56:46 +12:00
Fan-Wu Yang 84bb4fdb8f Fixed merge issue 
- Strange Issue where there was a null pointer from convertGPS however it has resolved itself may crop in the future htough.
#story[782]
 2017-05-01 20:23:52 +12:00
Fan-Wu Yang 5444b872bd Fixed GPs Coordinates as well as got Boats to display 
- Fixed GPS conversion number being wrong (extra 1)
- Fixed Boats displaying as the boat = null (cough Joseph) was stopping it from working as well as track is broken.
#story[782]
 2017-05-01 20:13:16 +12:00
Fan-Wu Yang 04366c2e4c Fixed small Merge issue 
- Deleted a unfinished statement that caused hte build to fail
#story[782]
 2017-05-01 19:24:59 +12:00
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
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