David Wu
34ef1172ce
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
David Wu
bf12f77796
Set it so the lobby view switches to race view depending on the race status passed in by the mock.
...
-Removed start button in lobby as it should be automatic.
-TODO: Synchronize the times across the whole race as they do not matching.
#Story[782]
9 years ago
hba56
db43acf935
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
hba56
86db16c83d
updated the connection scene to let a user add their own connection
...
-added textfields to the fxml
-added scaling to the connection scene(in mainController)
-added a newConnection method and a method for getting the wrapper anchor pane
#story[782]
9 years ago
David Wu
b60b4b257f
Remove start button from StartController.
...
#story[778]
9 years ago
cbt24
cd55052654
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
9 years ago
cbt24
c1fa760dde
Streamlined clock handling.
...
- Set starting time from network
- Update RaceClock instance to current time from network
#story[782]
9 years ago
Erika Savell
98723b88d4
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
Erika Savell
cfa6ba1c3f
Fixed speed notbeing displayed from AC35 live data
...
- Turns out the AC35 stream gives the speed in the SOG (speed over ground) section, not the boat speed section
#story[782]
9 years ago
Joseph Gardner
618073d04e
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
9 years ago
Joseph Gardner
94ad164a45
Boat table and positions now update. #story[782]
9 years ago
Joseph Gardner
e43353c322
Boat table and positions now update. #story[782]
9 years ago
Erika Savell
d38baa9fc4
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
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]
9 years ago
Erika Savell
23dfc6a6bf
Fixed annotation toggles displaying behind course
...
#story[782]
9 years ago
Erika Savell
eb58581e83
Fixed velocity issues with mock data
...
-Was accidentally sending scaled velocity
#story[778]
9 years ago
Connor Taylor-Brown
8886b5db05
Fixed RegattaXMLTest.
...
#story[782]
9 years ago
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]
9 years ago
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]
9 years ago
Connor Taylor-Brown
0e1bf64177
Fixed boat track rendering (points were added before boat position set)
...
#story[782]
9 years ago
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]
9 years ago
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]
9 years ago
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]
9 years ago
cbt24
ad58407021
Began work on ConnectionController for selecting active hosts on startup via GUI.
...
#story[782]
9 years ago
cbt24
577dea2a56
Fixed time zone label on RaceController.
...
#story[782]
9 years ago
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]
9 years ago
Erika Savell
42ad1f78fc
Added heading to boatlocation messages
...
#story[778]
9 years ago
Erika Savell
f2e0eec212
Fixed date time parsing problem
...
#story[778]
9 years ago
Erika Savell
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
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]
9 years ago
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]
9 years ago
Fan-Wu Yang
04366c2e4c
Fixed small Merge issue
...
- Deleted a unfinished statement that caused hte build to fail
#story[782]
9 years ago
Fan-Wu Yang
0fc1da4090
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
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]
9 years ago
Joseph Gardner
18e9234240
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
9 years ago
Joseph Gardner
f0943d232a
Date formatting now supports both old and new formatting and dnf has been added to boat. #story[782]
9 years ago
cbt24
e40bb6c4cb
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
...
# Conflicts:
# visualiser/src/main/java/seng302/VisualiserInput.java
9 years ago
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]
9 years ago
Erika Savell
4b485fe5ca
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
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]
9 years ago
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]
9 years ago
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
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
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
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