671d62aeb1
Added Important and Partial Annotations and other refactors and documentation.
...
- Important, Partial, Hidden, Visible are all radiobuttons
- Fixed bug where the Visualiser would end the race before the last boat had finished
- Refactored the visualiser and the mock to use the race finished status message
- Added and Changed many Javadocs
#story[877]
9 years ago
b065b8d9c7
Merged Mock49 and fixed bugs
...
- Error where mock would not read in the files when running from the jar.
- Error where the AC35 stream now no longer sends us packets with information that is set for 0 for boat location.
#story[881] #pair[fwy13, esa46
9 years ago
7bfb6bb968
Merge remote-tracking branch 'origin/49Mock' into Story49Vis
...
# Conflicts:
# visualiser/src/test/java/seng302/Model/RaceXMLTest.java
9 years ago
f011b4117e
Added and removed javadoc tests that were making errors in the code, #story[881]
9 years ago
3570e1283f
Deleted Race class
...
- Delete dependency on Race class from Streamed Race as there is no need for extention after the split of Visualiser and Mock.
#story[881]
9 years ago
493932b93f
Merged with visualiser side of mark boats
...
#story[881]
9 years ago
0ed02962a1
Merge branch 'Story49Vis' into 49Mock
...
# Conflicts:
# visualiser/src/main/java/seng302/Mock/StreamedCourseXMLReader.java
# visualiser/src/main/java/seng302/Model/CompoundMark.java
# visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java
# visualiser/src/main/java/seng302/VisualiserInput.java
9 years ago
d294ee7994
Deleted redundant and deprecated code (Visualiser)
...
- References to deprecated objects replaced
- Deprecated Constants class removed
- general redundant code deleted
9 years ago
045e69a637
Deleted and Fixed some redundant code
...
- Deleted some unused functions
- Fixed NullPointerException for Marks
#story[881] #pair[fwy13,jam339]
9 years ago
9e19ddb1f4
Story 49 Marks move with boat location.
...
- Commented out blocking array as it was unecessary
- Added Observable list for markers to the race canvas
- Added SourceId's to Marker
- Added updating Markers from the Streamed Race loop.
#story[881] #pair[fwy13, jam339]
9 years ago
69cd44bda8
Reads data from boat XML file
...
- Creates marks for building CompoundMarks (formerly Markers)
- Rearranged Boat constructor and removed velocity
#story[782]
9 years ago
43757b34d1
General code tidy up (Visualiser)
...
- access modifiers adjusted
- unused declarations removed
- spelling fixes
- removed redundant code
9 years ago
2d983eccfd
General code tidy up
...
- access modifiers adjusted
- unused declarations removed
- spelling fixes
- removed redundant code
9 years ago
e1ba2ae5b6
Now reads course wind direction from the live stream, so the wind arrow now changes when the wind changes. #story[882]
9 years ago
61ecdc2269
Merge branch 'submission' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into submission
...
# Conflicts:
# visualiser/src/main/java/seng302/Controllers/MainController.java
# visualiser/src/main/java/seng302/Controllers/StartController.java
# visualiser/src/main/java/seng302/Model/Race.java
9 years ago
61afe8d608
Created finish view to see when a race finishes.
...
-Implemented FinishController
-Fixed mock not sending Finish race status.
#Story[782]
9 years ago
c038010bd2
Draws track for racing boats only to reduce information clutter.
...
- Add track point only when boat status is "Racing"
#story[782]
9 years ago
cc824aa89a
Removed unnecessary countdownTimer from Race in visualiser module
...
- Run method now calls simulateRace directly
#story[782]
9 years ago
a6adfb4960
Refactored RaceClock to act as central source of time and duration information throughout visualiser.
...
- StartController and RaceController use same RaceClock instance
- RaceClock updates automatically as Runnable for consistent operation
- Duration between starting and current time is now an observable property of RaceClock
#story[782]
9 years ago
12e457824d
fix for issue #5 gate lines
...
-removed drawing of lines between the marks as only the start and finish line should have a line drawn
#story[782]
9 years ago
862391d7ef
Canvas Layer Created
...
- Canvas is created via layering.
- Resizable canvas is now a seperate abstract class
#story[782]
9 years ago
e409c8752c
Fix for now - Need to change
9 years ago
62ecd40967
fixed all java doc errors
...
#story[782]
9 years ago
43fb0df5be
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
874953f763
Fixed issue win ResizableRaceCanvas
...
- Issue where the boat position may mess up if it is called before the server has sent us information about hte location.
#story[782]
9 years ago
618073d04e
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
9 years ago
e43353c322
Boat table and positions now update. #story[782]
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
eb58581e83
Fixed velocity issues with mock data
...
-Was accidentally sending scaled velocity
#story[778]
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
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
ad58407021
Began work on ConnectionController for selecting active hosts on startup via GUI.
...
#story[782]
9 years ago
f2e0eec212
Fixed date time parsing problem
...
#story[778]
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
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
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
8117e11ff2
Merge branch 'NetworkedVisualiser' into splitIntoTwoModules
...
# Conflicts:
# visualiser/src/main/java/seng302/VisualiserInput.java
9 years ago
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
3f748bfdb6
Removed BoatInRace from shared model, refactored
...
#story[778]
9 years ago
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
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
3d284c4a2b
Merge branch 'splitIntoTwoModules' into visualiserAndDataLink
...
# Conflicts:
# visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java
9 years ago
ecebace9f1
Merge branch 'splitIntoTwoModules' of eng-git.canterbury.ac.nz:seng302-2017/team-7 into splitIntoTwoModules
9 years ago
7f273f8ba0
Fixed time source for visualiser, replacing local time
...
- StreamedCourse now provides start time for clock from XML
#story[782]
9 years ago
02511db2b9
Implemented marker visualisation from XML in ResizableRaceCanvas
...
- Replaced and deprecated Constants
- Added getMarkers to RaceDataSource interface
- Added boundary testing for source data
#story[782]
9 years ago
033198ca2c
Linked the streamedRace course to the visualiser, linked the boats to the visualiser (this needs to be tests) #story[768]
9 years ago
83dfe1a60c
Renamed some directories, optimized imports, general code clean up
...
#story[778]
9 years ago
c328c4f3bc
Linked raceData from new xml formats to current program. Current app now shows the starting list and course boundary. #story[782]
9 years ago
Fan-Wu Yang
Erika Savell
Jessica McAuslin
cbt24
Joseph Gardner
David Wu
hba56
fjc40