fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
556 Commits 1 Branch 0 Tags
2242b44398368ec94c2ba79b63b14cbfc93f7def
Commit Graph
62 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
zwu18 7d27a098ac Fixed wind direction code missing due to past merges (?) 
#story[882]
 2017-05-17 18:13:20 +12:00
zwu18 0291726589 Added test for changing wind direction. 
#story[882]
 2017-05-15 02:10:44 +12:00
zwu18 a91bc459f7 Implemented functionality for mock to parse marker boats throughout race. 
-Added getter to CompoundMark to get the Mark value.

#story[881]
 2017-05-12 02:10:17 +12:00
zwu18 ce5a726153 Adjusted wind direction changing angles to a smaller angle. 
#story[882]
 2017-05-10 22:20:00 +12:00
zwu18 8390b19299 Created methods to initialise and change wind direction throughout race. 
-Method initialiseWinDir assigns an unsigned short value to wind direction.
-Method changeWindDir randomly changes the wind direction throughout race.
-Issue found regarding showing wind direction.

#story[882]
 2017-05-10 21:37:18 +12:00
David Wu 61ecdc2269 Merge branch 'submission' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into submission 
# Conflicts:
#	visualiser/src/main/java/seng302/Controllers/MainController.java
#	visualiser/src/main/java/seng302/Controllers/StartController.java
#	visualiser/src/main/java/seng302/Model/Race.java
 2017-05-06 20:23:01 +12:00
David Wu 61afe8d608 Created finish view to see when a race finishes. 
-Implemented FinishController
-Fixed mock not sending Finish race status.

#Story[782]
 2017-05-06 20:14:10 +12:00
David Wu a95a0c2543 Added documentation for multiple classes. 
#Story[782]
 2017-05-06 16:39:15 +12:00
David Wu 545ef7aa7f Fix lobby not entering race when race status is "started". 
-Race was previously stuck in lobby screen when race status was not 2.

#Story[782]
 2017-05-04 13:36:39 +12:00
David Wu a07a90dfea Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules 2017-05-04 13:14:35 +12:00
David Wu 88bb568ec7 Set it so the lobby view switches to race view depending on the race status passed in by the mock. 
-Removed start button in lobby as it should be automatic.
-TODO: Synchronize the times across the whole race as they do not matching.

#Story[782]
 2017-05-04 13:14:29 +12:00
David Wu 34ef1172ce Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules 2017-05-04 12:48:24 +12:00
David Wu bf12f77796 Set it so the lobby view switches to race view depending on the race status passed in by the mock. 
-Removed start button in lobby as it should be automatic.
-TODO: Synchronize the times across the whole race as they do not matching.

#Story[782]
 2017-05-04 12:48:17 +12:00
David Wu b60b4b257f Remove start button from StartController. 
#story[778]
 2017-05-04 12:41:14 +12:00
David Wu 4811b7f4ea Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules 
# Conflicts:
#	mock/src/test/java/seng302/Model/RaceTest.java
 2017-05-01 16:39:26 +12:00
David Wu 0bfc9a5a39 Added test for race dnf in Race class. 
-Unable to test animation timer.

#story[778]
 2017-05-01 16:37:55 +12:00
David Wu d14446a12e Added extra constructor in Race. 
-Constructor is used for junit testing for Race class.

#story[778]
 2017-04-25 12:24:39 +12:00
David Wu c2183a68a0 Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock 2017-04-25 12:00:52 +12:00
David Wu 0fd4de7ec7 Fixed previously broken tests due to refactoring app. 
-ConstantVelocityRace doesn't exist anymore so tests had to be change to compensate for this.
-Boat in race had to be change due to the addition of the sourceID for each boat.

#story[778]
 2017-04-25 12:00:44 +12:00
David Wu d995d5df45 Fixed RegattaDataSource missing. 
-RegattaDataSource failed to push from before. It is now created and working.

#story[778]
 2017-04-25 11:28:28 +12:00
zwu18 c5df90d276 Created RegattaDataSource and regattaTest.xml. 
-Event regattaData will now get data from the XML instead of having static data.

#story[778]
 2017-04-23 19:59:07 +12:00
David Wu 1d9b098f2b Create XML Object for regatta data. 
-Regatta data XML is generated in class Event.
-Regatta data is static as there isn't any information regarding it.

#story[778]
 2017-04-21 16:58:22 +12:00
David Wu 5397d14d3c Added sourceID to boats in race. 
-All boats in race will now have a sourceID.
-SourceID will be used in XML object for boat.

#story[778]
 2017-04-21 16:22:23 +12:00
David Wu ec716058c6 Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock 2017-04-21 14:20:20 +12:00
David Wu 687ffb41e6 Create XML object of boat data. 
-XML object currently displaying out in terminal.
-Reads in data from RaceDataSource.
-TODO: Add sourceID to boats.

#story[778]
 2017-04-21 14:19:49 +12:00
David Wu be59bb853c Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock 2017-04-21 13:10:56 +12:00
David Wu 265bece9ed Added a heartbeat value to the race. 
-Heartbeat will display and update every 5 seconds.

#story[778]
 2017-04-21 13:10:46 +12:00
David Wu 668758f6f8 Fixed boat path not being toggled when annotation is toggled. 
#story[759]
 2017-04-19 16:32:24 +12:00
zwu18 c31ea51068 Temporarily removed test for countdown timer as countdown timer now uses animation timer. 2017-04-07 03:42:16 +12:00
zwu18 57d30a7a02 Fixed countdown timer not scaling. 
-Countdown timer now also uses an animation timer
-Added scaling factor to countdown timer
 2017-04-06 20:48:17 +12:00
