b678152cf8
Removed breaking dependency and made it so app doesn't need the breaking dependency any more.
9 years ago
7d27a098ac
Fixed wind direction code missing due to past merges (?)
...
#story[882]
9 years ago
93347fd7ef
merged master
9 years ago
5d34b49316
Merge branch 'master' into submission
...
# Conflicts:
# mock/src/main/java/seng302/Model/Race.java
# mock/src/test/java/seng302/Model/RaceTest.java
# visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java
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
405f01c900
rearranged dependency order (hopefully this makes the ci download it properly)
9 years ago
a77a58dc66
trying new repo
9 years ago
f272c4ff47
trying new repo
9 years ago
12bff9a1e8
trying new dependency
9 years ago
7bfb6bb968
Merge remote-tracking branch 'origin/49Mock' into Story49Vis
...
# Conflicts:
# visualiser/src/test/java/seng302/Model/RaceXMLTest.java
9 years ago
93c539b68b
mock pom had the name visualiser 🤔
9 years ago
0291726589
Added test for changing wind direction.
...
#story[882]
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
63f7857e2f
Changed dependency version (repository pls download properly)
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
ce5a726153
Adjusted wind direction changing angles to a smaller angle.
...
#story[882]
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
8390b19299
Created methods to initialise and change wind direction throughout race.
...
-Method initialiseWinDir assigns an unsigned short value to wind direction.
-Method changeWindDir randomly changes the wind direction throughout race.
-Issue found regarding showing wind direction.
#story[882]
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
3bc8ad0a07
Arrow is now displayed on screen more vividly, the arrow can be customised to a different colour scheme if needed. #story[882]
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
Joseph
zwu18
Fan-Wu Yang
Erika Savell
Jessica McAuslin
cbt24