224 Commits (90f9ec2b987e64c6f588de4ca15e3ab7890a9ffc)

Author	SHA1	Message	Date
fjc40	466e22437b	Visualiser. The nullptr issues relating to the XML data files appears to be fixed. Essentially, the StartController.startRaceNoScaling() function was being called as soon possible, before it was even ready - setRaceClock either hadn't been called or hadn't finished executing yet, so the StartController.raceClock member was null, causing crashes. ... Also changed the while(visualiserInput.getRaceStatus() == null) loops to an if-then-return early block. They caused the program to freeze if the race data source wasn't sending any race status messages (currently, our mock doesn't send any once the race has finished). #story[782]	9 years ago
fjc40	020c0329b0	Merge remote-tracking branch 'origin/TCPDisconnection' into submission	9 years ago
fjc40	83ce9b99d2	Mockoutput's main loop now pops messages off the message queue, rather than iterating over it like an array, and clearing it (this could have threading issues where the iteration starts (with e.g., 5 messages), as it is sending the messages another one is added, and then it ends up clearing the sent messages, and the unsent message. ... Made a few quick fixes (to be tidied a bit later) to Mock.Race class. It now has this.startTime, instead of the AnimationTimers having their own starTime value. RaceStatus messages are now sent properly (still need a refactor though), so they actually send the race star time - this means that the visualizer using the mock data source displays the correct time instead of (midnight, jan 1, 1970). Removed one of the constructors from RaceStatus - it allowed for constructing and sending essentially invalid RaceStatus messages, and simply wasn't needed. Added a temporary title ("RaceVision - Team 7") to the visualiser - may be worth changing when we decide on a team name. Fixed a bug with the order of operations in visualiser.StartController.countdownTimer(). Calling begin race before hiding panes caused them to never be hidden. Mock.Event. Changed the scaleFactor to 5x for the time being - to easier testing of things like pre-race timers, countdowns, etc... #story[778,782]	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
Fan-Wu Yang	bdf215d0f1	TCP connection at the front menu will no longer bug out if the socket is bugged. ... - Timeout set on connection socket so that the socket will return false after 5 seconds. #story[782]	9 years ago
hba56	12e457824d	fix for issue #5 gate lines ... -removed drawing of lines between the marks as only the start and finish line should have a line drawn #story[782]	9 years ago
Fan-Wu Yang	d52b09e74a	Visualiser Closes All threads on exit now. ... - Added override for exiting the Visualiser which closes all threads: such as the TCP connection. #story[782]	9 years ago
Fan-Wu Yang	a20dafea11	Annotations go on top and boundaries now update ... - Fixed FPS and other annotations being hidden under the map - Fixed boundaries not updating with the visualiser. #story[782]	9 years ago
Fan-Wu Yang	982b47943a	Fixed blocking issue ... - Fixed byte stream error where it would reinitilise every run #story[782]	9 years ago
Fan-Wu Yang	b7f010a2fa	Fixed Network While loops ... - Removed while blocking loops and replaced them with return statements #story[782]	9 years ago
Fan-Wu Yang	565b7adaa2	Merge remote-tracking branch 'origin/race-timer-fixes' into layeredCanvas ... # Conflicts: # visualiser/src/main/java/seng302/Controllers/StartController.java	9 years ago
Fan-Wu Yang	862391d7ef	Canvas Layer Created ... - Canvas is created via layering. - Resizable canvas is now a seperate abstract class #story[782]	9 years ago
cbt24	349bd50094	Everything works, don't ask questions ... #story[782]	9 years ago
Erika Savell	62db7f333c	Frantically cherry-picking commit by commit ... #story[778]	9 years ago
hba56	6888d0bddc	fixed all java doc errors ... #story[782]	9 years ago
hba56	e409c8752c	Fix for now - Need to change	9 years ago
cbt24	89ba0f278d	Fixed StartController countdown ... - Removed obsolete timer related code - Consistently use RaceClock throughout StartController #story[782]	9 years ago
cbt24	17afd9f775	Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules ... # Conflicts: # visualiser/src/main/java/seng302/Controllers/StartController.java	9 years ago
cbt24	336a15d1a2	Fixed StartController countdown ... - Removed obsolete timer related code - Consistently use RaceClock throughout StartController #story[782]	9 years ago
hba56	1f8941e37c	Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules	9 years ago
hba56	ccd90b91d7	Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules	9 years ago
hba56	62ecd40967	fixed all java doc errors ... #story[782]	9 years ago
David Wu	545ef7aa7f	Fix lobby not entering race when race status is "started". ... -Race was previously stuck in lobby screen when race status was not 2. #Story[782]	9 years ago
cbt24	e345f08ad8	Fixed AC35 stream crashing before status sent. ... #story[782]	9 years ago
hba56	aa1d38ca9f	removed import * lines ... #story[782]	9 years ago
David Wu	a07a90dfea	Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules	9 years ago
David Wu	88bb568ec7	Set it so the lobby view switches to race view depending on the race status passed in by the mock. ... -Removed start button in lobby as it should be automatic. -TODO: Synchronize the times across the whole race as they do not matching. #Story[782]	9 years ago
cbt24	099995c41b	Fixed start controller visibility issues. ... #story[782]	9 years ago
hba56	15179a1cdf	Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules	9 years ago
hba56	810c3837c1	adding java doc tags ... #story[782]	9 years ago
Fan-Wu Yang	43fb0df5be	Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules	9 years ago
Fan-Wu Yang	874953f763	Fixed issue win ResizableRaceCanvas ... - Issue where the boat position may mess up if it is called before the server has sent us information about hte location. #story[782]	9 years ago
David Wu	34ef1172ce	Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules	9 years ago
David Wu	bf12f77796	Set it so the lobby view switches to race view depending on the race status passed in by the mock. ... -Removed start button in lobby as it should be automatic. -TODO: Synchronize the times across the whole race as they do not matching. #Story[782]	9 years ago
hba56	db43acf935	Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules	9 years ago
hba56	86db16c83d	updated the connection scene to let a user add their own connection ... -added textfields to the fxml -added scaling to the connection scene(in mainController) -added a newConnection method and a method for getting the wrapper anchor pane #story[782]	9 years ago
David Wu	b60b4b257f	Remove start button from StartController. ... #story[778]	9 years ago
cbt24	cd55052654	Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules	9 years ago
cbt24	c1fa760dde	Streamlined clock handling. ... - Set starting time from network - Update RaceClock instance to current time from network #story[782]	9 years ago
Erika Savell	98723b88d4	Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules	9 years ago
Erika Savell	cfa6ba1c3f	Fixed speed notbeing displayed from AC35 live data ... - Turns out the AC35 stream gives the speed in the SOG (speed over ground) section, not the boat speed section #story[782]	9 years ago
Joseph Gardner	618073d04e	Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules	9 years ago
Joseph Gardner	94ad164a45	Boat table and positions now update. #story[782]	9 years ago
Joseph Gardner	e43353c322	Boat table and positions now update. #story[782]	9 years ago
Erika Savell	d38baa9fc4	Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules	9 years ago
cbt24	09483fff2c	Added blocking loop to wait ... - waits for the InputStream to be populated for at least 15 bytes of size before reading in case of header size error potentially crashing the program. #story[782]	9 years ago
Erika Savell	23dfc6a6bf	Fixed annotation toggles displaying behind course ... #story[782]	9 years ago
Erika Savell	eb58581e83	Fixed velocity issues with mock data ... -Was accidentally sending scaled velocity #story[778]	9 years ago
Connor Taylor-Brown	8886b5db05	Fixed RegattaXMLTest. ... #story[782]	9 years ago
Connor Taylor-Brown	7d81fc810c	Display name of race in lobby. ... - Moved Regatta properties and accessors to RegattaXMLReader - StartController update now tolerates any permutation of types of XML messages #story[782]	9 years ago
Connor Taylor-Brown	1723d0c27f	Fixed scaling of wakes (note issues with velocity data) ... - Official stream provides speeds of 0 kn - Mock provides speeds that do not correlate with motion #story[782]	9 years ago
Connor Taylor-Brown	0e1bf64177	Fixed boat track rendering (points were added before boat position set) ... #story[782]	9 years ago
Connor Taylor-Brown	e7008ab6db	Fixed race playback issue, removed obsolete detail from UI. ... - Removed race scaling options - Refactored start screen timer formatting for clarity - Removed incomplete countdownTimer override in Streamed Race #story[782]	9 years ago
Connor Taylor-Brown	5a92dd68f5	Fixed build and interface problems. ... - Ignore online host test (fails on CI) - Disable connect button on startup to prevent bad socket #story[782]	9 years ago
Connor Taylor-Brown	ac4fbda848	Added connection screen to allow users to select available hosts from a preconfigured list. ... - Added ConnectionController for initial client setup - Added RaceConnection class for socket data and checking - Configures StartController with a socket drawn from a host table #story[782]	9 years ago
cbt24	ad58407021	Began work on ConnectionController for selecting active hosts on startup via GUI. ... #story[782]	9 years ago
cbt24	577dea2a56	Fixed time zone label on RaceController. ... #story[782]	9 years ago
Erika Savell	08f203a0f8	Added race statuses for before the race has started. 3 min -> 1 min is warning, 1 min -> 0 min is preparatory. ... -Boat locations (spread across start line) are also broad casted #story[778]	9 years ago
Erika Savell	42ad1f78fc	Added heading to boatlocation messages ... #story[778]	9 years ago
Erika Savell	f2e0eec212	Fixed date time parsing problem ... #story[778]	9 years ago
Erika Savell	7d1f4209e4	Got mock data being used by visualiser. ... - Issue with zonedTimeDate not parsing - Fixed race crashing once one boat finished #story[778]	9 years ago
Fan-Wu Yang	84bb4fdb8f	Fixed merge issue ... - Strange Issue where there was a null pointer from convertGPS however it has resolved itself may crop in the future htough. #story[782]	9 years ago
Fan-Wu Yang	5444b872bd	Fixed GPs Coordinates as well as got Boats to display ... - Fixed GPS conversion number being wrong (extra 1) - Fixed Boats displaying as the boat = null (cough Joseph) was stopping it from working as well as track is broken. #story[782]	9 years ago
Fan-Wu Yang	04366c2e4c	Fixed small Merge issue ... - Deleted a unfinished statement that caused hte build to fail #story[782]	9 years ago
Fan-Wu Yang	0fc1da4090	Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules	9 years ago
Fan-Wu Yang	560af8c21d	Added more data types to Visualiser Input that can be take from InputStream ... -Added AverageWind -Added CourseWinds -Added MarkRounding -Added RaceStartStatus #story[782]	9 years ago
Joseph Gardner	18e9234240	Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules	9 years ago
Joseph Gardner	f0943d232a	Date formatting now supports both old and new formatting and dnf has been added to boat. #story[782]	9 years ago
cbt24	e40bb6c4cb	Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules ... # Conflicts: # visualiser/src/main/java/seng302/VisualiserInput.java	9 years ago
cbt24	2e7527b325	Update boat position according to boat location messages in StreamedRace ... - Added StreamedRace constructor accepting VisualiserInput - Modified VisualiserInput constructor to accept Socket - Refactored controller setup of Race #story[782]	9 years ago
Erika Savell	4b485fe5ca	Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules	9 years ago
Erika Savell	060db182a8	Minor tweaks to get streaming from mock working ... - Key point there being boats, raceand regatta xml files are being read from mock #story[778]	9 years ago
Fan-Wu Yang	2c414d3061	Added way to get the Race Status and Boat Status' ... - Added getters in Visualiser Input - Added Hashmap for boat status messages #story[782]	9 years ago
Erika Savell	0ef96258ad	Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules	9 years ago
Joseph Gardner	2a2fe6de59	Race clock now works and the setup for the racestart now checks if the tag has "Start" or "Time". #story[782]	9 years ago
Erika Savell	185c65e54d	Editing MockOutput to send actual generated boat/race/regatta xmls ... - Was previously sending from a static source file #story[778]	9 years ago
hba56	8bbea28cab	refactored the boat message to not use boats ... #story[778]	9 years ago
Joseph Gardner	8117e11ff2	Merge branch 'NetworkedVisualiser' into splitIntoTwoModules ... # Conflicts: # visualiser/src/main/java/seng302/VisualiserInput.java	9 years ago
Joseph Gardner	41a94495aa	Changed the XML reader to take an InputStream rather than InputSource- this has changed everything that used an InputSource to use an InputStream. Made the XML Readers actually read after they received a new InputStream. Changed it so the table updates when the boats in the race change. #pair[jjg64, cbt24] #story[782]	9 years ago
cbt24	3f42d56502	Merge remote-tracking branch 'remotes/origin/splitIntoTwoModules' into NetworkedVisualiser ... # Conflicts: # visualiser/src/main/java/seng302/VisualiserInput.java	9 years ago
cbt24	b1db9ee5be	Merge remote-tracking branch 'remotes/origin/splitIntoTwoModules' into NetworkedVisualiser ... # Conflicts: # visualiser/src/main/java/seng302/VisualiserInput.java	9 years ago
cbt24	ccbe467090	Synchronised GUI with VisualiserInput thread. ... - Made StreamedCourse extend Observable - Initialised StartController after data pulled from network - Moved VisualiserInput to visualiser module - Deleted Networking subpackage from visualiser module #story[782]	9 years ago
Erika Savell	e927242707	Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules	9 years ago
Erika Savell	3f748bfdb6	Removed BoatInRace from shared model, refactored ... #story[778]	9 years ago
Joseph Gardner	10dd066302	Removed error checking within XML readers and ensured XML readers fail. Did this so an XML reader is not made with an invalid file. #story[782]	9 years ago
Connor Taylor-Brown	06e65c2cd2	Generate StreamedCourse from VisualiserInput ... - Allow Race to get boat location messages (added last commit) - Removed faulty import statement (this commit) #story[782]	9 years ago
Connor Taylor-Brown	68a8f64fd3	Generate StreamedCourse from VisualiserInput ... #story[782]	9 years ago
Joseph Gardner	bbd725d069	Merge	9 years ago
Joseph Gardner	d977d3f146	Merge branch 'visualiserAndDataLink' into splitIntoTwoModules ... # Conflicts: # visualiser/src/main/java/seng302/Controllers/RaceController.java # visualiser/src/main/java/seng302/Controllers/StartController.java # visualiser/src/main/java/seng302/Mock/BoatXMLReader.java # visualiser/src/main/java/seng302/Mock/StreamedBoat.java # visualiser/src/main/java/seng302/Mock/StreamedCourse.java # visualiser/src/main/java/seng302/Mock/StreamedRace.java # visualiser/src/main/java/seng302/Model/BoatInRace.java # visualiser/src/main/java/seng302/Model/ConstantVelocityRace.java # visualiser/src/main/java/seng302/Model/Race.java # visualiser/src/main/java/seng302/RaceXMLReader.java # visualiser/src/test/java/seng302/Model/ConstantVelocityRaceTest.java	9 years ago
Joseph Gardner	39d3cc7c28	Removed boats being able to store colour, this is now down the in the ResizableRaceCanvas. #refactor #story[782]	9 years ago
Joseph Gardner	f377cf6471	Changed it so Boat can be used as a superclass for StreamedBoat and BoatInRace properly and removed ConstantVelocityRace. Everything that used to use BoatInRace or StreamedBoat now uses it superclass (boat). #pair[jjg64, cbt24] #refactor #story[782]	9 years ago
cbt24	7d35312644	Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules	9 years ago
cbt24	5f3f3770bb	Temporarily ignore out-of-bound race markers in testing. ... #story[758]	9 years ago
Joseph Gardner	3d284c4a2b	Merge branch 'splitIntoTwoModules' into visualiserAndDataLink ... # Conflicts: # visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java	9 years ago
fjc40	ecebace9f1	Merge branch 'splitIntoTwoModules' of eng-git.canterbury.ac.nz:seng302-2017/team-7 into splitIntoTwoModules	9 years ago
Connor Taylor-Brown	7f273f8ba0	Fixed time source for visualiser, replacing local time ... - StreamedCourse now provides start time for clock from XML #story[782]	9 years ago
Connor Taylor-Brown	02511db2b9	Implemented marker visualisation from XML in ResizableRaceCanvas ... - Replaced and deprecated Constants - Added getMarkers to RaceDataSource interface - Added boundary testing for source data #story[782]	9 years ago
Joseph	033198ca2c	Linked the streamedRace course to the visualiser, linked the boats to the visualiser (this needs to be tests) #story[768]	9 years ago
fjc40	06d786d581	Merge remote-tracking branch 'origin/networkingTest' into splitIntoTwoModules ... # Conflicts: # mock/src/main/java/seng302/RaceEventMessages/BoatLocationMessage.java # Selected copy from splitIntoTwoModules.	9 years ago
Erika Savell	83dfe1a60c	Renamed some directories, optimized imports, general code clean up ... #story[778]	9 years ago
Erika Savell	073102d1a3	Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock	9 years ago
Joseph Gardner	c328c4f3bc	Linked raceData from new xml formats to current program. Current app now shows the starting list and course boundary. #story[782]	9 years ago
cbt24	cb40302c13	Merge remote-tracking branch 'remotes/origin/story30_XMLs' into splitIntoTwoModules	9 years ago
cbt24	1653003cf0	Implemented Leg generation from Race.xml format ... - StreamedCourse now utilises StreamedCourseXMLReader as data source #story[758]	9 years ago
Joseph Gardner	84c518f89f	Timer now shows and updates correctly on the start menu. #story[761]	9 years ago
Erika Savell	03f63b2c61	Added boat data xml tests ... #story[778]	9 years ago
Joseph Gardner	26380f2677	Merge branch 'story30_XMLs' into splitIntoTwoModules	9 years ago
Joseph Gardner	e89a269565	initialised time in raceclock (1 line)	9 years ago
Joseph Gardner	a3e87f2c61	Got rid of test using a deprecated method	9 years ago
Joseph Gardner	ea79f47c83	Merge branch 'story30_XMLs' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story30_XMLs	9 years ago
Joseph Gardner	3461a2c0b7	Added the ability to reads boats from both race.xml and boat.xml. Linked the two xmls via the StreamedCource class. #story[782]	9 years ago
cbt24	858db3f45e	Fixed interface implementation for StreamedCourse ... #story[758]	9 years ago
cbt24	a59342a668	Modified RaceClock to support arbitrary start times ... - Amended RaceDataSource interface to require time instead of mark for calculating time. #story[758]	9 years ago
hba56	e9578fc63b	refactored networking code from networkingTest ... #story[778, 782]	9 years ago
hba56	4b5ebbd9e4	refactored networking code from networkingTest branch ... #story[778, 782]	9 years ago
Joseph	22075ee415	Started on the boat XML parser, reads only boat data from the XML and makes a StreamedBoat for each boat in the XML. #story[861]	9 years ago
Joseph Gardner	0d0b9e143f	Worked on XML reader to read a given race.xml in the format for the AC35. Added the ability to read the course limit and race settings #Pair[jjg64, cbt24] #Story[782]	9 years ago
Joseph Gardner	9e3ca68df8	added skeleton for StreamedRace and StreamedCourse #Pair[jjg64, cbt24] #Story[782]	9 years ago
Joseph Gardner	a85bf292d5	new branch for xml readers for the visuliser	9 years ago
Erika Savell	a584400e24	Actually added sub modules this time ... #story[778]	9 years ago