9076606030
Fixed show all annotation not toggling annotations.
...
-Problem found with if statement to fix annotation toggling.
-Sparkline graph x-axis also increased slightly.
#story[878]
9 years ago
2a7f264444
Merge remote-tracking branch 'remotes/origin/sprint4_master' into story36
...
# Conflicts:
# visualiser/src/main/java/seng302/Controllers/RaceController.java
# visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java
#story[878]
9 years ago
aa2f234393
Annotations are now clickable #fix
9 years ago
6a598c8a04
Arrow fxml I forgot to push
9 years ago
139d7b41fb
re added story36 racefxml changes after merge
...
#story[878]
9 years ago
748a516d16
Boats not moving working on fix
...
Merge remote-tracking branch 'remotes/origin/sprint4_master' into story36
# Conflicts:
# mock/src/main/java/seng302/DataInput/XMLReader.java
# visualiser/src/main/java/seng302/Controllers/RaceController.java
# visualiser/src/main/java/seng302/Mock/StreamedRace.java
# visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java
# visualiser/src/main/resources/scenes/race.fxml
#story[878]
9 years ago
06359fb138
Had to changed race to fit the merge
9 years ago
40421e5a83
Merge branch 'sprint4_master' into noDependencyArrow
...
# Conflicts:
# mock/src/main/java/seng302/Model/Race.java
# network/src/main/java/seng302/Networking/Messages/RaceStatus.java
# visualiser/src/main/java/seng302/Controllers/RaceController.java
# visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java
# visualiser/src/main/resources/scenes/race.fxml
9 years ago
c8157f3476
Merge remote-tracking branch 'origin/sprint4_master' into story31.2_alternateTack
...
# Conflicts:
# visualiser/src/main/java/seng302/Mock/StreamedRace.java
# visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java
Resolved.
9 years ago
2242b44398
forgot to remove imports
9 years ago
b678152cf8
Removed breaking dependency and made it so app doesn't need the breaking dependency any more.
9 years ago
b9d696ef12
Sparkline has a set x-axis now to prevent sparkline constantly re-adjusting axis.
...
#story[876]
9 years ago
4b2e90f54b
can now toggle the boats time on and off
...
#story[878]
9 years ago
a24dda2fd8
boats have an annotation beside them that shows time since last mark passed
...
#story[878]
9 years ago
9eb4e3daea
boats now calculate the time since last mark
...
-the raceclock is passed around so that the time can be tracked
-time from start to mark 1 is wrong
#story[878]
9 years ago
de0abf94e0
Mock.Race:
...
Fixed an issue where boats sometimes sailed towards the wind when attempting to turn from bearing just under 360 degrees to a bearing just over 360 degrees.
This required an update to the boundary detection code.
Visualiser:
Appear to have fixed issue where clock didn't display correctly. Previous commit only fixed certain circumstances.
#story[873]
9 years ago
81ed07330b
Fixed the bug where the race clock wasn't visible some of the time.
...
It appears to have been due to a threading/javaFX thread issue with prop1.bind(prop2).
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
c011ccb11b
Did some minor refactoring of Mock module...
...
Added comments/documentation to most classes.
Cleaned up heaps of repeated code, dead code, redundant stuff, etc...
Mock.App:
Now actually exits the program if catastrophic errors occur, rather than silently doing nothing.
Mock.Constants:
Added race prestart and preparatory times.
Removed TEST_VELOCITIES.
Mock.PolarParser:
Now uses Bearing class.
Mock.Angle:
Now implements the Comparable interface.
Also supports .equals.
Mock.Azimuth and Bearing:
Can convert between them easily.
Mock.Boat:
Now uses Bearing, and has some helper functions like setVMG, calculateMetersTravelled(time), moveforwards(distance, time).
Mock.Marker:
Removed. This wasn't really used, and was redundant.
Mock.GPSCoordinate:
Moved a lot of helper GPS related functions into the GPSCoordinate class, instead of being scattered around the codebase.
Mock.Polars:
Polars now uses Bearing.
Mock.VMG:
Now uses Bearing.
Mock.Race:
Added a RaceStatusEnum member.
Added a RaceTypeEnum member.
Now uses Bearing/Azimuth.
Moved the message creation/sending into their own functions.
The RaceStatus updates correctly through out the race (Prestart, Warning, Preparatory, Started, Finished).
Network.RaceStatusEnum:
Added race status enum.
Network.RaceTypeEnum:
Added.
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
60458f0f7a
Merge commit '7990ac9d2ee8c71d50606813e21a0674f442464f' into story31.2_alternateTack.
...
This commit (7990ac9d2e
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
be9f19eae5
Mock.Polars:
...
Finished PolarsTest test cases.
Fixed a number of javadoc errors across the codebase.
#story[873]
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
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
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
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
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
d294ee7994
Deleted redundant and deprecated code (Visualiser)
...
- References to deprecated objects replaced
- Deprecated Constants class removed
- general redundant code deleted
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
David Wu
hba56
Joseph
fjc40
Jessica McAuslin
Fan-Wu Yang
Erika Savell