d39aacba83
RaceController now uses new parsers & deleted OldApp and OldFileParser
...
#story[377]
2017-03-24 11:34:34 +13:00
798fe4da0e
Changed FPS to 30
2017-03-24 11:15:46 +13:00
59a4a74a97
changed boatPositionController to also add velocity to the boat ordering shown in the side bar #story[447]
2017-03-23 22:50:04 +13:00
590ef557d3
fixed bugs from last commit and updated some tests #story[426]
2017-03-23 22:24:42 +13:00
7bc5c8f8a4
Merge remote-tracking branch 'refs/remotes/origin/master'
...
Conflicts:
src/main/java/seng302/controllers/CanvasController.java
src/main/java/seng302/models/Boat.java
2017-03-23 22:17:45 +13:00
bf8244ce49
tried to test BoatPositionController but as it's connected to the fxml I am unsure if it is possible to test (test code is commented out) #story[426]
2017-03-23 22:04:25 +13:00
a860cc0ec1
connected up all the javafx components and got team positions displaying on the sidebar #story[426]
2017-03-23 21:21:54 +13:00
bb8c681270
added a markpos value to event for use in displaying the team positions #story[426]
2017-03-23 21:19:39 +13:00
403aaa76ae
Display team name and speed beside boat
...
- Also slowed down the AnimationTimer
- Removed the need to scale the canvas
Tags: #implement #story[18] #story[19]
2017-03-23 18:04:00 +13:00
8578bc4a5b
changed the "sea" color of the canvas to be actually drawn on the canvas rather than the pane behind #story[377]
2017-03-23 16:18:42 +13:00
ed004d1423
Merge branch 'master'
...
Conflicts:
src/main/java/seng302/controllers/CanvasController.java
src/main/resources/RaceView.fxml
2017-03-23 15:16:11 +13:00
24f9607e5a
Added tests for the RaceTimerController #test #story[16]
2017-03-23 14:18:27 +13:00
2384013139
Created race timer
...
- Race starts when timer reaches 1 second
- Race waits 10 seconds before it starts
Tags: #implement #story[16]
2017-03-23 14:11:12 +13:00
42ffd1b1f8
Add rotated wind direction arrow to race view.
...
#story[422]
2017-03-23 01:10:07 +13:00
a2d06909c9
Finished config parser to read race info from external xml file
...
- created config parser unit test.
- modified config.xml file
- write unit test for config parser
#story[422]
2017-03-23 00:21:18 +13:00
9e22eac4d8
Added the race results to the RaceResultController. Also fixed some bugs
...
- Fixed a bug where the race results would be out of order.
- Changed the colour of the start and finish gates
- Added the race results to the RaceResultController and updated view
Tags: #fix #implement #story[13, 10, 11]
2017-03-22 22:30:49 +13:00
a41f2e4bde
Changed marks from circles to squares #fix
2017-03-22 15:10:57 +13:00
039e61def6
Fixed broken JavaFX file #fix
2017-03-22 14:50:28 +13:00
54d329c5cf
changed raceView javafx structure and added an example of how the handle function works with keyframes #story[426]
2017-03-22 14:44:40 +13:00
f46a98fad9
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13
2017-03-22 14:39:37 +13:00
f6ea2953e9
Changed lat/long for gates to midpoint and added colours for the marks
...
Tags: #fix #implement #story[10,11]
2017-03-22 14:28:51 +13:00
7591a79323
Fixed course rotation #fix
2017-03-22 14:05:55 +13:00
c12760b70a
Inserted missing } #fix
2017-03-22 12:53:42 +13:00
a526b0d65a
Rotated map by 180 degrees #fix
2017-03-22 12:52:43 +13:00
ef098e63d7
Added finishing events #implement and rotated the map by 180 degrees#fix
2017-03-22 12:51:03 +13:00
29a0b23670
Reformatted double value lat and lon to final double VIEW_CORNER_LAT and VIEW_CORNER_LON
2017-03-22 12:03:46 +13:00
44b5b0b771
Added side pane to GUI and resize to 1280x960
...
#story[426]
2017-03-22 11:46:39 +13:00
3d4d5a3dab
Fixed x and y coordinates #fix #story[9]
2017-03-20 21:13:30 +13:00
ed577fad6a
adding files missed in previous commit
2017-03-20 17:58:40 +13:00
ae61260665
created a javafx view for the race finish and created a rough wireframe for the controller to change the view from race to finish #story[414]
2017-03-20 17:56:14 +13:00
0e4bb0f942
Changed getMark to getThisMark. Added start point to KeyFrame. Race now starts from start point and ends at finish point
...
#story[377]
2017-03-20 17:34:24 +13:00
ee34e5028f
Reformatted and refactored the canvas controller
...
#fix #refactor #story[377]
2017-03-20 17:23:33 +13:00
3b8dd11758
Added drawBoats for use in animation timer, also fixed gate marks only drawing one mark #story[378]
2017-03-20 16:11:04 +13:00
cc04e2dd6d
Fixed boat colour, was in the wrong constructor
...
#story[377]
2017-03-20 16:03:07 +13:00
b88cf6a101
Merge branch 'refactor-file-parser'
2017-03-18 21:38:38 +13:00
d10985f890
Finished team parser to read team info from external xml file
...
- created team parser unit test
- refactored team parser functions
#fix #refactor #implement
2017-03-18 21:32:12 +13:00
c08504293b
Created canvas and race controllers to display boats on canvas and modified marks and parsers to support them.
...
#story[377] #pair[zyt10, ptg19]
2017-03-17 18:21:11 +13:00
4bc49da10d
Merge remote-tracking branch 'origin/master'
2017-03-17 16:18:24 +13:00
683f4ba94e
Mostly got boats going to marks on the canvas (code currently broken) #story[377] #pair[zyt10, ptg19]
2017-03-17 16:18:01 +13:00
8fd06c84ac
Merged the refactored mark related class with course parser.
...
#fix #refactor #story[9] #story[10] #story[11]
2017-03-17 15:56:37 +13:00
23b163e6c1
Merge branch 'master' into refactor-file-parser
...
# Conflicts:
# src/main/java/seng302/models/GateMark.java
2017-03-17 15:44:16 +13:00
6383b9a6f8
Deleted the old Mark and GateMark files
2017-03-17 15:26:38 +13:00
0b3ebf229f
Refactor mark related classes.
...
- Mark is an abstract class which containing its name and type
- Single Mark is a sub class of Mark which containing only one GPS location
- Gate Mark is a sub class of Mark which containing two Single Marks
#refactor #fix #story[10] #story[11] #story[12]
2017-03-17 15:21:04 +13:00
d6fe155d4d
Changed distance calculation to use latitude and longitude
...
Tags: #fix
2017-03-17 11:08:35 +13:00
121f996a43
created config, teams xml file, and teamsParser class
...
#implement
2017-03-17 01:04:10 +13:00
44d4f25413
Implemented Color Enum & boat will call function from enum to get next color. Using static colour cycling for now.
...
#story[377]
2017-03-17 00:57:50 +13:00
16abfcffda
Created course parser as a subclass of file parser
...
- refactored file parser as an abstract class
- created course parser to parse course xml file
#implement #fix #refactor #story[9] #story[10]
2017-03-17 00:54:43 +13:00
e7ba9d962d
Deleted and modified previous sprint parser to cater the sprint2’s new requirement
...
- also added new method for GateMark
#story[9] #story[10] #fix
2017-03-17 00:53:08 +13:00
b7631c0b46
Create unit test for course parser, and modified course xml file
...
#implement #fix #story[10] #story[9]
2017-03-17 00:51:16 +13:00
94e4e853c3
Removed Legs from the race, using coordinates instead
...
Tags: #implement #refactor #test #story[9]
2017-03-16 20:29:17 +13:00
zyt10
Michael Rausch
Peter
Haoming Yin
Ryan Tan