143 Commits (e2f9a710aaa953eac31eb591c0019676f9555893)

Author	SHA1	Message	Date
Erika Savell	944da81946	Test that boat velocities are being scaled correctly added ... #story[16] #implement	9 years ago
Erika Savell	4c7295998b	Added scaler variable to mulitply the race clock and the boats' velocities by ... - Races take roughly 15 mins realtime with a slowest boat of ~20 knots. Therefore scale by 3 for a 5 min race, and 15 for a 1 min race #story[16] #implement	9 years ago
Erika Savell	4c82a4594e	Added a small test for the timer function ... -More needed once scaling is in effect #test #story[16]	9 years ago
Erika Savell	1c6bed7f37	Tests for the Race class added ... -Mostly to do with checking positions and updating correctly #test #story 9	9 years ago
Erika Savell	271c0dec80	Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9	9 years ago
Erika Savell	df8b711cf5	Tests for BoatInRace, imported Mockito ... #test #story[24]	9 years ago
Erika Savell	288324ace6	Back to string properties ... -Listeners were not working with getting values from existing properties #refactor #story[15]	9 years ago
Fan-Wu Yang	8fac6ad23b	Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9	9 years ago
Fan-Wu Yang	a77f4883f3	Create Resource XML ... - Created Race XML file which contains the perameters of the bermuda race for AC35	9 years ago
Erika Savell	7e2804215b	Methods for calculating heading (instead of azimuth) added ... - Azimuth is necessary for geodetic calculator but is between -180 and 180 - Headings need to be displayed from 0 to 360 so conversions methods were necessary #implement #sory[24]	9 years ago
Erika Savell	71995accfb	Refactored BoatInRace currentLegName property ... -Removed current leg name as current leg was already being stored so it was redundant #refactor #story[15]	9 years ago
Erika Savell	393fae2ec4	Tests for calculating leg distance and updating boat positions added ... #story[9] #test	9 years ago
Erika Savell	74a9b1499c	Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9	9 years ago
Erika Savell	0387bdc597	Tests for genreating new coordinate added ... #test #story[9]	9 years ago
Connor Taylor-Brown	26f7b94e13	Fixed finish order ... - Added test to check order is determined by velocity - Modified Race class to allow for unit testing #story[15]	9 years ago
cbt24	05fe402fd0	Merge remote-tracking branch 'origin/story9' into story9 ... # Conflicts: # src/main/java/seng302/Model/ResizableRaceCanvas.java	9 years ago
David Wu	13c5c12db3	Added table column to display speed of each boat ... -BoatInRace now has a column to called boatSpeedColumn that displays boat #story [17] #pair[fwy13, zwu18]	9 years ago
cbt24	c8fcada427	Fixed sort order for boats in race ... - Sort boats by leg number (preserves order when boats enter shared leg) #story [19]	9 years ago
David Wu	4efab9091d	Merge remote-tracking branch 'origin/story9' into story9 ... # Conflicts: # src/main/java/seng302/Model/Boat.java	9 years ago
David Wu	293f63ca8b	Added abbreviations to each boat ... -BoatInRace now takes extra parameter "abbrev" #story [18]	9 years ago
Fan-Wu Yang	419fa8e9fe	Fixed merge conflicts ... - Fixed Merge conflicts with boats #merge	9 years ago
David Wu	b5496b07de	Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9	9 years ago
David Wu	98c5c46569	Implemented displayText to display boat name and speed with mark ... -method takes in boat name, boat speed and coordinates #story [18, 19]	9 years ago
Erika Savell	7778e7d2b1	Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9	9 years ago
Erika Savell	a9601eb760	Switched latitude/longitude around ... We were using latitude on the x plane and longitude on the y plane #story[9] #fix	9 years ago
Fan-Wu Yang	15fd24203d	Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9	9 years ago
Fan-Wu Yang	d97802e06c	Refactored the refreshTable into propeties that listen. ... - Added currentLegName as a String Property - Refactored Name of the Boat as a StringProperty #story[15]	9 years ago
David Wu	c33ce60e71	Changed labels for timer ... -preRace countdown now has text saying "Time until race starts:" -Timer during race now says "Race clock:" #story [16]	9 years ago
David Wu	1842b8f0b2	Merge remote-tracking branch 'origin/story9' into story9 ... # Conflicts: # src/main/java/seng302/Model/Race.java	9 years ago
David Wu	946b9d0a72	Implement countdown clock ... -Added method countdownTimer() that countdowns from the current time to an selected time -Method is called in run (in Race) before the simulatedRace -Private integer PRERACE_TIME is used to set time before the race begins #story [16]	9 years ago
Fan-Wu Yang	12a9205ded	Implemented Table Refresh Function ... - Made refreshTable() in RaceController that refresh the boatInfoTable - Made checkPosition() in Race call controller.refreshTable() - Result is that the table now updates #story [15]	9 years ago
Erika Savell	3afa13d24b	Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9	9 years ago
Erika Savell	66445a91a1	Loaded official AC35 competitors ... - Competitors pulled from americascup.com - Added to a list of boats in Constants class, and this list is read by RaceController #story[9] #implement	9 years ago
David Wu	e04fdc79c9	Merge remote-tracking branch 'origin/story9' into story9 ... # Conflicts: # .idea/compiler.xml # .idea/misc.xml	9 years ago
David Wu	ca966e6c7b	Implement race clock ... -Added label to fxml racepane.fxml -Added calcTime method to calculate time elapsed -Added updateTime method in Race to update label text -Added setTimer in RaceController to update label text #story [16] #pair [fwy13, zwu18]	9 years ago
Erika Savell	d0d4316bac	Boat race finishes when all boats have crossed the line ... - Added a boolean flag 'finished' to BoatInRace #implement #story[9]	9 years ago
Erika	3dd343eb94	Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9	9 years ago
Erika	195ee10473	Added two test boats to race ... #story[9] #implement	9 years ago
Fan-Wu Yang	3f55a45362	Documented RaceMap ... - Added Constructor Documentation for RaceMap #documentation	9 years ago
Fan-Wu Yang	dffd77f7a7	Filled in missing documentation. ... - Added Documentation for all Classes. #documentation	9 years ago
Erika	cf5de5962a	Loaded the rest of the legs of the bermuda course in as an example race ... #story[9] #implement	9 years ago
Fan-Wu Yang	91861eb5cb	Refactored BoatinRace to observable list ... - Changed starting Boats into ObservableList from array - stopped checkPosition in Race abstract class from updating the table as everytime as it is checked by a listener - Changed array methods .length to .size() and [i] to .get() to reflect the type change. #refactor #story[9]	9 years ago
Erika	192178760e	Boat moves between legs and finishes ... - Have hard coded in first two legs -Possibly found problem with lat and longitude coordinate system being switched #story[9]	9 years ago
Erika	8ae540a6b9	Switched bearing calculation from formula to using the geodectic calcultor -this abstracts a lot of the complexity -more accurate heading, and it is return as an azimuth rather than bearing making lat and long calculations easier #story[9]	9 years ago
Erika Savell	05c7af4abf	Implemented redrawing boat with each loop ... - Not complete. New gps coordinate needs work around bearing -> azimuth conversion #implement #story[9]	9 years ago
Erika Savell	e6e59e2df9	Changed POM file to recognise project as team-7 ... -We had two project names, 'app' and 'team-7', which was causing problems with maven #fix #story9	9 years ago
cbt24	92c0011f80	Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9	9 years ago
cbt24	b25389f212	Implemented list of boats in order of last feature passed. ... - Update controller every time boats pass a mark - Cleared info table to force update #story [15]	9 years ago
Fan-Wu Yang	b15edd49d6	Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9 ... # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.	9 years ago
Fan-Wu Yang	15829628f2	Fixed Map ... - Changed GPS Coordinate so that latitude and longitude were on the correct orientation - Map is now centered. #fix	9 years ago
Erika Savell	1284cac68e	Importing geotools library to calculate next coordinate for boat ... -Currently getting ClassDefNotFound error - I think one of th elibraries dependencies is visible and compile time not runtime #story[9] #implement	9 years ago
David Wu	b3b200fb02	Fixed arrow not resizing with resizable canvas ... #story [14]	9 years ago
David Wu	8bb2558b7e	Timer is now in race loop ... -Timer is currently printing out -Later will implement so that it is displayed on gui #story [16]	9 years ago
Fan-Wu Yang	3751ee2488	Fixed arrow Direction, and Canvas ... - Canvas will not longer not fill the entire screen - Canvas will redraw when resized larger - Arrow Rotation no longer rotates the entire map. #fix	9 years ago
cbt24	85f4117666	Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story13 ... # Conflicts: # src/main/java/seng302/Controllers/RaceController.java	9 years ago
cbt24	456925c4c6	Implemented table view for finishing list ... - Added auto-numbered placing, team name, and last mark columns - Added dummy 'Finish' mark to race - Added callback for race to update controller #story [13]	9 years ago
Erika Savell	2811a09784	Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9	9 years ago
Fan-Wu Yang	bc4701ef32	Fixed Canvas not filling screen issue ... - Created ResizableRaceCanvas Class - Moved all draw functions to ResizableRaceCanvas #fix	9 years ago
cbt24	d393766027	Partially completed story 13	9 years ago
David Wu	ddbb77a610	Arrow is now movable around the canvas ... -Arrow method is changed to take coordinates and an angle -Arrow will now be drawn around the coordinate #story [14]	9 years ago
Erika Savell	b82ded6014	Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9	9 years ago
Erika Savell	8090108b12	Began implementing function to calculate boat's new coordinates ... -Using haversine function -current values being produced are too small #implement #story[9]	9 years ago
Fan-Wu Yang	43c84cb677	Added draw ability to draw arrow on the canvas ... - displayArrow() function created - rotate() function created. #story [14] #pair[fwy13, zwu18]	9 years ago
Erika Savell	2551dd7362	Added single test to debug race process	9 years ago
Erika Savell	dbbfece149	Fixed resources issue	9 years ago
Erika Savell	6f509e25ea	Implementing the boats movement throught a race ... -Not complete! Still need to create function to calculate new coordinates -Doesn't run because of problems with resource folder #refactor	9 years ago
Erika Savell	b73fee2cb5	Rewriting code to work with the transplanted loop ... - Event has been replaced by leg, which holds the start and end coordinates, and total distance needed to pass it. - The boats coordinates will be recalculated at each run through of the loop - Not worrying about randomised race for now. #refactor	9 years ago
Erika Savell	54d4ea2d03	Merge remote-tracking branch 'origin/story9' into mergePacedLoop ... # Conflicts: # .idea/compiler.xml # .idea/misc.xml	9 years ago
Fan-Wu Yang	ffaed5ef47	Implemented Finish Line ... -Altered others drawing to utilise drawLine in RaceMap -Added Finish Line -Rescaled Canvas (To be fixed in the future). #story[11]	9 years ago
David Wu	ec03ec9be9	Merge remote-tracking branch 'origin/story9' into story9 ... # Conflicts: # src/main/java/seng302/Controllers/RaceController.java	9 years ago
David Wu	b4baba8c15	Implemented display a gate as a line ... -method created to add a line to canvas -added points for mark, north gate, and south gate #story [12]	9 years ago
Fan-Wu Yang	5108c0eaf5	Implemented Finish Line to show ... - shows a dark red line with 2 thickness - shows two rectangles at the ends of each line #story [11]	9 years ago
cbt24	6c3b7ccee7	Implemented start line in RaceController ... - Added coordinates as given in Story 10 - Displayed start line - Marked line ends with circles #story [10]	9 years ago
cbt24	6ca26d5bb1	Implemented race map usage by JavaFX controller ... - Renamed Map to RaceMap - Fixed RaceMap.convertGPS bug - Defined canvas coordinates in terms of map GPS #story [9] #pair [cbt24,fwy13,zwu18]	9 years ago
Fan-Wu Yang	0729ae719d	Implemented Display a Boat as a circle. ... - created displayBoat function which will display a circle at a Coordinate. #story[9] #pair[cbt24, fwy13]	9 years ago
cbt24	fbb3094da8	Implemented GPS coordinate to screen coordinate conversion ... - Created Coordinate class with getters - Created Map class - Created convertGPS method in Map #story [9], #pair [cbt24,fwy13]	9 years ago
Erika Savell	41cdf09dc2	Started merging team 8 paced loop into team 7 codebase. ... -No running! Syntax errors and not done merging -Just pushing so David can pull changes #pair[zwu18, esa46]	9 years ago
Fan-Wu Yang	a7c64dc401	Implemented base UI and abstract controller for parent coupling ... -Added Controller abstract class that all JavaFX controllers are to be a child of. -Added MainController in case in the future we need a menu. -Added mainpane.fxml as a base pane that we can mount the future menu on. -Added RaceController so where the race will be made and displayed. -Added racepane.fxml which includes a Canvas and a tableview -Added loadPane() function to the mainApp which will swap the pane the app is currently on. #story[9]	9 years ago
Fan-Wu Yang	3ac93ae1e5	Documentation and Refactor ... - Changed Race to an abstract class - Protected and privated certain variables - Wrote Javadocs for the classes and functions - Moved generate race from RandomisedRace and ConstantVelocityRace to the abstract Race class - Added string checking exception for Scanner for whether to run in 1 minute or 5 minutes #pair[fwy13, cbt24]	10 years ago
Fan-Wu Yang	2d777b8903	Implemented user input ... - Changed it from launching the program with args setting to with Scanner. - Changed field 'factor' to 'timescale' in Race class #story [5] #pair[fwy13, cbt24]	10 years ago
Connor Taylor-Brown	1a9cf5bdda	Allow users to choose timescale of race playback. Playback is ~1 min by default, real-time selected with command line variable '-5'. Rescaled race marker positions to distances appropriate for a ~5 minute race.	10 years ago
Connor Taylor-Brown	b1f588248b	Display list of finishers after race ends.	10 years ago
Fan-Wu Yang	2db4beadcb	Boats now display knots, also the racecouse has been modified to reflect the AC35 racecourse via linear coordinates.	10 years ago
Fan-Wu Yang	f62c4dcb3d	Added Display of all Boats participating in the race, and a message to seperate this and the events in the console.	10 years ago
cbt24	377683ef8c	Displayed information for all boats.	10 years ago
Fan-Wu Yang	00bd194361	Added heading from each event that the boat is heading towards.	10 years ago
cbt24	7c0d9203a5	Boats pass marks at times according to boat speed and distance of mark from start.	10 years ago
Fan-Wu Yang	4f6ab7b4bc	Added simulation of a race with randomised time events. This is reported in time order and shown in the console which is displayed as "Boat passed Mark at 60 (seconds)"	10 years ago
cbt24	2148c1e06d	Added mark and gate events to race	10 years ago
Fan-Wu Yang	02cc98b0b6	Story 3 complete added all AC35 Teams into the program.	10 years ago
Connor Benjamin Alexander Taylor Brown	987dcdac01	Display order of boats per event	10 years ago
Fan-Wu Yang	21487340ab	Story 1 completion, Added Boat and Event classes. The program displays two boats New Zealand and America.	10 years ago
SENG302	9649f67863	initial commit	11 years ago