fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
682 Commits 1 Branch 0 Tags
8514c98805b0ce6040cf1fd8ad24e10df53d26e2
Commit Graph
86 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Hamish Ball 992b6c91fc Merge branch 'fix_time_since_last_marker' into 'sprint4_master' 
Fix time since last marker

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.


See merge request !13
 2017-05-25 17:13:27 +12:00
Hamish Ball adbb8f0a64 Merge branch 'story36' into 'sprint4_master' 
Story36



See merge request !9
 2017-05-24 18:05:04 +12:00
hba56 dc7aa359d7 boat time now saves 
#story[878]
 2017-05-24 17:59:02 +12:00
hba56 2ac932b4f3 fix to keep boats in the bounds 
#story[#874, 873]
 2017-05-23 15:17:19 +12:00
hba56 db3f4a5b2b fix to keep boats in the bounds 
#story[#874, 873]
 2017-05-23 14:56:07 +12:00
hba56 6a74b5fe36 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:48 +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
hba56 7c9b9c6426 Merge commit message was wrong, i wasn't watching the start up time 
-small fix to java doc
#story[878]
 2017-05-22 17:56:47 +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
hba56 abcaca719c Javadoc fix 
#story[878]
 2017-05-22 11:05:36 +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
hba56 9eb4e3daea boats now calculate the time since last mark 
-the raceclock is passed around so that the time can be tracked
-time from start to mark 1 is wrong
 #story[878]
 2017-05-20 17:22:52 +12:00
hba56 12b6f49f2e boats now bounce on the boundry 
#pair[hba56, cbt24, jjg64]
 #story[873]
 2017-05-15 15:21:45 +12:00
hba56 3895172631 updated the race class to set heading for windward legs 
#story[873]
 2017-05-14 17:25:44 +12:00
hba56 d4be901b1a Merge remote-tracking branch 'origin/story31.2' into story31.2 2017-05-14 15:16:18 +12:00
hba56 dd1308808a updated the race class to set heading based on the vmg not just the end of a leg 
-race class now stores the boundary
-updatePositions now checks if the boat is with the course
-update positions now sets heading and speed based on the vmg
-updated azimuth to now accept a start and finish gps rather that finding it itself
-added a calculatebearingtodestination method that finds the azimuth to the dest from the boat
-updated boat tests to use the new azimuth method
 #story[873]
 2017-05-12 12:49:02 +12:00
hba56 4f8d6b14d4 updated app class to read the polar csv and pass it off to its parser 
#story[900]
 2017-05-10 15:46:01 +12:00
hba56 245914a69e added the polars csv 
#story[900]
 2017-05-10 15:26:43 +12:00
hba56 e67f8fae4b parser updated for the hashmap polars 
#pair[hba56, fjc40]
 #story[900]
 2017-05-10 15:24:46 +12:00
hba56 f518c52c7b changed the way we store polars 
-removed polar class
-added in new hasmap polars class
-updated boat class to the changes
 #story[900]
 2017-05-10 15:10:03 +12:00
hba56 1f554648ef changed all polar values to doubles and added a empty constructor 
#story[900]
 2017-05-10 14:41:05 +12:00
hba56 a4480f3ccf removed the get best heading method as it was incorrect and not related to this story 
#story[900]
 2017-05-10 14:25:06 +12:00
hba56 d7294f73a1 boats now have polars stored in the 
-added getter and setter for a boats polars

 #story[900]
 2017-05-10 14:23:26 +12:00
hba56 5b010cad49 added the polar class for storing polars 
#story[900]
 2017-05-10 13:45:09 +12:00
hba56 187acc6960 added an empty polarparser class to push a new branch 
#story[900]
 2017-05-10 12:30:46 +12:00
hba56 12e457824d fix for issue #5 gate lines 
-removed drawing of lines between the marks as only the start and finish line should have a line drawn

 #story[782]
 2017-05-06 16:31:40 +12:00
hba56andErika Savell 6888d0bddc fixed all java doc errors 
#story[782]
 2017-05-04 16:29:41 +12:00
hba56 e409c8752c Fix for now - Need to change 2017-05-04 14:56:54 +12:00
hba56 1f8941e37c Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules 2017-05-04 13:41:14 +12:00
hba56 ccd90b91d7 Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules 2017-05-04 13:40:45 +12:00
hba56 62ecd40967 fixed all java doc errors 
#story[782]
 2017-05-04 13:40:37 +12:00
