fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
345 Commits 1 Branch 0 Tags
ce47818c94d21ec82d0336a9254846b733226452
Commit Graph
345 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Erika Savell 737755def6 Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock 2017-04-21 15:33:47 +12:00
Erika Savell 94ba18cf0c Began xml creator for race info message 
#story[778]
 2017-04-21 15:33:37 +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
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
fjc40 149c312080 Merge branch 'isolatingMock' of eng-git.canterbury.ac.nz:seng302-2017/team-7 into isolatingMock 2017-04-21 13:38:01 +12:00
Joseph Gardner 9e3ca68df8 added skeleton for StreamedRace and StreamedCourse #Pair[jjg64, cbt24] #Story[782] 2017-04-21 13:28:55 +12:00
fjc40 9e1b3365bf Added helper functions to BoatLocationMessage which convert between the datatypes used by the message and datatypes used by our model. (Converts boat heading, wind angle, gps coordinate). 
#story[778]
 2017-04-21 13: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
Erika Savell 33e3b3713c Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock 2017-04-21 13:10:45 +12:00
Erika Savell 97c5c9662b Wrapped race in an event which sends out starting xml files 
#story[778]
 2017-04-21 13:10:30 +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
fjc40 ef53dee7fe Changed device type constants to bytes. 
#fix #story[778]
 2017-04-21 12:56:00 +12:00
fjc40 421663c145 Added device type enumerations as static ints for BoatLocationMessage. 
#story[778]
 2017-04-21 12:54:48 +12:00
Fan-Wu Yang c63c6a3c77 Added Encoding to RaceVisionByteEncoder 
- Added chatterText
 2017-04-21 12:51:48 +12:00
fjc40andFan-Wu Yang a7e0ffae42 Added class to encapsulate a BoatLocationMessage. 
#story[778]
 2017-04-21 12:43:36 +12:00
Fan-Wu Yang 54a2c08258 Added RaceVisionByteEncoder 
- Encodes heartBeat
- Encodes raceStatus
- Encodes displayTextMessage
- Encodes raceStartStatus
- Encodes yachtEventCode
#story[778]
 2017-04-21 12:27:34 +12:00
fjc40 1a085e881d Merge branch 'isolatingMock' of eng-git.canterbury.ac.nz:seng302-2017/team-7 into isolatingMock 2017-04-21 12:26:34 +12:00
fjc40 8da67d1dbc Added class to encapsulate a BoatLocationMessage. 
#story[778]
 2017-04-21 12:25:57 +12:00
Fan-Wu Yang 4dd173261c Added functions to the RaceVisionByteEncoder 
- Encodes Race Status
- Encodes displayTextMessage
- Encodes raceStartStatus
- Encodes yachtEventCode
#story[778]
 2017-04-21 12:24:21 +12:00
Joseph Gardner a85bf292d5 new branch for xml readers for the visuliser 2017-04-21 12:23:02 +12:00
Erika Savell 231a1824d1 Condensed Race and ConstantVelocityRace into one class 
#story[778]
 2017-04-21 12:17:17 +12:00
Erika Savell 34c0aec0b9 Mock race runs without an fx component 
#story[778]
 2017-04-21 10:47:15 +12:00
Erika Savell 3326da4f5d Started removing fx component from mock module. 
- Stuck on animation timer not running

#story[778]
 2017-04-20 15:09:55 +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
Erika Savell a584400e24 Actually added sub modules this time 
#story[778]
 2017-04-20 11:16:19 +12:00
Erika Savell 669718d406 Cloned the main project into two submodules, mock and visualiser 
#story[778]
 2017-04-19 18:57:59 +12:00
cbt24 d12f70c8f8 Merge remote-tracking branch 'origin/story_30' into story_30 2017-04-19 18:08:35 +12:00
cbt24 0f22cf81ef Moved implementational details of generated races to ConstantVelocityRace. 
- Boat headings are now treated as a property, not a calculation
#story[758]
 2017-04-19 18:08:27 +12:00
Fan-Wu Yang 4ba9331528 Merge branch 'networkingTest' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into networkingTest 2017-04-19 17:55:10 +12:00
Fan-Wu Yang 6046ba4cf1 Added Some Encoding functions for ByteStrem 
- Created Heart Beat encoding
- Created race Status encoding
- Create display Text encoding
- Created race Start status encoding
#story[778]
 2017-04-19 17:55:04 +12:00
Joseph Gardner 3321727999 Tests for RegattaXMLReader #Story[782] 2017-04-19 17:41:53 +12:00
Joseph Gardner b825790acd Moved package to correct spot 2017-04-19 17:24:00 +12:00
Joseph Gardner c40967f972 Added Regatta class and Regatta xml reader. This will be needed for the mock #Story[30] 2017-04-19 17:15:08 +12:00
Connor Taylor-Brown 316c0dda76 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	src/main/java/seng302/Controllers/RaceController.java
 2017-04-19 16:59:29 +12:00
Connor Taylor-Brown 764eb9089f Added race data source interface to abstract sources of race data. 
- Refactored controllers to send data source to consumers (Race, ResizeableRaceCanvas)

#story[782]
 2017-04-19 16:53:31 +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
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
Erika Savell 028cb33509 Fixing fxml problems 
#story[760]
 2017-04-19 13:52:00 +12:00
Erika Savell 374b31f5c0 Disabled scale buttons once one has been clicked 
#story[760]
 2017-04-19 13:41:33 +12:00
Erika Savell b1e55f8c7d Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story28 2017-04-19 13:40:40 +12:00
Erika Savell dc32868227 Created countdown clock on start screen. 
#story[760]
 2017-04-19 13:35:02 +12:00
Joseph Gardner fc15c3d151 Added annotation to toggle all boat paths on and off #Pair[jjg64, zwu18] #Story[759] 2017-04-19 13:09:45 +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