fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
166 Commits 1 Branch 0 Tags
7790322e048f0de7353ddcc4886bf96c4204d685
Commit Graph
38 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Fan-Wu Yang 7790322e04 Implemented the Time showing on Grid 
- Added Label to scene
- Added Timezone formatting
#story[28] #pair[fwy13,hba56]
 2017-04-06 16:55:43 +12:00
Fan-Wu Yang 71f0085268 Implemented geotimezone from com.github.bfsmith 
- Calculates timezone from mark
#story[28] #pair[fwy13,hba56]
 2017-04-06 16:11:14 +12:00
Fan-Wu Yang 795b411f08 Added some doc strings 
- Added doc strings to RaceXML
- Added a few minor changes to bermuda_AC35.xml
- Changes to the RaceXMLReader Unit Test
 2017-03-31 00:51:08 +13:00
Fan-Wu Yang c105c2d01e Fixed file paths so they work when it becomes an executable 
- Changed file paths for the FXML files
 2017-03-31 00:00:53 +13:00
Fan-Wu Yang 305326881f Merged Boundaries branch 
- Merged Boundaries branch.
#story[22]
 2017-03-29 17:13:52 +13:00
Fan-Wu Yang 461d894ac8 Merge branch 'boundaries' 
# Conflicts:
#	src/main/java/seng302/Controllers/RaceController.java
#	src/main/java/seng302/Model/ResizableRaceCanvas.java
#	src/main/resources/scenes/racepane.fxml
 2017-03-29 16:53:28 +13:00
Fan-Wu Yang 6ffe3d02a3 Fixed and merged heading-visualisation 
- Fixed the boats not appearing at the starting line.
- Merged with master
#story[24]
 2017-03-29 16:46:23 +13:00
Fan-Wu Yang edd9c2a48d Merge remote-tracking branch 'origin/heading-visualisation' 
# Conflicts:
#	src/main/java/seng302/Controllers/RaceController.java
#	src/main/java/seng302/Model/Boat.java
#	src/main/java/seng302/Model/Race.java
#	src/main/java/seng302/Model/ResizableRaceCanvas.java
#	src/main/resources/scenes/racepane.fxml
 2017-03-29 14:36:24 +13:00
Fan-Wu Yang eb97bd6aef Implemented resizable map and boundary scaling. 
- Map can now be downsized
- The boundaries are auto margined and fit in the center of the canvas.
#implement
 2017-03-29 13:29:53 +13:00
Fan-Wu Yang 224c16a713 Implemented Map Boundaries in XML 
- RaceXMLReader will calculate the top left latitude and longitude and the bottom right latitude and longitude, and make the layout the map accordingly.
- The Boundaries are draw on the Race Canvas in Aqua.
#story[22]
 2017-03-29 03:18:47 +13: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
Fan-Wu Yang 8fac6ad23b Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9 2017-03-22 12:20:31 +13:00
Fan-Wu Yang a77f4883f3 Create Resource XML 
- Created Race XML file which contains the perameters of the bermuda race for AC35
 2017-03-22 12:20:20 +13:00
Fan-Wu Yang 419fa8e9fe Fixed merge conflicts 
- Fixed Merge conflicts with boats
#merge
 2017-03-20 16:56:43 +13:00
Fan-Wu Yang 15fd24203d Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9 2017-03-20 16:38:40 +13:00
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]
 2017-03-20 16:38:35 +13:00
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]
 2017-03-20 16:11:02 +13:00
Fan-Wu Yang 3f55a45362 Documented RaceMap 
- Added Constructor Documentation for RaceMap
#documentation
 2017-03-19 22:53:57 +13:00
Fan-Wu Yang 4e94da5e49 Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9 2017-03-19 22:49:07 +13:00
Fan-Wu Yang dffd77f7a7 Filled in missing documentation. 
- Added Documentation for all Classes.
#documentation
 2017-03-19 22:48:58 +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
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.
 2017-03-17 13:13:23 +13:00
Fan-Wu Yang 15829628f2 Fixed Map 
- Changed GPS Coordinate so that latitude and longitude were on the correct orientation
- Map is now centered.
#fix
 2017-03-17 13:10:29 +13:00
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
 2017-03-17 11:52:54 +13:00
Fan-Wu Yang bc4701ef32 Fixed Canvas not filling screen issue 
- Created ResizableRaceCanvas Class
- Moved all draw functions to ResizableRaceCanvas
#fix
 2017-03-17 10:30:40 +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
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]
 2017-03-15 13:27:58 +13:00
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]
 2017-03-15 12:33:56 +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
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 2db4beadcb Boats now display knots, also the racecouse has been modified to reflect the AC35 racecourse via linear coordinates. 2017-03-08 16:24:51 +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
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
Fan-Wu Yang 02cc98b0b6 Story 3 complete added all AC35 Teams into the program. 2017-03-03 11:38:35 +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