fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
83 Commits 1 Branch 0 Tags
13c5c12db3d084beb6c4a73cde625182e55c86f8
Commit Graph
11 Commits
Author SHA1 Message Date
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]
 2017-03-20 17:27:09 +13:00
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]
 2017-03-20 15:33:37 +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
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
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 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
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 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