fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
708 Commits 1 Branch 0 Tags
a140e532e803d9ccb72a728665af014dd7a657e5
Commit Graph
223 Commits
Author SHA1 Message Date
hba56 a140e532e8 Merge remote-tracking branch 'origin/css' into css 2017-07-24 11:31:24 +12:00
David Wu 8514c98805 Created FXML files for new start up U-I. #story[1087] 2017-07-23 19:32:57 +12:00
fjc40 4bcfc01ceb shared.dataInput: 
Added shared.enums.XMLFileType, which is used to specify if a string contains a file path or file contents.
Updated the XML readers to use it.

Testing:
Moved the networking tests and resources into racevisionGame module.
Moved the remaining tests from visualiser into racevisionGame, and added a few empty tests to implement later.
 2017-07-19 23:18:52 +12:00
hba56 db42b3f1bb changed css to be day and night 
#story[1003]
 2017-07-18 23:19:00 +12:00
hba56 a0a7db9f0f update the css to include a black on black option and update the colour of the water to better fit with the other colours 
#story[1003]
 2017-07-17 10:36:23 +12:00
hba56 01625a7bb8 added an icon for the window and basic red black and white style sheet 
#story[1003]
 2017-07-15 23:24:29 +12:00
hba56 fb37831ec0 added an icon for the window and basic red black and white style sheet 
#story[1003]
 2017-07-15 23:14:00 +12:00
fjc40 46150bd3c6 Actually commited the previous pom.xml changes. 2017-07-11 03:21:10 +12:00
fjc40 2c5380f5d8 Removed old network files. 
Renamed each test folder to test_old as tests haven't been updated to use new code!

Removed unused stuff from mock/visualiser pom.xml.
 2017-07-11 03:20:49 +12:00
fjc40 2a82298571 Removed the old mock/network/visualiser files. 2017-07-11 03:13:32 +12:00
fjc40 3a85fad211 Currently, mock/pom.xml and visualiser/pom.xml build racevisionGame mock and visualiser. 
Now using jetbrains nullable/notnull instead of sun (was causing maven issues).
 2017-07-11 03:10:29 +12:00
Jessica McAuslin 6e841f180d Spelling errors fixed. 2017-06-28 21:24:20 +12:00
Jessica McAuslin cf0adb8511 Fixed JavaDoc, spelling errors, and redundant classes 
- Removed some default templates (eg: created by X)
- Wrote JavaDoc for classes that had none
- Made JavaDoc more clear for classes
- Linked JavaDoc to other classes
- Minor spelling errors fixed
- BoatInRace and BoatInRaceTest commented out (to be removed)

#story[1003]
 2017-06-28 20:37:01 +12:00
Jessica McAuslin 2bbcb10458 Removed unused classes and imports 
- Removed references to Constants class from other classes and tests
- ArrowController, Constants, Regatta removed
- Removed imports from various classes no longer used

#story[1003]
 2017-06-26 22:29:30 +12:00
Jessica McAuslin 6ba1aca074 Annotations moved to its own class 
- Annotations class sets annotations to be displayed
- removed annotation implementation from RaceController
- deconstructed previous annotation method
- fixing RaceController code smells

#story[1003]
 2017-06-26 21:36:44 +12:00
Jessica McAuslin c027a0ee6e Sparkline moved to its own class 
- Sparkline class creates and modifies sparkLine chart
- removed sparkline implementation from RaceController
- fixing RaceController code smells

#story[876, 1003]
 2017-06-25 19:59:59 +12:00
Jessica McAuslin fdeec19b20 Wind Arrow direction fixed 
- arrow shows wind direction as from instead of to
- removed old unused displayArrow method
- renamed displayFancyArrow to displayWindArrow
- removed coordinates parameter not used

#story[882, 1003]
 2017-06-24 13:41:03 +12:00
fjc40 a095f15eac Fixed finish controller not being stretch and centered. 2017-05-25 16:46:24 +12:00
fjc40 42ae89d20c Merge remote-tracking branch 'origin/sprint4_master' into fix_time_since_last_marker 2017-05-25 16:22:23 +12:00
Fan-Wu Yang 512169010c Fixed Annotations and bound windarrow 
- Wind arrow for the bermuda race is bound between 215 and 235 degrees
- annotations will not correctly highlight what they are showing
#story[877] #story[882]
 2017-05-25 14:45:13 +12:00
fjc40 234748d056 Visualiser: 
Fixed the issue where a boat's time since last mark started counting from when the race screen loaded.
It now starts counting when the race actually starts.
 2017-05-25 14:41:51 +12:00
Fan-Wu Yang b9b03305b0 Fixed Annotations and bound windarrow 
- Wind arrow for the bermuda race is bound between 215 and 235 degrees
- annotations will not correctly highlight what they are showing
#story[877] story[882]
 2017-05-25 14:34:29 +12:00
cbt24 2126c44db9 Last minute changes to get ready for DoD 
#story[875]
 2017-05-25 13:35:40 +12:00
Erika Savell 5f23f335e5 Added est time annotation to annotations that can be hidden and shown 
#story[875]
 2017-05-25 02:29:56 +12:00
Erika Savell 0a022e275e Added checkbox for est time to next mark to gui 
#story[875]
 2017-05-25 02:11:09 +12:00
Erika Savell 92e5dc4490 Cherrypicked changes allowing vis to display est time from bugged branch to current master. 
#story[875]
 2017-05-25 01:34:23 +12:00
Erika Savell e9f3467d97 Reverted commits pushed to master accidentally 
#story[875]
 2017-05-25 01:23:44 +12:00
