Commit Graph
42 Commits
Author SHA1 Message Date
hba56 4242d05279 fixed issue with being unable to click through minimap
#story[1295]
2017-09-21 20:34:21 +12:00
Fan-Wu Yang 3a6070a645 Fixed Merge and added back some merge changes #story[1196] 2017-09-12 22:10:13 +12:00
Joseph Gardner 610aa96241 Merge branch 'MapWindRotation' into 'master'
Map wind rotation

Note: we'd like to generate a realistic course layout, that can vary from race to race (but not within a race, for now.) The generated layout must be sent through the API in the format given by the race.xml section of the AC35 Streaming Data Interface Specification. The AC35 Protocol (sections 31.4 and 31.5) specifies the requirements for a course:

*    First leg of the course (from start line to first mark) must be a reaching leg
*    Next legs are windward/leeward, and boats complete either two or three laps of this section
*    Final leg to finish line may be a reaching leg
*    A boat should take around 25 minutes to complete the course in the wind conditions at the start of the race (AC35 protocol, section 31.5)

You should assume that the windward/leeward marks and start/finish lines are always compounds of two marks.

Acceptance criteria:

 *   The layout must be sent over the API in a race.xml message, plus boat location messages for the marks as required, before any other boat location messages are sent.
 *   Each mark must be defined using boat "SourceID"s (see definition of race.xml) so their positions can be adjusted later.
 *   The course must meet the requirements given in the AC35 Protocol.
 *   The course limits should be set to clear all marks by at least several boat-lengths.
 *   The entire race area within the limits must be on the water.

See merge request !22
2017-08-17 13:50:21 +12:00
hwball df2b674b94 update scale for table displaying 2017-08-17 11:51:33 +12:00
Fan-Wu Yang b5e414f97a Made all the model classes extend off the schema xml classes for race, and made xml builder, validator and reader utility class.
#story[1092]
2017-08-14 03:47:42 +12:00
Fan-Wu Yang 8999cddf8b Pre merge commit 2017-08-13 22:16:16 +12:00
Fan-Wu Yang 820898d92c pushed work from school computer to do at home 2017-08-13 16:02:33 +12:00
Fan-Wu Yang 7c6f0931ba Transferring files from my laptop to desktop to work on, may be broken. 2017-08-12 23:18:54 +12:00
Fan-Wu Yang 9f99e21232 Added functionality for more than one visualiser to connect to the mock.
- more than one visualiser can now connect to the mock.
- Created class ConnectionAcceptor that will accept and allocate to each socket
- Issue of sockets connecting after the race starts then disconnecting will use a socket slot.
#story[1010]
2017-07-24 17:27:49 +12:00
fjc40 1cb2829015 Removed some .idea/... files that had been commited ages ago. 2017-07-17 12:25:53 +12:00
Joseph b678152cf8 Removed breaking dependency and made it so app doesn't need the breaking dependency any more. 2017-05-22 11:49:40 +12:00
Fan-Wu Yang c3717b7fc5 Added Classes to help Visualiser
- Added Get Boat GPS Coordinate
- Added Get Heading as Degrees
- Added Get True Wind Angle as Degrees
#story[782]
2017-04-29 18:26:02 +12:00
David Wu 5c89c1aeb7 Implemented functionality to select which annotations to display. Selected annotations can be temporarily saved and then displayed on a button press.
-Added checkboxes to display name, abbreviation, and speed in annotation.
-Changed single titlepane to an accordion.
-Moved all annotation controls to separate titlepane in accordion.
-Added buttons to save and load saved annotation settings.

#story[26]
2017-04-06 16:37:00 +12:00
Fan-Wu Yang 879de9869b Implemented XML Reader
-XMLReader class for generic XML Reading Created
- RaceXML Reader class made specifically for reading races
- RaceController COnstants now replced with XML file
#implement
2017-03-27 02:09:59 +13:00
Erika Savell fda1e0ed61 Renaming all instances of app to team-7 and resetting pom, .idea files etc
#chore
2017-03-20 14:44:13 +13:00
Erika 3dd343eb94 Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9 2017-03-19 23:06:50 +13:00
Erika 195ee10473 Added two test boats to race
#story[9] #implement
2017-03-19 23:05:18 +13:00
Fan-Wu Yang 3f55a45362 Documented RaceMap
- Added Constructor Documentation for RaceMap
#documentation
2017-03-19 22:53:57 +13:00
Erika ccaee9131d Fixing Maven issues
#chore
2017-03-19 22:45:12 +13:00
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]
2017-03-19 21:21:21 +13:00
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] 2017-03-19 13:09:49 +13:00
Erika Savell 05c7af4abf Implemented redrawing boat with each loop
- Not complete. New gps coordinate needs work around bearing -> azimuth conversion

#implement #story[9]
2017-03-17 18:13:48 +13:00
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
2017-03-17 15:54:01 +13:00
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
2017-03-17 13:03:27 +13:00
Fan-Wu Yang 43c84cb677 Added draw ability to draw arrow on the canvas
- displayArrow() function created
- rotate() function created.
#story [14] #pair[fwy13, zwu18]
2017-03-16 16:14:28 +13:00
Erika Savell 2551dd7362 Added single test to debug race process 2017-03-15 22:02:13 +13:00
Erika Savell dbbfece149 Fixed resources issue 2017-03-15 17:14:30 +13:00
Erika Savell 54d4ea2d03 Merge remote-tracking branch 'origin/story9' into mergePacedLoop
# Conflicts:
#	.idea/compiler.xml
#	.idea/misc.xml
2017-03-15 13:50:52 +13:00
Erika Savell 0dc5efd830 Just trying to fix my ide 2017-03-15 13:49:39 +13:00
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]
2017-03-15 11:55:11 +13:00
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]
2017-03-15 11:03:50 +13:00
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]
2017-03-15 02:03:37 +13:00
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]
2017-03-09 16:43:30 +13:00
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]
2017-03-09 16:03:27 +13:00
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. 2017-03-08 15:35:40 +13:00
Fan-Wu Yang 00bd194361 Added heading from each event that the boat is heading towards. 2017-03-06 16:59:09 +13:00
cbt24 7c0d9203a5 Boats pass marks at times according to boat speed and distance of mark from start. 2017-03-06 16:20:20 +13:00
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)" 2017-03-06 15:46:19 +13:00
cbt24 2148c1e06d Added mark and gate events to race 2017-03-03 11:46:52 +13:00
Fan-Wu Yang 02cc98b0b6 Story 3 complete added all AC35 Teams into the program. 2017-03-03 11:38:35 +13:00
Connor Benjamin Alexander Taylor Brown 987dcdac01 Display order of boats per event 2017-03-03 11:34:34 +13:00
Fan-Wu Yang 21487340ab Story 1 completion, Added Boat and Event classes. The program displays two boats New Zealand and America. 2017-03-03 11:02:31 +13:00