1234cbbb1f
Merge branch 'story34_v2' into 'sprint4_master'
...
Story34 v2
See merge request !7
9 years ago
b9d696ef12
Sparkline has a set x-axis now to prevent sparkline constantly re-adjusting axis.
...
#story[876]
9 years ago
ef9d8884d4
Sparkline methods Javadoc'd
...
- createSparkline
- updateSparkline
#story[876]
9 years ago
3f2ad8886e
Fixed FPS issues and beautified sparkline display
...
- set upper and lower bounds for axis height
- formatted Y axis to show/hide necessary info
- reduced some looped actions
- added conditions for the first leg
- all boats start in 'last' place
#story[876]
9 years ago
eba2eb3cd6
Boats no longer change colour during a race and fixed the sparklines for the boats to be in the correct position #story[876]
9 years ago
74d3996f6c
Merge remote-tracking branch 'origin/story34_v2' into story34_v2
...
# Conflicts:
# visualiser/src/main/java/seng302/Controllers/RaceController.java
# visualiser/src/main/java/seng302/Mock/StreamedRace.java
9 years ago
f19a543b68
Changed line appearance and colour.
...
-Line displayed will no longer plot a point every update.
-Line colours are based on the colours displayed in the race.
-Race colours defined in ResizableRaceCanvas have been used for the lines.
-As boats change colour depending on placement (unintended), the lines will also do this.
#story[876]
9 years ago
2e1f8a2e9a
Lowered frequency sparkline updates
...
- sparkline only updates when a boat passes a point
- all lines start in the middle
- slow frame rate issue resolved
#story[876]
9 years ago
f999967cd5
Implemented functionality for sparkline to update throughout race.
...
-Sparkline reads in initial boats in race.
-Sparkline updates throughout the race.
-Sparkline updates are displayed on GUI.
#story[876]
9 years ago
7647a93d7a
Implemented an updating sparkline
...
- sparkline is set with X number of lines
- sparkline height fits X lines
- lines are updated regularly
- size is adjusted relevant to plotted points
#story[876]
9 years ago
7990ac9d2e
Merge branch 'Story49Vis' into 'master'
...
Story49
See merge request !1
9 years ago
c0bc2b2c1e
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
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
a7a065825a
Fixed thread issue on windows
...
- Added a Platform.runLater on the Visualiser loops so that the notifying observers do not try to call it, where it is a non java-fx loop
#story[881]
9 years ago
156e0bfdd5
removed blocking queue that somehow appeared again
...
- Removed blolcking queue from Visualiser Input that had appeared miraculously
#story[881]
9 years ago
294627074d
Commented out throws in the BinaryMessageDecoder for messages we ignore as they were not errors and instead were causing the program to stop if they're received
...
- commented out throw from default, chatter text, yachactioncode, yachteventcode, displaytextmessage states
#story[881]
9 years ago
b2d9e44d03
Deleted Unecessary code
...
- StreamedRace no longer sets the positions of boats
- The Visualiser has blocking queue removed
- The Regatta XML Reader not longer has a variable to the deleted Regatta class
#story[881]
9 years ago
30beef29ba
Deleted Regatta XMl reading that is deprecated
...
- No longer in use XML reader has been deleted
#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
f8c6e500fb
Deleted deprecated Race XML reader
...
- Deleted RaceXMLReader class
- Deleted Corresponding Tests
#story[882]
9 years ago
fb6420524d
Adding a parameter to test command to debug missing library
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
a91bc459f7
Implemented functionality for mock to parse marker boats throughout race.
...
-Added getter to CompoundMark to get the Mark value.
#story[881]
9 years ago
5708db1936
Ignoring all new race tests
...
- Thought they they would be ok bc not calling animation timer directly
- Was mistaken
#story[881]
9 years ago
799e588145
Unignored a couple of GPS tests
...
- The issue was with accuracy. Average of two coords is fine fo two point fairly close together (<1km), but not for very very large distances.
- We only ever use it for small ranges so changed tests to reflect that
#story[881]
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
11f6dee301
Added a number of race tests.
...
- Still unable to get animation timer tests working. May be necessary to make handle() hold nothing but a method call
#story[881]
9 years ago
0bb18c7957
Temporarily ignoring animation tests
...
- The VMs don't have the necessary libraries to run them
#story[881]
9 years ago
892bfd9676
Began on tests for Race class.
...
- Made really good progress using Mockito and calling .handle() on animation timers
#story[881]
9 years ago
fd036c1835
Refactored countdown timer in race class
...
- Also fixed all boats having ame velocity
#story[881]
9 years ago
a35d9cbc5a
Re-refactored Event class
...
#story[881]
9 years ago
e7f84eaf83
Refactored Event Class
...
#story[881]
9 years ago
1a780d6955
Fixed spread starting positions being reset at start of race
...
#story[881]
9 years ago
af3dfbad05
Fixed boats not displayinggit stash
...
- Was gps coordinates being initialised with X and Y switched around
#story[881]
9 years ago
081a7d5666
Attempting to solve boats not apearing problem
...
- Appears to be becaus elat and long are getting switched somewhere
#story[881]
9 years ago
ffa3d530ae
Event takes string and sets time of race
...
- RaceXmlReaders can handle strings now
- Not working with visualiser, gps coords may be worng
#story[881]
9 years ago
91b1773703
Commented out obsolete tests, may be useful if refactored.
...
#story[881]
9 years ago
f31a987787
Reads BoatDataSource into StreamedCourseXMLReader so the latter can function as a single source of static information for the race.
...
- Mock.StreamedCourseXMLReader populates participant and mark list from BoatDataSource
- Added CompoundMarker class to accommodate Mark data from Boat XML
- Had to check for Yacht type in Visualiser.BoatXMLReader
- Added a missing coordinate value to raceTest.xml
- Marker class still exists due to large number of tests, which should be transitioned to CompoundMark
- IMPORTANT: race is no longer functional
#story[881]
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
9902cec688
Added tests for BoatXMLReader
...
- Verifies correct operation on boat and mark reading from boatTest.xml
#story[782]
9 years ago
9aa4183a7c
Merge remote-tracking branch 'origin/49Mock' into 49Mock
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
16d3fe2ef2
Added marker boats with correct gps positions into boats xml read by mock
...
#story[881]
9 years ago
83d6cdbd59
Edited race xml read by mock
...
- It now includes source ids
- Legs are in the correct sequence order for the example race
#story[881]
9 years ago
6e9386f4fb
Switched mock to send out official xmls.
...
- Not reading official xmls yet
#story[881], #pair[cbt24, esa46]
9 years ago
1b6693a19b
Added xml files for mock to read in
...
- In process of switching to reading official xml format instead of our own
#story[881]
9 years ago
Erika Savell
zwu18
Jessica McAuslin
Joseph Gardner
Fan-Wu Yang
cbt24