Commit Graph
21 Commits
Author SHA1 Message Date
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
David Wu 073bcaa4a3 Added checkbox to change visibility of annotation to GUI
-Checkbox is used to toggle the text displayed beside boats
-Race Clock is now scaled using the scale factor

#story [23]
2017-03-26 18:39:23 +13:00
David Wu 0df8235a28 Added TitledPane and Checkbox to GUI.
-Checkbox is used to control the visibility of the FPS counter

#story [20]
2017-03-26 17:40:09 +13:00
Erika Savell bd86690e85 Filled in javadoc, optimised imports, rearranged code
#refactor #story[16]
2017-03-25 21:49:43 +13:00
Erika Savell f5ba7c95c8 Fixing merge and resulting failing tests
#fix #story[16]
2017-03-25 19:01:03 +13:00
Erika Savell ac558746a0 Cleaning up gui
-In future, users could load xml file before selecting scaling, and then get estimates of time different scaling would take

#implement #sotry[16]
2017-03-25 18:18:01 +13:00
Erika Savell 7a13885064 Users can select between 1 minute, 5 minute, or non scaled races
- Current implementation is a bit messy I think, with 3 different start race methods for the three options
- Considering letting users choose from a dropdown, so that the chosen value can be easily found from a single method for starting the race

#implement #story[16]
2017-03-24 18:50:19 +13:00
Erika Savell 0fde0cd9b5 Created new start screen and implemented switching from start to race map
#implement #story[16]
2017-03-24 13:03:03 +13:00
Erika Savell 9c22fe76bd Adjusting existing layout to prepare for creating new pane
- Adjusted default height and width to be a larger display
- Increased percentage space the side table takes up because the team name, mark etc were very cramped

#implement #story[16]:
2017-03-24 12:24:56 +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
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