fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,407 Commits 1 Branch 0 Tags
eca921cb113a03c24913473a96bb7c813beb2556
Commit Graph
1407 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Erika Savell 63ee51d938 Fixed compoundMarkID typo that was causing a parse int exception 
- All that was needed was capitalizing the D in ID in the parser

#story[782]
 2017-05-01 20:19:07 +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
Joseph Gardner 9eae70fb82 Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules 
# Conflicts:
#	visualiser/src/main/java/seng302/VisualiserInput.java
 2017-05-01 19:42:30 +12:00
Joseph Gardner 32dabdb187 Fixed course xml reader. #story[782] 2017-05-01 19:42:17 +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 9eefbbd7fa Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules 2017-05-01 16:51:48 +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
David Wu 4811b7f4ea Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules 
# Conflicts:
#	mock/src/test/java/seng302/Model/RaceTest.java
 2017-05-01 16:39:26 +12:00
David Wu 0bfc9a5a39 Added test for race dnf in Race class. 
-Unable to test animation timer.

#story[778]
 2017-05-01 16:37:55 +12:00
hba56 7cb4b2228d Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules 2017-05-01 16:08:28 +12:00
hba56 a271952e0c fixed boat parser for the mock 
#story[778]
 2017-05-01 16:08:23 +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
Erika Savell 69fca43534 Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules 2017-05-01 15:49:26 +12:00
Erika Savell 9acd519d7b Removed the rest of the shared model classes needed by mock 
#story[778]
 2017-05-01 15:49:07 +12:00
hba56 cdcbb07dc6 removed unused conversion 2017-05-01 15:24:46 +12:00
hba56 40a7ca808f added .trim to remove the unwanted bytes at the end of xml 
#pair[hba56, fw13, jjg64]
#story[782]
 2017-05-01 15:21:42 +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 d34dfc537e Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules 2017-05-01 15:17:50 +12:00
Fan-Wu Yang 444a4432c6 Fixed stream from messing up 
- Stream was getting code before all of it came therefore a while loop was added t owait for the code
#story[782] #pair[hba56, fwy13]
 2017-05-01 15:07:59 +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
Erika Savell 7e569b59b7 Commenting out tests just to get CI working, will investigate on different branch 
#story[778]
 2017-04-30 21:26:57 +12:00
Erika Savell 2320675b7e Fixing build 
#story[778]
 2017-04-30 21:23:52 +12:00
Erika Savell 0126d29524 Fixing some of the SharedModel/seng302 import conflicts 
-Am really not liking the SharedModel structure, think reverting back to original structure is worth discussing

story[778]
 2017-04-30 21:21:09 +12:00
Erika Savell c972dd7caf Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules 2017-04-30 21:20:04 +12:00
Erika Savell 067beed1e3 Attempted to write test for calls to MockOutput 
-Struggling because we use animation timers to run the race, and these don't seem to work from a JUnit context

#story[778]
 2017-04-30 20:55:40 +12:00
Erika Savell bbd282bd9b Set race to send out status messages (including boat location details) 
- Untested, so not sure of accuracy yet

#story[778]
 2017-04-30 20:18:04 +12:00
Fan-Wu Yang c3717b7fc5 Added Classes to help Visualiser 
- Added Get Boat GPS Coordinate
- Added Get Heading as Degrees
- Added Get True Wind Angle as Degrees
#story[782]
 2017-04-29 18:26:02 +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
Erika Savell e2f3abffc6 WIP adding race status messages 
#story[778]
 2017-04-28 18:11:28 +12:00
Fan-Wu Yang 8569d3f2dc Added a few decoders and unit converters 
- Units can be converted from int to degrees as a double
- XML message now keeps the most recent XML file
#story[782]
 2017-04-28 17:00:04 +12:00
hba56 5a972c855e Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules 2017-04-28 14:32:32 +12:00
hba56 5bbdd6e00d updated the visualiserinput to be a thread 
#story[782]
 2017-04-28 14:32:25 +12:00