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
94e4e853c3
Removed Legs from the race, using coordinates instead
...
Tags: #implement #refactor #test #story[9]
2017-03-16 20:29:17 +13:00
ffa39e6a9c
Changed size of canvas to 720 x 360
...
#story[377]
2017-03-16 17:40:31 +13:00
9e4ae60885
Added a function to draw boat on canvas
...
#story[377]
2017-03-16 17:25: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
abc5df7837
Added unit for boat velocity
...
#fix #story[6]
2017-03-09 15:00:48 +13:00
c1aa38c1b0
Added ability to pass the config file as a command line argument
...
Tags: #implement
2017-03-09 12:41:44 +13:00
8d85557e10
Added tests
...
Tags: #test
2017-03-09 12:22:38 +13:00
d33a88d313
Added docstrings to classes
...
Tags: #docs
2017-03-08 23:02:45 +13:00
d3b71c21e5
Merge branch 'format-and-doc'
2017-03-08 22:57:59 +13:00
d10c6a54f5
Added and fixed docstrings
...
Tags: #docs
2017-03-08 22:53:22 +13:00
0a86dde7e4
Fixed docstrings
...
Tags: #docs
2017-03-08 22:31:05 +13:00
ae80b434f6
Added and fixed docstrings
...
Tags #docs
2017-03-08 22:25:52 +13:00
2d7ee975af
Added docstrings for Marker class
...
Tags: #docs
2017-03-08 14:56:28 +13:00
b0cd7c8c08
Reformatted doctring and import statements
2017-03-08 14:45:06 +13:00
27f9776de8
Fixed typo
...
Tags #fix
2017-03-08 14:28:51 +13:00
0efb18b04d
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13
2017-03-08 14:20:38 +13:00
0ab2e7881f
Fixed fileParser in order to read time scale in decimal
...
- json-simple can read either long or double. Updated getScaleTime to make it capable to read a decimal number.
#fix #story[5]
2017-03-08 14:13:23 +13:00
92556fffca
Fixed incorrect headings and velocity display location
...
- Velocity is now shown in the list of starting boats #fix
- Headings have been corrected
Tags: #fix
2017-03-08 14:11:09 +13:00
2adf39ee43
Merge remote-tracking branch 'origin/master'
2017-03-08 13:33:22 +13:00
2b464d16f9
Fixed some bugs
...
/#pair[hyi25, mra106]
2017-03-08 13:31:44 +13:00
bc6762d2dd
Moved boat velocity to starting list
...
Tags: #fix
2017-03-08 13:28:00 +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
78dea7daac
Added function to generate events for race
...
- added generateEvents() for creating event into a priority queue
- added iterateEvents() to pull out events when time passing
- changed default velocity to 70 just for testing. Pls change it back after testing
#story[5] #implement
2017-03-07 21:30:48 +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
a3c1630e2e
Updated boat class constructor
...
- add a new constructor to accept boat velocity
#story[6]
2017-03-07 20:28:45 +13:00
5c362245a4
Added velocity related methods into Boat class.
...
- added setVelocity() and getVelocity()
#story[6]
2017-03-07 19:34:37 +13:00
6ce9674e64
Added method to calculate distance travelled given velocity
...
- added getDistanceTravelled(velocity) to calculate how far a boat has travelled
- added startTime for calculating time elapse between start point and enquiry point
#story[6]
2017-03-07 00:25:10 +13:00
f2c2f84b4c
Updated App class to read team names
...
- updated app class so that it reads an array of maps containing team names
2017-03-06 22:17:38 +13:00
0e562a38e2
Merge branch 'update-parser' into 'master'
...
Update parser
See merge request !7
2017-03-06 21:51:02 +13:00
85b8047229
Updated FileParser to read team name, boat velocity, and race size.
...
- minor code rearrange for readFile()
- changed getTeam() to read to an array of team maps, where map contains team name and boat velocity
- added getTotalNumberOfTeams() to get the total number of teams in file
- added getRaceSize to get the the number of boat competing in a race
#implement #story[6] #story[8]
2017-03-06 21:44:31 +13:00
9b1d90d2bf
Added a class for the marker, and added documentation
...
- Added documentation for the Race class
- Added a class for the Marker instead of just storing the name of the marker in a string
Tags: #docs #implement #story[4]
2017-03-06 19:31:25 +13:00
zyt10
Haoming Yin
Peter
Michael Rausch
Ryan Tan