Erika Savell
0ef96258ad
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
Joseph Gardner
2a2fe6de59
Race clock now works and the setup for the racestart now checks if the tag has "Start" or "Time". #story[782]
9 years ago
Erika Savell
185c65e54d
Editing MockOutput to send actual generated boat/race/regatta xmls
...
- Was previously sending from a static source file
#story[778]
9 years ago
hba56
8bbea28cab
refactored the boat message to not use boats
...
#story[778]
9 years ago
Joseph Gardner
9eefbbd7fa
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
9 years ago
Joseph Gardner
8117e11ff2
Merge branch 'NetworkedVisualiser' into splitIntoTwoModules
...
# Conflicts:
# visualiser/src/main/java/seng302/VisualiserInput.java
9 years ago
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]
9 years ago
David Wu
4811b7f4ea
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
...
# Conflicts:
# mock/src/test/java/seng302/Model/RaceTest.java
9 years ago
David Wu
0bfc9a5a39
Added test for race dnf in Race class.
...
-Unable to test animation timer.
#story[778]
9 years ago
hba56
7cb4b2228d
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
9 years ago
hba56
a271952e0c
fixed boat parser for the mock
...
#story[778]
9 years ago
cbt24
3f42d56502
Merge remote-tracking branch 'remotes/origin/splitIntoTwoModules' into NetworkedVisualiser
...
# Conflicts:
# visualiser/src/main/java/seng302/VisualiserInput.java
9 years ago
cbt24
b1db9ee5be
Merge remote-tracking branch 'remotes/origin/splitIntoTwoModules' into NetworkedVisualiser
...
# Conflicts:
# visualiser/src/main/java/seng302/VisualiserInput.java
9 years ago
Erika Savell
69fca43534
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
Erika Savell
9acd519d7b
Removed the rest of the shared model classes needed by mock
...
#story[778]
9 years ago
hba56
cdcbb07dc6
removed unused conversion
9 years ago
hba56
40a7ca808f
added .trim to remove the unwanted bytes at the end of xml
...
#pair[hba56, fw13, jjg64]
#story[782]
9 years ago
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]
9 years ago
Erika Savell
d34dfc537e
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
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]
9 years ago
Erika Savell
e927242707
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
Erika Savell
3f748bfdb6
Removed BoatInRace from shared model, refactored
...
#story[778]
9 years ago
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]
9 years ago
Erika Savell
7e569b59b7
Commenting out tests just to get CI working, will investigate on different branch
...
#story[778]
9 years ago
Erika Savell
2320675b7e
Fixing build
...
#story[778]
9 years ago
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]
9 years ago
Erika Savell
c972dd7caf
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
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]
9 years ago
Erika Savell
bbd282bd9b
Set race to send out status messages (including boat location details)
...
- Untested, so not sure of accuracy yet
#story[778]
9 years ago
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]
9 years ago
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]
9 years ago
Connor Taylor-Brown
68a8f64fd3
Generate StreamedCourse from VisualiserInput
...
#story[782]
9 years ago
Erika Savell
e2f3abffc6
WIP adding race status messages
...
#story[778]
9 years ago
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]
9 years ago
hba56
5a972c855e
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
9 years ago
hba56
5bbdd6e00d
updated the visualiserinput to be a thread
...
#story[782]
9 years ago
Fan-Wu Yang
eab41315c5
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
Fan-Wu Yang
760f1ed5a9
Added CRC
...
- CRC checking now works
#story[782]
9 years ago
hba56
db4792452f
added run statement to mock thread
...
#story[782]
9 years ago
Erika Savell
214e26ad90
Switched port back to 4942
...
#story[778]
9 years ago
Erika Savell
6befa24302
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
Joseph Gardner
3b24d35677
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
9 years ago
Joseph Gardner
bbd725d069
Merge
9 years ago
Erika Savell
ce47818c94
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
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
9 years ago
Erika Savell
9c24b0840e
Changed MockInput to thread
...
#story[778}
9 years ago
hba56
3b13f5bac1
swapping sockets so mock is the server rather than visualiser
...
#story[782]
9 years ago
Joseph Gardner
39d3cc7c28
Removed boats being able to store colour, this is now down the in the ResizableRaceCanvas. #refactor #story[782]
9 years ago
Erika Savell
b1bbef814b
Switching to use networking modules
...
#story[778]
9 years ago
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]
9 years ago