hba56 aa1d38ca9f removed import * lines 
#story[782]
 2017-05-04 13:17:07 +12:00
hba56 15179a1cdf Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules 2017-05-04 13:11:58 +12:00
hba56 810c3837c1 adding java doc tags 
#story[782]
 2017-05-04 13:11:14 +12:00
hba56 db43acf935 Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules 2017-05-04 12:46:46 +12:00
hba56 86db16c83d updated the connection scene to let a user add their own connection 
-added textfields to the fxml
-added scaling to the connection scene(in mainController)
-added a newConnection method and a method for getting the wrapper anchor pane

#story[782]
 2017-05-04 12:46:27 +12:00
hba56 8bbea28cab refactored the boat message to not use boats 
#story[778]
 2017-05-01 17:35:30 +12:00
hba56 7cb4b2228d Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules 2017-05-01 16:08:28 +12:00
hba56 a271952e0c fixed boat parser for the mock 
#story[778]
 2017-05-01 16:08:23 +12:00
hba56 cdcbb07dc6 removed unused conversion 2017-05-01 15:24:46 +12:00
hba56 40a7ca808f added .trim to remove the unwanted bytes at the end of xml 
#pair[hba56, fw13, jjg64]
#story[782]
 2017-05-01 15:21:42 +12:00
hba56 5a972c855e Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules 2017-04-28 14:32:32 +12:00
hba56 5bbdd6e00d updated the visualiserinput to be a thread 
#story[782]
 2017-04-28 14:32:25 +12:00
hba56 db4792452f added run statement to mock thread 
#story[782]
 2017-04-28 13:34:50 +12:00
hba56 3b13f5bac1 swapping sockets so mock is the server rather than visualiser 
#story[782]
 2017-04-28 13:17:01 +12:00
hba56 c95f5377f6 Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules 2017-04-28 11:37:23 +12:00
hba56 f4e4a207be Merge branch 'networkingTest' into splitIntoTwoModules 2017-04-28 11:34:47 +12:00
hba56 04a1e70920 small refactor of the VisualiserInput to better use the decoder 
#story[782]
 2017-04-28 11:30:43 +12:00
hba56 538f1bd6ba removed all putInt and putShort methods for byte buffers to fix tests 
#story[778]
 2017-04-27 16:23:31 +12:00
hba56 7dd07b470a update byte to int methods in decoders 
#story[778]
 2017-04-27 16:01:50 +12:00
hba56 137e85e14c Merge remote-tracking branch 'origin/networkingTest' into networkingTest 2017-04-27 15:59:41 +12:00
hba56 246420ccf9 fixed bug with heartbeat 
#story[778]
 2017-04-27 15:53:38 +12:00
hba56 949b967abb visualiserInput update as well as refactor of number to bytes conversion 
#story[778]
 2017-04-27 15:33:23 +12:00
hba56 bd7fefd67e Worked on the MockOutput Class 
-Renamed TCPclient to MockOutput
-Renamed TCPserver toVisualiserInput
-set up a heartbeat message to send every 5 seconds
-set up a method for mockoutput to handle xml strings

-minor edits to VisualiserInput to print the data it gets

#story[778]
 2017-04-26 14:38:57 +12:00
hba56 0257b9e18c Changed the temp tcp client and server to send packets made by us and other fixes 
-xmlmessagedecoder now outputs a inputsource for the vis team
-tests fixed for the new xmlmessagedecoder
-tcpclient now generates a packet encoded by our methods and sends it
-tcpserver now recieves a packet encoded by us and prints out some of its info

#story[778, 782]
 2017-04-25 15:34:49 +12:00
hba56 e9578fc63b refactored networking code from networkingTest 
#story[778, 782]
 2017-04-25 12:38:13 +12:00
hba56 d960bc67a2 refactored networking code 
#story[778, 782]
 2017-04-25 12:11:08 +12:00
hba56 67b73ec1db Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules 2017-04-25 12:00:05 +12:00
hba56 4b5ebbd9e4 refactored networking code from networkingTest branch 
#story[778, 782]
 2017-04-25 11:50:22 +12:00
hba56 49fc4ec02e added raceStatusDecpderTest and some debugging 
-added raceStatusDecpderTest
-fix a problem where the encoder method for race status added 4 bytes where it should have put 1
-added getters to the info in raceStatusDecoder
-fixed a problem with the values looked for in the decoder

#story[782]
 2017-04-23 21:18:38 +12:00
hba56 fdd994b7c0 finished the raceStatusDecoder 
-added a new boat status class

