0d5bede349
java doc fixes to fix the ci build problems #story[1003]
hba562017-07-21 10:25:36 +12:00
08f74f608f
trying to see if ci works while logged in to the ienabler when ssh #story[1003]
hba562017-07-21 09:32:04 +12:00
38f3fe16a0
Revert "Added travis_wait to test CI build order."
fjc402017-07-20 12:30:54 +12:00
350ec41beb
Added travis_wait to test CI build order.
fjc402017-07-20 12:29:20 +12:00
ba21d81c91
Reordered modules in the main pom.xml file. Dunno :(
fjc402017-07-20 12:10:38 +12:00
5cddaaed8e
mock.app.App now tells mock.app.Event that the xml file strings are XMLFileType.Contents.
fjc402017-07-20 01:01:29 +12:00
4bcfc01ceb
shared.dataInput: Added shared.enums.XMLFileType, which is used to specify if a string contains a file path or file contents. Updated the XML readers to use it.
fjc402017-07-19 23:18:52 +12:00
10e80bca05
Moved mock.app.App#readFile(...) to shared.dataInput.XMLReader#readXMLFileToString(...).
fjc402017-07-19 22:30:21 +12:00
d0c6b5f716
Moved mock.model and mock.dataInput tests into the racevisionGame.tests.mock package.
fjc402017-07-19 19:25:16 +12:00
db42b3f1bb
changed css to be day and night #story[1003]
hba562017-07-18 23:19:00 +12:00
1cb2829015
Removed some .idea/... files that had been commited ages ago.
fjc402017-07-17 12:25:53 +12:00
a0a7db9f0f
update the css to include a black on black option and update the colour of the water to better fit with the other colours #story[1003]
hba562017-07-17 10:36:23 +12:00
01625a7bb8
added an icon for the window and basic red black and white style sheet #story[1003]
hba562017-07-15 23:24:29 +12:00
fb37831ec0
added an icon for the window and basic red black and white style sheet #story[1003]
hba562017-07-15 23:14:00 +12:00
f9b2a62f8d
The Controller now takes in key presses. - Each key is now registered in an Abstract Factory which takes in an action to perform. - Comments are added behind each function in to give some indication of how it could be extended/modified in the future. #story[1006]
Fan-Wu Yang2017-07-15 20:38:18 +12:00
054816c15a
fix for the pom files #story[1006]
hba562017-07-14 17:07:10 +12:00
b7e2427528
fix for the pom files #story[1006]
hba562017-07-14 16:48:28 +12:00
fef8540b10
fix for the pom files #story[1006]
hba562017-07-12 12:09:34 +12:00
83ac3e4e33
updated the game controller to use the visualiser as the scene #story[1006]
hba562017-07-12 11:59:59 +12:00
46150bd3c6
Actually commited the previous pom.xml changes.
fjc402017-07-11 03:21:10 +12:00
2c5380f5d8
Removed old network files.
fjc402017-07-11 03:20:49 +12:00
2a82298571
Removed the old mock/network/visualiser files.
fjc402017-07-11 03:13:32 +12:00
3a85fad211
Currently, mock/pom.xml and visualiser/pom.xml build racevisionGame mock and visualiser. Now using jetbrains nullable/notnull instead of sun (was causing maven issues).
fjc402017-07-11 03:10:29 +12:00
cab9bf9574
RaceClock no has run(), or is runnable, as it wasn't needed. Refactored Sparkline a bit. Now listens to our data model instead of being manually updated. Boat position labels don't work currently, though. VisualiserRace now also tracks the order in which boats pass each leg.
fjc402017-07-11 02:04:53 +12:00
6ae23f039b
Added basic structure for the controller module of the game application #story[1006]
hba562017-07-11 00:36:49 +12:00
7d3cf6ee80
I had accidentally broken the raceXML construction - fixed it. Fixed a few issues where boat didn't have nextMark/previousMark times under certain circumstances. LatestMessages wasn't actually notifying properly - fixed. The various XML readers now treat a string constructor as containing file contents, not file name - this was how it was mostly already used. Fixed some issues in RaceXMLReader, including where element.getChildNodes() was used instead of element.getElementsByName(...). Boat: changes speed to a doubleProperty. Changed leg to a Property<Leg>. Race.lastFps is now an IntegerProperty. Added breaks to the case statements in VisualiserInput. Whoops. ResizableRaceCanvas now handles drawing the race boundary. Tidied up code a bit. Removed ResizableRaceMap.
fjc402017-07-10 08:35:43 +12:00
abbbf70146
Refactored Race, MockRace, and VisualiserRace to use RaceClock instead of keeping their own timers. Moved FPS tracking to Race class, so both VisualiserRace and MockRace can monitor their FPS. LatestMessages is now observable. It notifies observers when an XMLMessage is received. Boat now has StringProperty for name and country/abbreviation. Moved the MockRace timescale value to Constants.RaceTimeScale. This is passed in to MockRace on construction. Tidied up StartController. Copied the visualiser's resources into the resources folder. Refactored RaceClock. Added comments. Tidied code a bit. Moved to shared.model.
fjc402017-07-08 23:21:29 +12:00
f057ad58b7
LatestMessages can hold MarkRounding messages. It also holds XMLMessage for each message type. MockOutput now uses LatestMessages for xml messages. Moved xml message encoding into RaceVisionByteEncoder. Removed XMLMessageEncoder. Moved XML message sub types into an enumeration (XMLMessageType). XMLMessage can now be queried for its attributes (like timestamp, length, etc...).
fjc402017-07-07 02:05:21 +12:00
8e18ad62ca
Added LatestMessages to network.Messages. This is an object that encapsulates the latest up to date set of race messages. Race stores a reference to it. MockRace writes to it, and eventually, VisualiserRace will read from it. Updated MockRace, MockOutput, Event to use it.
fjc402017-07-06 16:02:11 +12:00
3a0b81834f
Refactored mock.Event to work with MockRace. Fixed the networking imports. Race now keeps a reference to its Race, Boat, and Regatta data sources. VisualiserRace can be provided with new Race/Boat/Regatta data sources during runtime. Currently it updates boundary and legs with a new RaceDataSource, and marker boats with a new BoatDataSource.
fjc402017-07-06 15:25:00 +12:00
8d36d89570
Refactored and moved RaceXMLReader to shared/dataInput. RaceStatus can provide windspeed in knots in addition to mm/sec. RaceDataSource now provides a list of participating boat sourceIDs instead of boats. Added a RegattaDataSource interface. Angle, Azimuth, Bearing and mutable - careful. Boat has positionInRace. CompoundMarks have an ID and name. Marks can be moved (setPosition(...)).
fjc402017-07-06 01:30:55 +12:00
7f027c8cc5
Refactored and moved XMLReader, RaceDataSource, BoatXMLReader, BoatDataSource, RegattaXMLReader to shared/dataInput.
fjc402017-07-04 17:50:43 +12:00
d0d63ca236
Copied remaining files into appropriate package. These need to be refactored and put into the shared package.
fjc402017-07-04 16:22:25 +12:00
bbbb1f2eb0
Renamed sharedModel module to racevisionGame - this is intended to be our single module program. Moved Boat/MockBoat/VisualiserBoat into it. Moved Polars, polarParser, VMG, and polar exception. Moved the networking stuff into it. Moved angle, azimuth, bearing into it. Moved gpscoordinate into it. Moved mark/compoundMark into it. Moved leg into it. Moved trackpoint into it.
fjc402017-07-04 15:53:17 +12:00
93c1199392
Merge branch 'longMethodClassSmells' into 'master'
Fraser Cope2017-07-04 14:29:55 +12:00
512169010c
Fixed Annotations and bound windarrow - Wind arrow for the bermuda race is bound between 215 and 235 degrees - annotations will not correctly highlight what they are showing #story[877] #story[882]
Fan-Wu Yang2017-05-25 14:41:34 +12:00
fdc03275fe
Merge remote-tracking branch 'origin/sprint4_master' into fix_time_since_last_marker
fjc402017-05-25 14:42:07 +12:00
234748d056
Visualiser: Fixed the issue where a boat's time since last mark started counting from when the race screen loaded. It now starts counting when the race actually starts.
fjc402017-05-25 14:41:51 +12:00
b9b03305b0
Fixed Annotations and bound windarrow - Wind arrow for the bermuda race is bound between 215 and 235 degrees - annotations will not correctly highlight what they are showing #story[877] story[882]
Fan-Wu Yang2017-05-25 14:34:29 +12:00
12acaeb9ea
Merge branch 'story36_boundary_fix_attempt_2' into 'sprint4_master'
Joseph Gardner2017-05-25 14:33:52 +12:00
e5ae2543f8
removed unneeded print statement and fixed incorrect comment (minor (2 lines))
Joseph Gardner2017-05-25 14:30:12 +12:00
1bd9fdd931
Merge remote-tracking branch 'origin/sprint4_master' into story36_boundary_fix_attempt_2
fjc402017-05-25 14:04:06 +12:00
f71e175f80
Mock.Race: The race start time was current + prestart period + 1 second. It is now current + prestart + 1 minute.
fjc402017-05-25 13:53:27 +12:00
b58c3b98ed
Integrated changes from story33-estimateTime branch - Used refactored bearing methods - Sent accurate current time to visualiser
cbt242017-05-25 12:53:40 +12:00
8273cd5167
Merge branch 'sprint4_master' into story36_boundary_fix_attempt_2
fjc402017-05-25 12:49:18 +12:00
5d8380be8d
Mock.Race: Boats now tack only every 15 seconds (see tackPeriod variable). Also doesn't attempt to calculate VMG (expensive operation) if it won't be used.
fjc402017-05-25 12:35:57 +12:00
5f23f335e5
Added est time annotation to annotations that can be hidden and shown
Erika Savell2017-05-25 02:29:56 +12:00
0a022e275e
Added checkbox for est time to next mark to gui
Erika Savell2017-05-25 02:04:42 +12:00
92e5dc4490
Cherrypicked changes allowing vis to display est time from bugged branch to current master.
Erika Savell2017-05-25 01:14:54 +12:00
8a674bcaec
Merge branch 'sprint4_master' into Story877
Fan-Wu Yang2017-05-24 22:30:23 +12:00
e3c3def184
Fixed capitalisation that was pointed out by Erika in the Tests - LegTest.java ORIGIN_Compound_MARKER is now ORIGIN_COMPOUND_MARKER #story[877]
Fan-Wu Yang2017-05-24 22:29:51 +12:00
debc5d9c38
Added adjustments that PO requested - hide will not deselect all checkboxes - visible will now show all checkboxes that were deselected when hidden - partial will now select abbreviation and speed only - when another checkbox is selected/deselected from partial,hidden or important it will immediately jump to visible radio button. #story[877]
Fan-Wu Yang2017-05-24 22:24:37 +12:00
7f3500202f
Mock.Polars: Moved some code into isBearingInsideInterval and isFlippedInterval utility functions.
fjc402017-05-24 19:20:30 +12:00
adbb8f0a64
Merge branch 'story36' into 'sprint4_master'
Hamish Ball2017-05-24 18:05:04 +12:00
dc7aa359d7
boat time now saves #story[878]
hba562017-05-24 17:59:02 +12:00
824a5ed3a2
Merge branch 'boat_boundarty_fix' into story36
fjc402017-05-23 18:35:39 +12:00
9076606030
Fixed show all annotation not toggling annotations. -Problem found with if statement to fix annotation toggling. -Sparkline graph x-axis also increased slightly.
David Wu2017-05-23 17:49:00 +12:00
2ac932b4f3
fix to keep boats in the bounds #story[#874, 873]
hba562017-05-23 15:17:19 +12:00
db3f4a5b2b
fix to keep boats in the bounds #story[#874, 873]
hba562017-05-23 14:56:07 +12:00
6a74b5fe36
Merge remote-tracking branch 'remotes/origin/sprint4_master' into story36
hba562017-05-23 13:19:48 +12:00
2a7f264444
Merge remote-tracking branch 'remotes/origin/sprint4_master' into story36
hba562017-05-23 13:19:11 +12:00
e9ecdf5cbc
Merge branch 'noDependencyArrow' into 'sprint4_master'
Jessica McAuslin2017-05-23 12:52:51 +12:00
aa2f234393
Annotations are now clickable #fix
Joseph2017-05-23 12:22:30 +12:00
6a598c8a04
Arrow fxml I forgot to push
Joseph2017-05-23 11:17:54 +12:00
7c9b9c6426
Merge commit message was wrong, i wasn't watching the start up time -small fix to java doc #story[878]
hba562017-05-22 17:56:47 +12:00
139d7b41fb
re added story36 racefxml changes after merge #story[878]
hba562017-05-22 17:46:51 +12:00
748a516d16
Boats not moving working on fix Merge remote-tracking branch 'remotes/origin/sprint4_master' into story36
hba562017-05-22 17:45:45 +12:00
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]
Fan-Wu Yang2017-05-15 15:58:21 +12:00
hba56
fjc40
Fan-Wu Yang
Jessica McAuslin
Connor Taylor Brown
Joseph Gardner
Erika Savell
David Wu