d38baa9fc4
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
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]
9 years ago
23dfc6a6bf
Fixed annotation toggles displaying behind course
...
#story[782]
9 years ago
eb58581e83
Fixed velocity issues with mock data
...
-Was accidentally sending scaled velocity
#story[778]
9 years ago
8886b5db05
Fixed RegattaXMLTest.
...
#story[782]
9 years ago
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]
9 years ago
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]
9 years ago
0e1bf64177
Fixed boat track rendering (points were added before boat position set)
...
#story[782]
9 years ago
9bab3d3359
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
9 years ago
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]
9 years ago
b9901a252a
Moved speed conversion to BoatMessage class
...
#story[778]
9 years ago
7c59632c41
Fixes to get race running
...
- Had an incorrect if else statement that was preventing race from running
#story[778]
9 years ago
d2e08fa8e1
Added boat velocity to information provided by mock
...
#story[778]
9 years ago
5a92dd68f5
Fixed build and interface problems.
...
- Ignore online host test (fails on CI)
- Disable connect button on startup to prevent bad socket
#story[782]
9 years ago
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]
9 years ago
ad58407021
Began work on ConnectionController for selecting active hosts on startup via GUI.
...
#story[782]
9 years ago
577dea2a56
Fixed time zone label on RaceController.
...
#story[782]
9 years ago
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]
9 years ago
049f0f7331
Changed main loop so boats are looped through with a different starting boat
...
-This was necessary because one boat (the last one to be processed) would lag and jump, as sometimes there was not enough time for all location messages to be sent before the next lot were added.
- The solution was to add a boatOffset, which means while the boats are still processed with3 coming after 2 coming after 1 etc, the loop starts with boat 0, then the next run through it wiull start with boat 1 and so on.
-This eliminated the lag (or at least spread it evenly across all the boats)
#story[778]
9 years ago
42ad1f78fc
Added heading to boatlocation messages
...
#story[778]
9 years ago
f2e0eec212
Fixed date time parsing problem
...
#story[778]
9 years ago
7d1f4209e4
Got mock data being used by visualiser.
...
- Issue with zonedTimeDate not parsing
- Fixed race crashing once one boat finished
#story[778]
9 years ago
d1baf021ac
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
984617ce57
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
44a5b9a38f
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]
9 years ago
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]
9 years ago
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]
9 years ago
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]
9 years ago
9eae70fb82
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
...
# Conflicts:
# visualiser/src/main/java/seng302/VisualiserInput.java
9 years ago
32dabdb187
Fixed course xml reader. #story[782]
9 years ago
04366c2e4c
Fixed small Merge issue
...
- Deleted a unfinished statement that caused hte build to fail
#story[782]
9 years ago
0fc1da4090
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
560af8c21d
Added more data types to Visualiser Input that can be take from InputStream
...
-Added AverageWind
-Added CourseWinds
-Added MarkRounding
-Added RaceStartStatus
#story[782]
9 years ago
18e9234240
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
9 years ago
f0943d232a
Date formatting now supports both old and new formatting and dnf has been added to boat. #story[782]
9 years ago
e40bb6c4cb
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
...
# Conflicts:
# visualiser/src/main/java/seng302/VisualiserInput.java
9 years ago
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]
9 years ago
4b485fe5ca
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
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]
9 years ago
2c414d3061
Added way to get the Race Status and Boat Status'
...
- Added getters in Visualiser Input
- Added Hashmap for boat status messages
#story[782]
9 years ago
0ef96258ad
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
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
185c65e54d
Editing MockOutput to send actual generated boat/race/regatta xmls
...
- Was previously sending from a static source file
#story[778]
9 years ago
8bbea28cab
refactored the boat message to not use boats
...
#story[778]
9 years ago
9eefbbd7fa
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
9 years ago
8117e11ff2
Merge branch 'NetworkedVisualiser' into splitIntoTwoModules
...
# Conflicts:
# visualiser/src/main/java/seng302/VisualiserInput.java
9 years ago
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
4811b7f4ea
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
...
# Conflicts:
# mock/src/test/java/seng302/Model/RaceTest.java
9 years ago
0bfc9a5a39
Added test for race dnf in Race class.
...
-Unable to test animation timer.
#story[778]
9 years ago
7cb4b2228d
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
9 years ago
Erika Savell
cbt24
Fan-Wu Yang
Joseph Gardner
hba56
David Wu