#story[782]
 2017-04-23 20:32:58 +12:00
hba56 23e007bd11 test for RaceStartStatusDecoder added 
-update to race start status decoder

#story[782]
 2017-04-23 19:43:45 +12:00
hba56 f5000eea11 added decoder test for courseWindDecoder 
-added test for coureswind decoder
-changed windID in raceVisionEncoder to byte as char is 2 bytes and can only transport 1

#story[778, 782]
 2017-04-23 13:29:46 +12:00
hba56 c9a968a5fd added decoder test for boatlocation 
-refactered networking test file structure
-boatlocationdecoder now makes a boatlocation message with its data
-boatlocationmessage sequence number changed to an int
-racevisionbyteencode changed device type to just be a byte
-fixed the short conversion in racevisionbyteencode
-added boatlocation decoder test

#story[778, 782]
 2017-04-23 12:20:05 +12:00
hba56 615115160d added decoders for avg wind, course wind and mark rounding 
-refactered networking test file structure
-added average wind decoder
-added course wind decoder
-added mark rounding decoder
-updated boat location decoder
-added true wind direction to the boatLocationMessage class
-added true wind direction to raceVisionByteEncoder method for boat location

#story[778, 782]
 2017-04-23 10:51:10 +12:00
hba56 43d087c764 Merge remote-tracking branch 'origin/networkingTest' into networkingTest 2017-04-21 17:41:32 +12:00
hba56 ec0747ab9a added decoders for race start status and race status 
-refactered decoders into own package
-added race status decoder
-added race start status decoder
-started on the boat location decoder

#story[778, 782]
 2017-04-21 17:41:18 +12:00
hba56 ee24ecaadc Merge remote-tracking branch 'origin/networkingTest' into networkingTest 2017-04-21 16:30:55 +12:00
hba56 8e79164b69 updated encoder and decoder with test for decoder 
-added binary message decoder test
-updated binary message encoder
-updated binary message decoder
-added enum for message type

#story[778, 782]
 2017-04-21 16:30:39 +12:00
hba56 655b5787a2 binary message encoder as well test for the decoder 
-added binary message encoder
-added test for the decoder
-bug with the sync number 2

#story[782]
 2017-04-21 14:22:47 +12:00
hba56 f56bb747a7 Merge branch 'networkingTest' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into networkingTest 2017-04-21 12:58:21 +12:00
hba56 a99f91a075 binary message decoder as well as refactor of xml encoder and decoder placement 
-added binary message decoder

#story[782]
 2017-04-21 12:58:11 +12:00
hba56 9d9c491372 XML Message Decoder added with test 
-added XMLMessageDecoder to decode xml files from byte array
-added test class for xml decoder
-renamed getByteArray method to encode
-made longToSixBytes private

#story[778, 782]
 2017-04-20 14:26:09 +12:00
hba56 79c5b93935 XML Message Encoder and tests class added 
-added XMLMessageEncoder to encode xml files into byte array
-added test class for xml encoder
-added regatta.xml to the test resources

#story[778, 782]
 2017-04-20 13:36:09 +12:00
hba56 8384b1a2ef updated .xmls in the format used by AC35 
#story[778, 782]
 2017-04-19 16:25:19 +12:00
hba56 b5bd1c9d6d updated to have main methods for the server and client 
#story[778, 782]
 2017-04-19 15:04:29 +12:00
hba56 43af929701 Started a new branch for the networking side of story 29, 30 
-added a basic tcp server and client

#story[778, 782]
 2017-04-19 15:00:52 +12:00
hba56 f5472bf595 Merge remote-tracking branch 'remotes/origin/master' into story28 
-anchors now fills stage
-added time label

# Conflicts:
#	pom.xml
#	src/main/java/seng302/Controllers/RaceController.java
#	src/main/resources/scenes/racepane.fxml

#pair[fwy13, hba56]
#story[761]
 2017-04-19 13:08:06 +12:00
hba56 edabe58b03 Merge remote-tracking branch 'remotes/origin/master' into story28 
-anchors now fills stage
-added time label

# Conflicts:
#	pom.xml
#	src/main/java/seng302/Controllers/RaceController.java
#	src/main/resources/scenes/racepane.fxml

#pair[fwy13, hba56]
#story[761]
 2017-04-19 12:48:03 +12:00
hba56 a00b066f8d Quick fix to zoneId to make it set correctly 
- removed local zoneId
#story[761]
#pair[fwy13, hba56]
 2017-04-19 11:55:11 +12:00