fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,376 Commits 1 Branch 0 Tags
1ffef51d7c8583df2d98235189aefc8ad830ffc4
Commit Graph
1376 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jessica McAuslin 2bf264c6bb Populated starting boat table 
- boat names shown in first column
- boat abbrevs. shown in second column

#story[760]
 2017-04-06 19:29:57 +12:00
Erika Savell 8112918c13 Attempted to load details in, but ran into problems with the string property/vs string distinction 
#pair[jam330] #story[760]
 2017-04-06 17:17:06 +12:00
Joseph Gardner 101dadc003 Gave BoatInRace a track property that stores the coordinates of the track. Added a method in ResizableRaceCanvas that draws the points on the track every time the canvas updates. [Story 25] 2017-04-06 17:11:24 +12:00
Fan-Wu Yang 7790322e04 Implemented the Time showing on Grid 
- Added Label to scene
- Added Timezone formatting
#story[28] #pair[fwy13,hba56]
 2017-04-06 16:55:43 +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
Jessica McAuslin 58cae682ab Merge branch 'story27' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story27 2017-04-06 16:31:54 +12:00
Jessica McAuslin 44fac754a7 Created screen for showing starters 
- modified start pane
- added table to populate with starting boats

#Story[760]
 2017-04-06 16:31:12 +12:00
Erika Savell 47df6266d2 Created start race entry point in main controller so it could be called by start race controller 
story[760]
 2017-04-06 16:19:31 +12:00
Fan-Wu Yang 71f0085268 Implemented geotimezone from com.github.bfsmith 
- Calculates timezone from mark
#story[28] #pair[fwy13,hba56]
 2017-04-06 16:11:14 +12:00
Erika Savell 0772ca22c6 Re-engineered fxml controllers to use child controllers 
- Removed a lot of unnecessary complexity in App class

#pair[jam339, esa46] #story[760]
 2017-04-06 15:35:55 +12:00
Erika Savell a689ffc689 Added quick descriptions to params to get javadoc working 2017-04-06 14:31:11 +12:00
Erika Savell 6866f65adf Ignoring failing test to check CI is working. 
- Test will be fixed as part of another stoy
 2017-04-06 13:53:21 +12:00
Erika Savell 94444e6662 Negligible change to check CI runner is working 2017-04-06 13:41:04 +12:00
Connor Taylor-Brown 8e70dfa2d5 Fixed boat position calculation 
- Decoupled 'place' column data from position in table
- Set position in race after first mark passed

#story[15]
 2017-04-06 13:19:31 +12:00
Fan-Wu Yang 795b411f08 Added some doc strings 
- Added doc strings to RaceXML
- Added a few minor changes to bermuda_AC35.xml
- Changes to the RaceXMLReader Unit Test
 2017-03-31 00:51:08 +13:00
Fan-Wu Yang c105c2d01e Fixed file paths so they work when it becomes an executable 
- Changed file paths for the FXML files
 2017-03-31 00:00:53 +13:00
Erika Savell ee72d85f6a removed print messages 
#story[20]
 2017-03-30 14:33:28 +13:00
Erika Savell ec9574fd9d Refactoring 
#story[24]
 2017-03-29 23:58:00 +13:00
Erika Savell e2f9a710aa Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into changeStartingPositions2 2017-03-29 23:07:57 +13:00
Erika Savell fc1121b5b7 Removed extra < char from .mailmap 2017-03-29 23:07:42 +13:00
Erika Savell 6344e12d8f Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into changeStartingPositions2 2017-03-29 23:06:24 +13:00
Erika Savell 9808c57ca7 GOat boats spread out at startline working 
#story[20]
 2017-03-29 23:06:16 +13:00
Erika Savell 9f71c99ecf Updated .mailmap 2017-03-29 23:05:36 +13:00
Erika Savell 0e7d210cea Amended wake tests to handle markers instead of direct coordinates 
#test
 2017-03-29 22:02:24 +13:00
Erika Savell 970f0d0116 Fixed race scaling 
- Races were completed far too quickly because a set SLEEPTIME was used as the time elapsed, instead of the actual break time

#story[16]
 2017-03-29 21:51:03 +13:00
Erika Savell fb409af23b Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into changeStartingPositions2 2017-03-29 19:54:53 +13:00
Erika Savell 495158a621 Amended and added tests to cope with marker change 
#test #story[20]
 2017-03-29 19:47:49 +13:00
Fan-Wu Yang 305326881f Merged Boundaries branch 
- Merged Boundaries branch.
#story[22]
 2017-03-29 17:13:52 +13:00
Fan-Wu Yang 461d894ac8 Merge branch 'boundaries' 
# Conflicts:
#	src/main/java/seng302/Controllers/RaceController.java
#	src/main/java/seng302/Model/ResizableRaceCanvas.java
#	src/main/resources/scenes/racepane.fxml
 2017-03-29 16:53:28 +13:00
Fan-Wu Yang 6ffe3d02a3 Fixed and merged heading-visualisation 
- Fixed the boats not appearing at the starting line.
- Merged with master
#story[24]
 2017-03-29 16:46:23 +13:00
Fan-Wu Yang edd9c2a48d Merge remote-tracking branch 'origin/heading-visualisation' 
# Conflicts:
#	src/main/java/seng302/Controllers/RaceController.java
#	src/main/java/seng302/Model/Boat.java
#	src/main/java/seng302/Model/Race.java
#	src/main/java/seng302/Model/ResizableRaceCanvas.java
#	src/main/resources/scenes/racepane.fxml
 2017-03-29 14:36:24 +13:00
Fan-Wu Yang eb97bd6aef Implemented resizable map and boundary scaling. 
- Map can now be downsized
- The boundaries are auto margined and fit in the center of the canvas.
#implement
 2017-03-29 13:29:53 +13:00
cbt24 1524ed5a0e Merged annotation toggle and DNF features with heading visualisation. 2017-03-29 13:27:41 +13: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
Erika Savell 40a6801477 Marker tests added 
#story[20]
 2017-03-29 12:37:53 +13:00
cbt24 98be99a975 Merge remote-tracking branch 'origin/master' 2017-03-29 12:13:20 +13:00
Erika Savell eb4c02557d Changing xml reader to take both coordinates of a marker 
- Have commented out tests for now because  a lot of rearranging and fixing needed

#story[20]
 2017-03-29 12:08:40 +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
cbt24 99cb4bd526 Implemented DNF with random chance in Race 
#story [17]
 2017-03-29 11:18:04 +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
Erika Savell d1d46f2cf5 Created Marker class 
- Holds the start and end coordinate of a gate or marker, and has a method to calculate the middle point
- Each leg will hold a start Marker and end Marker

#story[20]
 2017-03-29 11:16:37 +13:00
cbt24 6fe80ad52c Fixed speed displayed in table view 
#story [17]
 2017-03-29 10:46:18 +13:00
Erika Savell 45fcd22cc5 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into changeStartingPositions2 2017-03-29 10:46:06 +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
Fan-Wu Yang 224c16a713 Implemented Map Boundaries in XML 
- RaceXMLReader will calculate the top left latitude and longitude and the bottom right latitude and longitude, and make the layout the map accordingly.
- The Boundaries are draw on the Race Canvas in Aqua.
#story[22]
 2017-03-29 03:18:47 +13:00