fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
242 Commits 1 Branch 0 Tags
4b5ebbd9e4f0237bd716db639a3df630d664277a
Commit Graph
242 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
hba56 4b5ebbd9e4 refactored networking code from networkingTest branch 
#story[778, 782]
 2017-04-25 11:50:22 +12:00
fjc40 2876eec1e4 Added some exception classes to encapsulate the internal exceptions that can occur when sending Boat/race/regatta data. 
#story[778]
 2017-04-25 11:24:33 +12:00
fjc40 bf5ea193af Mock App now passes an OutputStream into the "Event" class. This is where data is written to (i.e., writing data over tcp socket). 
Updated Event and Race class to write to this stream, and added some TODO notes which point out where we need to properly serialize messages, when merged with networking code.
 2017-04-24 21:53:51 +12:00
fjc40 2ce84e3be4 Added myself to the .mailmap file. 2017-04-24 20:23:29 +12:00
fjc40 091ee4735b Race.simulateRace() function now generates a BoatLocationMessage after updating the position of each boat. Currently we just print the message to stdout. 
Added functions to convert knots (as a double) to mm/sec (as an int) to BoatLocationMessage class.
Added toString function to BoatLocationMessage class.
Added a sequence number member to the BoatInRace class.
Added Knots to meters per second conversion factor to Contants class.

#story[788]
 2017-04-24 20:19:39 +12:00
Erika Savell 5304f7df7d removed problematic import 
#story[778]
 2017-04-21 17:11:56 +12:00
Erika Savell 3ff2a07680 Temporarily ignored some tests in mock 
#story[778]
 2017-04-21 17:08:28 +12:00
Erika Savell a7913a16f9 Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock 2017-04-21 17:04:12 +12:00
Erika Savell 9764f448eb Added participants field to xml generator 
#story[778]
 2017-04-21 17:02:06 +12:00
Erika Savell c365d5a344 Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock 2017-04-21 17:01:23 +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
Erika Savell fdba50f9d2 Added course limit, course and marker seq field to xml fiule of race info 
#story[778]
 2017-04-21 16:52:07 +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
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
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
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
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
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
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
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
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
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
Joseph Gardner eb9fce1f22 Track scales with time scale #Pair[jjg64, zwu18] #Story[758] 2017-04-19 12:46:26 +12:00
cbt24 71535be143 Merge branch 'story_25' 2017-04-19 12:42:39 +12:00
cbt24 caf1e61391 Documented methods added for track handling. 
#story[758]
 2017-04-19 12:39:23 +12:00