fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
203 Commits 1 Branch 0 Tags
668758f6f83f94180e811aba0b574a7093c24584
Commit Graph
190 Commits
Author SHA1 Message Date
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
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
 2017-03-17 11:43:30 +13:00
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]
 2017-03-17 11:15:15 +13:00
Erika Savell 2811a09784 Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9 2017-03-17 11:13:27 +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
cbt24 d393766027 Partially completed story 13 2017-03-16 17:44:34 +13:00
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]
 2017-03-16 17:44:24 +13:00
Erika Savell b82ded6014 Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9 2017-03-16 16:40:53 +13:00
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]
 2017-03-16 16:40:34 +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 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
 2017-03-15 16:59:55 +13:00
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
 2017-03-15 15:04: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
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
David Wu ec03ec9be9 Merge remote-tracking branch 'origin/story9' into story9 
# Conflicts:
#	src/main/java/seng302/Controllers/RaceController.java
 2017-03-15 12:36:43 +13:00
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]
 2017-03-15 12:35:14 +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
cbt24 6c3b7ccee7 Implemented start line in RaceController 
- Added coordinates as given in Story 10
- Displayed start line
- Marked line ends with circles
#story [10]
 2017-03-15 12:33:55 +13:00
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]
 2017-03-15 12:19:41 +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
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]
 2017-03-15 11:11:38 +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
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. 2017-03-08 19:00:09 +13:00
Connor Taylor-Brown b1f588248b Display list of finishers after race ends. 2017-03-08 18:23:20 +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
cbt24 377683ef8c Displayed information for all boats. 2017-03-06 17:02:18 +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
SENG302 9649f67863 initial commit 2016-03-01 19:08:07 +13:00