David Wu ee65e7eba5 Changed where the saved annotation set is declared. 
-Annotation set is now initialized along with annotations.

#story[26]
 2017-04-06 16:44:22 +12:00
David Wu d08a1c325f Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 2017-04-06 16:37:09 +12:00
David Wu 5c89c1aeb7 Implemented functionality to select which annotations to display. Selected annotations can be temporarily saved and then displayed on a button press. 
-Added checkboxes to display name, abbreviation, and speed in annotation.
-Changed single titlepane to an accordion.
-Moved all annotation controls to separate titlepane in accordion.
-Added buttons to save and load saved annotation settings.

#story[26]
 2017-04-06 16:37:00 +12:00
David Wu 9960317732 Removed tooltip 2017-03-29 13:19:34 +13:00
David Wu 68fccc3216 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 2017-03-29 13:14:27 +13:00
David Wu 4ee6624ff6 Changed abbreviations for teams 
-Updated the team abbreviations to official ones
-Change methods that were public to private
 2017-03-29 13:14:19 +13:00
David Wu b943b38d61 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	src/main/java/seng302/Model/Boat.java
 2017-03-29 11:19:15 +13:00
David Wu d2de426f58 Fixed so the animation timer will exit when all boats finish the race 
-Moved listeners  for annotation to initialize
-Fixed compass arrow not rescaling properly with canvas
-Fixed scaling issue with race clock
 2017-03-29 11:16:57 +13:00
David Wu f7477adb36 Added javadoc for new methods used for annotation and fps 
#story[23]
 2017-03-29 10:15:31 +13:00
David Wu 33b94cdf5b Changed implementation for Anno(annotations) 
-drawRaceMap is now called for annotation to update map

#story[23]
 2017-03-29 10:13:51 +13:00
David Wu 24dec0bb2f Fixed participating boats not outputting correctly 
-toString method in Boat class now uses getValue
 2017-03-26 19:12:58 +13:00
David Wu bd072af0c4 Modified size of mark 
-Size of the mark changed to avoid confusion between mark and boats.
 2017-03-26 18:47:44 +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
David Wu f8dff6359d Merge branch 'story9' 
# Conflicts:
#	src/main/java/seng302/Controllers/RaceController.java
#	src/main/java/seng302/Model/Race.java
#	src/main/java/seng302/Model/ResizableRaceCanvas.java
#	src/main/resources/scenes/racepane.fxml
 2017-03-26 16:46:19 +13:00
David Wu f8147be4df Merge remote-tracking branch 'origin/story9' into story9 
# Conflicts:
#	src/main/java/seng302/Constants.java
#	src/main/java/seng302/Model/Race.java
#	src/main/java/seng302/Model/ResizableRaceCanvas.java
 2017-03-23 18:20:25 +13:00
David Wu af45be1147 Implemented Animation Timer, FPS counter and modified display boat names and speed 
-Race now uses Animation Timer to simulate the race in Race class
-FPS counter displayed in bottom left corner. TODO: Toggle fps view
-Boat names and speed will now reposition so it is not blocked by the border of the canvas

#story [18, 20]
 2017-03-23 18:11:13 +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 4efab9091d Merge remote-tracking branch 'origin/story9' into story9 
# Conflicts:
#	src/main/java/seng302/Model/Boat.java
 2017-03-20 17:12:06 +13:00
David Wu 293f63ca8b Added abbreviations to each boat 
-BoatInRace now takes extra parameter "abbrev"

#story [18]
 2017-03-20 17:08:25 +13:00
David Wu b5496b07de Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9 2017-03-20 16:47:09 +13:00
David Wu 98c5c46569 Implemented displayText to display boat name and speed with mark 
-method takes in boat name, boat speed and coordinates

#story [18, 19]
 2017-03-20 16:46:59 +13:00
David Wu c33ce60e71 Changed labels for timer 
-preRace countdown now has text saying "Time until race starts:"
-Timer during race now says "Race clock:"

#story [16]
 2017-03-20 16:26:18 +13:00
David Wu 1842b8f0b2 Merge remote-tracking branch 'origin/story9' into story9 
# Conflicts:
#	src/main/java/seng302/Model/Race.java
 2017-03-20 16:22:12 +13:00
David Wu 946b9d0a72 Implement countdown clock 
-Added method countdownTimer() that countdowns from the current time to an selected time
-Method is called in run (in Race) before the simulatedRace
-Private integer PRERACE_TIME is used to set time before the race begins

#story [16]
 2017-03-20 16:20:05 +13:00
David Wu e04fdc79c9 Merge remote-tracking branch 'origin/story9' into story9 
# Conflicts:
#	.idea/compiler.xml
#	.idea/misc.xml
 2017-03-20 15:34:12 +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
David Wu b3b200fb02 Fixed arrow not resizing with resizable canvas 
#story [14]
 2017-03-17 12:30:22 +13:00
David Wu 8bb2558b7e Timer is now in race loop 
-Timer is currently printing out
-Later will implement so that it is displayed on gui

#story [16]
 2017-03-17 12:06:35 +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
David Wu ec03ec9be9 Merge remote-tracking branch 'origin/story9' into story9 
# Conflicts:
#	src/main/java/seng302/Controllers/RaceController.java
 2017-03-15 12:36:43 +13:00
David Wu b4baba8c15 Implemented display a gate as a line 
-method created to add a line to canvas
-added points for mark, north gate, and south gate

#story [12]
 2017-03-15 12:35:14 +13:00