Erika Savell f0da2d4fee Merge remote-tracking branch 'origin/sprint4_master' into 33CherryPick 2017-05-25 01:15:14 +12:00
Erika Savell 230b458e5d Cherrypicked changes allowing vis to display est time from bugged branch to current master. 
#story[875]
 2017-05-25 01:14:54 +12:00
Fan-Wu Yang 6e3d8dc75b Merged Refactors with master 2017-05-24 23:50:17 +12:00
Fan-Wu Yang 22e5996e64 Merge remote-tracking branch 'origin/sprint4_master' into AuditRefactors 
# Conflicts:
#	visualiser/src/main/java/seng302/VisualiserInput.java
 2017-05-24 23:49:00 +12:00
Fan-Wu Yang ba5e74ab9c Merge with master complete 
- merged with master
#story[877]
 2017-05-24 23:13:59 +12:00
Fan-Wu Yang a3ccd75f4c Merge remote-tracking branch 'origin/sprint4_master' into Story877 
# Conflicts:
#	mock/src/main/java/seng302/DataInput/BoatXMLReader.java
#	mock/src/main/java/seng302/DataInput/XMLReader.java
#	mock/src/main/java/seng302/Model/Boat.java
#	mock/src/main/java/seng302/Model/CompoundMark.java
#	mock/src/main/java/seng302/Model/Leg.java
#	mock/src/main/java/seng302/Model/Mark.java
#	mock/src/main/java/seng302/Model/Marker.java
#	mock/src/main/java/seng302/Model/Race.java
#	mock/src/test/java/seng302/Model/LegTest.java
#	visualiser/src/main/java/seng302/Controllers/RaceController.java
#	visualiser/src/main/java/seng302/Mock/StreamedRace.java
#	visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java
#	visualiser/src/main/resources/scenes/race.fxml
 2017-05-24 22:57:31 +12:00
Fan-Wu Yang debc5d9c38 Added adjustments that PO requested 
- hide will not deselect all checkboxes
- visible will now show all checkboxes that were deselected when hidden
- partial will now select abbreviation and speed only
- when another checkbox is selected/deselected from partial,hidden or important it will immediately jump to visible radio button.
#story[877]
 2017-05-24 22:24:37 +12:00
hba56 dc7aa359d7 boat time now saves 
#story[878]
 2017-05-24 17:59:02 +12:00
David Wu 9076606030 Fixed show all annotation not toggling annotations. 
-Problem found with if statement to fix annotation toggling.
-Sparkline graph x-axis also increased slightly.

#story[878]
 2017-05-23 17:49:00 +12:00
hba56 2a7f264444 Merge remote-tracking branch 'remotes/origin/sprint4_master' into story36 
# Conflicts:
#	visualiser/src/main/java/seng302/Controllers/RaceController.java
#	visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java
#story[878]
 2017-05-23 13:19:11 +12:00
Joseph aa2f234393 Annotations are now clickable #fix 2017-05-23 12:22:30 +12:00
Joseph 6a598c8a04 Arrow fxml I forgot to push 2017-05-23 11:17:54 +12:00
hba56 139d7b41fb re added story36 racefxml changes after merge 
#story[878]
 2017-05-22 17:46:51 +12:00
hba56 748a516d16 Boats not moving working on fix 
Merge remote-tracking branch 'remotes/origin/sprint4_master' into story36

# Conflicts:
#	mock/src/main/java/seng302/DataInput/XMLReader.java
#	visualiser/src/main/java/seng302/Controllers/RaceController.java
#	visualiser/src/main/java/seng302/Mock/StreamedRace.java
#	visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java
#	visualiser/src/main/resources/scenes/race.fxml

#story[878]
 2017-05-22 17:45:45 +12:00
Joseph Gardner 06359fb138 Had to changed race to fit the merge 2017-05-22 16:39:26 +12:00
Joseph Gardner 40421e5a83 Merge branch 'sprint4_master' into noDependencyArrow 
# Conflicts:
#	mock/src/main/java/seng302/Model/Race.java
#	network/src/main/java/seng302/Networking/Messages/RaceStatus.java
#	visualiser/src/main/java/seng302/Controllers/RaceController.java
#	visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java
#	visualiser/src/main/resources/scenes/race.fxml
 2017-05-22 15:28:53 +12:00
fjc40 c8157f3476 Merge remote-tracking branch 'origin/sprint4_master' into story31.2_alternateTack 
# Conflicts:
#	visualiser/src/main/java/seng302/Mock/StreamedRace.java
#	visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java
Resolved.
 2017-05-22 14:26:45 +12:00
Joseph 2242b44398 forgot to remove imports 2017-05-22 11:53:38 +12:00
Joseph b678152cf8 Removed breaking dependency and made it so app doesn't need the breaking dependency any more. 2017-05-22 11:49:40 +12:00
Fan-Wu Yang 671d62aeb1 Added Important and Partial Annotations and other refactors and documentation. 
- Important, Partial, Hidden, Visible are all radiobuttons
- Fixed bug where the Visualiser would end the race before the last boat had finished
- Refactored the visualiser and the mock to use the race finished status message
- Added and Changed many Javadocs
#story[877]
 2017-05-22 03:51:14 +12:00
zwu18 b9d696ef12 Sparkline has a set x-axis now to prevent sparkline constantly re-adjusting axis. 
#story[876]
 2017-05-21 23:06:51 +12:00
hba56 4b2e90f54b can now toggle the boats time on and off 
#story[878]
 2017-05-20 21:04:03 +12:00
hba56 a24dda2fd8 boats have an annotation beside them that shows time since last mark passed 
#story[878]
 2017-05-20 20:40:08 +12:00