Commit Graph

78 Commits

Author SHA1 Message Date
Kusal Ekanayake c73bf7dd3e Started merging received packets from the sample stream and reading lats and lons to move boats from them.
#story[820]
2017-04-26 15:51:15 +12:00
Michael Rausch edc306da22 Created AC35 Streaming server
- Sends heartbeat messages every 5 seconds
- Sends XML at beginning

Tags: #story[29]
2017-04-19 19:05:19 +12:00
William Muir 34872a822b Stripped back codebase to make to create basic model for streaming data
Removed many classes involved with visualisation such as controllers and multiple fxmls. Now there is just one for debugging

Merged in Boat updating pattern from team 27

#story[828]
2017-04-08 17:49:50 +12:00
Haoming Yin 971a3920a3 Fixed race timer to display real race time, and made race time scalable.
#story[445]
2017-03-30 16:12:01 +13:00
Peter f8d3f53158 changed boat speed to a lower value 2017-03-30 14:45:33 +13:00
Peter a95d030817 Controllers and Fxml nicely refactored, tests still broken #story[463] 2017-03-29 14:59:37 +13:00
Peter 4a6978ff79 Fxml refactored, partway through refactoring controllers (app does not run) #story[463] 2017-03-29 12:58:49 +13:00
Zhi You Tan 8bf5455f42 Updated fxml and canvas controller to display a resizable canvas.
#story[377]
2017-03-27 17:05:49 +13:00
Zhi You Tan 48f7e41905 Merge branch 'master' of /home/cosc/student/zyt10/Documents/[SENG302]/team-13 with conflicts. 2017-03-27 16:52:31 +13:00
Peter 6fc55bb82c Added toggle for fps #story[463] 2017-03-27 16:45:02 +13:00
Haoming Yin 304f30ece6 Reformatted and refactored the fileparser to get xml from resource folder
#fix #refactor #story[377] #pair[xyi25, zyt10]
2017-03-24 12:55:11 +13:00
zyt10 e8b1720fee Created a toggle checkbox to show and hide all annotation
#story[477]
2017-03-24 12:15:39 +13:00
Peter 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
Peter 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
Peter 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
Peter 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
Michael Rausch 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
Haoming Yin 42ffd1b1f8 Add rotated wind direction arrow to race view.
#story[422]
2017-03-23 01:10:07 +13:00
Michael Rausch 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
Michael Rausch 039e61def6 Fixed broken JavaFX file #fix 2017-03-22 14:50:28 +13:00
Peter 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
Michael Rausch f46a98fad9 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 2017-03-22 14:39:37 +13:00
Michael Rausch ef098e63d7 Added finishing events #implement and rotated the map by 180 degrees#fix 2017-03-22 12:51:03 +13:00
zyt10 44b5b0b771 Added side pane to GUI and resize to 1280x960
#story[426]
2017-03-22 11:46:39 +13:00
Peter ed577fad6a adding files missed in previous commit 2017-03-20 17:58:40 +13:00
Peter 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
Ryan Tan ffa39e6a9c Changed size of canvas to 720 x 360
#story[377]
2017-03-16 17:40:31 +13:00
Peter 550812d8e1 Currently displaying basic javafx window with canvas. Also changed the file structure a bit.
At this point the javafx is not tied to the old code in any way #story[377]
2017-03-15 18:16:43 +13:00