46037b5aea
Refactored Boat class to better fit the MVC model by moving all GUI parts to BoatPolygon. Changed the way animation works so that it will work with a constantly updated set of lats and lons.
...
TODO - Change Mark class to no longer store XY pixel data.
TODO - Add in a timer force updates boat position if a packet has not been recieved for a while.
#story30b #story30c #implement #refactor
2017-04-24 23:06:30 +12:00
b5129c5c80
Moved the canvas drawing implementation from team27's codebase to team13's.
...
#story30b
2017-04-20 19:06:32 +12:00
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
dde4b2fcba
gitlab ci test (passing)
2017-04-04 19:15:41 +12:00
623600a8a9
gitlab ci test (failing)
2017-04-04 19:15:01 +12:00
7022be1979
Fixed unit test which failed due to the change of configure file.
...
#story[445]
2017-03-30 16:16:30 +13:00
b252797e9b
Removed test case that failed when the config file was changed
2017-03-30 14:48:47 +13:00
c758afe3e3
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13
2017-03-30 14:46:22 +13:00
f8d3f53158
changed boat speed to a lower value
2017-03-30 14:45:33 +13:00
4a8672a20b
Updated race timer test to use new controller
...
Tags:story[455]
2017-03-30 14:44:57 +13:00
5d6060c690
Merge remote-tracking branch 'origin/master' into controller-refacto
2017-03-29 15:01:38 +13:00
a95d030817
Controllers and Fxml nicely refactored, tests still broken #story[463]
2017-03-29 14:59:37 +13:00
ffa84c6e87
Removed testNextColor for now as the test seems to be broken..
2017-03-29 13:28:49 +13:00
4a6978ff79
Fxml refactored, partway through refactoring controllers (app does not run) #story[463]
2017-03-29 12:58:49 +13:00
2c125d4ce0
Fixed test case for the boat heading #story[466]
2017-03-28 19:25:04 +13:00
e6ace5fb2f
Changed the team names to their abbreviated versions
...
- Also halved the size of the wake lines
- Updated tests to support the shorter team names
- Wake lines are now hidden with the other annotations
Tags: #story[23,21]
2017-03-24 20:56:52 +13:00
550ab59231
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13
2017-03-24 20:45:49 +13:00
74c81eb7b3
Removed a character that was accidentally inserted
2017-03-24 20:37:32 +13:00
c33586e7f5
Changed test to work with the new getHeading method, and removed an unused import that was causing tests to fail
...
- There was a com.sun import that we were no longer using that was causing issues
Tags: story[466]
2017-03-24 20:33:53 +13:00
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
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
590ef557d3
fixed bugs from last commit and updated some tests #story[426]
2017-03-23 22:24:42 +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
bb8c681270
added a markpos value to event for use in displaying the team positions #story[426]
2017-03-23 21:19:39 +13:00
24f9607e5a
Added tests for the RaceTimerController #test #story[16]
2017-03-23 14:18:27 +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
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
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
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
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
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
11c5e1e9ba
Added gate mark and refactored marker to mark #story[378]
2017-03-16 16:11:48 +13:00
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
debe2c0cca
Fixed documentation for FileParserTest and LegTest
...
#document #fix
2017-03-09 14:52:13 +13:00
8d85557e10
Added tests
...
Tags: #test
2017-03-09 12:22:38 +13:00
b0cd7c8c08
Reformatted doctring and import statements
2017-03-08 14:45:06 +13:00
245fbc75c2
Fixed file parser test
2017-03-08 14:25:41 +13:00
ab1445f1c2
Race events now display the boats heading and direction
...
- The boats velocity is being read from the config file
- The event text is now being printed when the leg starts #fix
Tags: #story[7] #implement
2017-03-08 12:31:31 +13:00
17fbb1212d
Added Event class and junit test
...
- event class contains the time of specific event, related team/boat and even location eg. leg.
#implement #story[5]
2017-03-07 20:30:23 +13:00
0e562a38e2
Merge branch 'update-parser' into 'master'
...
Update parser
See merge request !7
2017-03-06 21:51:02 +13:00
c9b0942e07
Updated unit test for future FileParser
...
- changed valid file test case
#test
2017-03-06 21:39:53 +13:00
90aed14ddc
Updated test file for unit test
...
- added race size represented the number of teams who would compete in a race
- changed teams to an array containing maps of each team within team name and boat velocity
#test #story[8] #story[6]
2017-03-06 21:38:25 +13:00
8c0cc67ae3
Add tests for the Leg class
...
Tags: #test #story[4]
2017-03-06 19:29:47 +13:00
Calum
William Muir
Michael Rausch
Haoming Yin
Peter
zyt10
Ryan Tan