88 Commits (3a85fad21170782167495a6eeb5b678d39af2859)

Author	SHA1	Message	Date
Jessica McAuslin	cf0adb8511	Fixed JavaDoc, spelling errors, and redundant classes ... - Removed some default templates (eg: created by X) - Wrote JavaDoc for classes that had none - Made JavaDoc more clear for classes - Linked JavaDoc to other classes - Minor spelling errors fixed - BoatInRace and BoatInRaceTest commented out (to be removed) #story[1003]	9 years ago
Jessica McAuslin	6ba1aca074	Annotations moved to its own class ... - Annotations class sets annotations to be displayed - removed annotation implementation from RaceController - deconstructed previous annotation method - fixing RaceController code smells #story[1003]	9 years ago
Jessica McAuslin	c027a0ee6e	Sparkline moved to its own class ... - Sparkline class creates and modifies sparkLine chart - removed sparkline implementation from RaceController - fixing RaceController code smells #story[876, 1003]	9 years ago
Jessica McAuslin	fdeec19b20	Wind Arrow direction fixed ... - arrow shows wind direction as from instead of to - removed old unused displayArrow method - renamed displayFancyArrow to displayWindArrow - removed coordinates parameter not used #story[882, 1003]	9 years ago
fjc40	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.	9 years ago
Erika Savell	5f23f335e5	Added est time annotation to annotations that can be hidden and shown ... #story[875]	9 years ago
Erika Savell	92e5dc4490	Cherrypicked changes allowing vis to display est time from bugged branch to current master. ... #story[875]	9 years ago
Erika Savell	e9f3467d97	Reverted commits pushed to master accidentally ... #story[875]	9 years ago
Erika Savell	f0da2d4fee	Merge remote-tracking branch 'origin/sprint4_master' into 33CherryPick	9 years ago
Erika Savell	230b458e5d	Cherrypicked changes allowing vis to display est time from bugged branch to current master. ... #story[875]	9 years ago
Fan-Wu Yang	22e5996e64	Merge remote-tracking branch 'origin/sprint4_master' into AuditRefactors ... # Conflicts: # visualiser/src/main/java/seng302/VisualiserInput.java	9 years ago
Fan-Wu Yang	a3ccd75f4c	Merge remote-tracking branch 'origin/sprint4_master' into Story877 ... # Conflicts: # mock/src/main/java/seng302/DataInput/BoatXMLReader.java # mock/src/main/java/seng302/DataInput/XMLReader.java # mock/src/main/java/seng302/Model/Boat.java # mock/src/main/java/seng302/Model/CompoundMark.java # mock/src/main/java/seng302/Model/Leg.java # mock/src/main/java/seng302/Model/Mark.java # mock/src/main/java/seng302/Model/Marker.java # mock/src/main/java/seng302/Model/Race.java # mock/src/test/java/seng302/Model/LegTest.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	9 years ago
Fan-Wu Yang	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]	9 years ago
David Wu	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
hba56	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
hba56	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
Joseph Gardner	06359fb138	Had to changed race to fit the merge	9 years ago
Joseph Gardner	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
fjc40	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
Joseph	2242b44398	forgot to remove imports	9 years ago
Joseph	b678152cf8	Removed breaking dependency and made it so app doesn't need the breaking dependency any more.	9 years ago
Fan-Wu Yang	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
hba56	4b2e90f54b	can now toggle the boats time on and off ... #story[878]	9 years ago
hba56	a24dda2fd8	boats have an annotation beside them that shows time since last mark passed ... #story[878]	9 years ago
hba56	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
fjc40	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
Fan-Wu Yang	044d786043	Added Refactors that the Audit suggested ... - Created AC35RaceStatus class - Deleted wait loop into a Thread.sleep() - Deleted Entirely commented out class.... - Deleted duplicate draw that appeared again #story[873]	9 years ago
Joseph Gardner	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
fjc40	60458f0f7a	Merge commit '7990ac9d2ee8c71d50606813e21a0674f442464f' into story31.2_alternateTack. ... This commit (7990ac9d2e) was the commit from master that story49 was merged into. Everything appears to be working. # Conflicts: # mock/src/main/java/seng302/App.java # mock/src/main/java/seng302/Constants.java # mock/src/main/java/seng302/DataInput/RaceXMLReader.java # mock/src/main/java/seng302/DataInput/RegattaXMLReader.java # mock/src/main/java/seng302/Model/Boat.java # mock/src/main/java/seng302/Model/Event.java # mock/src/main/java/seng302/Model/Race.java # mock/src/test/java/seng302/Data/BoatDataTest.java # mock/src/test/java/seng302/Data/RaceDataTest.java # mock/src/test/java/seng302/Model/BoatTest.java # mock/src/test/java/seng302/Model/RaceXMLTest.java # visualiser/src/main/java/seng302/Controllers/StartController.java # visualiser/src/main/java/seng302/RaceXMLReader.java Manually resolved conflicts. :(	9 years ago
fjc40	be9f19eae5	Mock.Polars: ... Finished PolarsTest test cases. Fixed a number of javadoc errors across the codebase. #story[873]	9 years ago
Joseph Gardner	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
Fan-Wu Yang	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
Fan-Wu Yang	7bfb6bb968	Merge remote-tracking branch 'origin/49Mock' into Story49Vis ... # Conflicts: # visualiser/src/test/java/seng302/Model/RaceXMLTest.java	9 years ago
Fan-Wu Yang	f011b4117e	Added and removed javadoc tests that were making errors in the code, #story[881]	9 years ago
Fan-Wu Yang	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
Erika Savell	493932b93f	Merged with visualiser side of mark boats ... #story[881]	9 years ago
Erika Savell	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
Jessica McAuslin	d294ee7994	Deleted redundant and deprecated code (Visualiser) ... - References to deprecated objects replaced - Deprecated Constants class removed - general redundant code deleted	9 years ago
Joseph Gardner	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
Fan-Wu Yang	045e69a637	Deleted and Fixed some redundant code ... - Deleted some unused functions - Fixed NullPointerException for Marks #story[881] #pair[fwy13,jam339]	9 years ago
Fan-Wu Yang	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
cbt24	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
Jessica McAuslin	43757b34d1	General code tidy up (Visualiser) ... - access modifiers adjusted - unused declarations removed - spelling fixes - removed redundant code	9 years ago
Jessica McAuslin	2d983eccfd	General code tidy up ... - access modifiers adjusted - unused declarations removed - spelling fixes - removed redundant code	9 years ago
Joseph Gardner	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
David Wu	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
David Wu	61afe8d608	Created finish view to see when a race finishes. ... -Implemented FinishController -Fixed mock not sending Finish race status. #Story[782]	9 years ago
cbt24	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
cbt24	cc824aa89a	Removed unnecessary countdownTimer from Race in visualiser module ... - Run method now calls simulateRace directly #story[782]	9 years ago
cbt24	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