Erika Savell
744caf0d29
Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock
9 years ago
David Wu
d14446a12e
Added extra constructor in Race.
...
-Constructor is used for junit testing for Race class.
#story[778]
9 years ago
Erika Savell
896589d1a5
Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock
9 years ago
Erika Savell
0719720585
Moved boat xml creation from Event class to BoatData class
...
#story[778]
9 years ago
David Wu
c2183a68a0
Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock
9 years ago
David Wu
0fd4de7ec7
Fixed previously broken tests due to refactoring app.
...
-ConstantVelocityRace doesn't exist anymore so tests had to be change to compensate for this.
-Boat in race had to be change due to the addition of the sourceID for each boat.
#story[778]
9 years ago
Erika Savell
721fb5f28a
Removed regatta xml creation from Event class into RegattaData class
...
#story[778]
9 years ago
Erika Savell
7f2d8107b8
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
David Wu
d995d5df45
Fixed RegattaDataSource missing.
...
-RegattaDataSource failed to push from before. It is now created and working.
#story[778]
9 years ago
fjc40
2876eec1e4
Added some exception classes to encapsulate the internal exceptions that can occur when sending Boat/race/regatta data.
...
#story[778]
9 years ago
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.
9 years ago
fjc40
2ce84e3be4
Added myself to the .mailmap file.
9 years ago
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]
9 years ago
zwu18
c5df90d276
Created RegattaDataSource and regattaTest.xml.
...
-Event regattaData will now get data from the XML instead of having static data.
#story[778]
9 years ago
Erika Savell
5304f7df7d
removed problematic import
...
#story[778]
9 years ago
Erika Savell
3ff2a07680
Temporarily ignored some tests in mock
...
#story[778]
9 years ago
Erika Savell
a7913a16f9
Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock
9 years ago
Erika Savell
9764f448eb
Added participants field to xml generator
...
#story[778]
9 years ago
Erika Savell
c365d5a344
Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock
9 years ago
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]
9 years ago
Erika Savell
fdba50f9d2
Added course limit, course and marker seq field to xml fiule of race info
...
#story[778]
9 years ago
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]
9 years ago
Erika Savell
737755def6
Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock
9 years ago
Erika Savell
94ba18cf0c
Began xml creator for race info message
...
#story[778]
9 years ago
David Wu
ec716058c6
Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock
9 years ago
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]
9 years ago
fjc40
149c312080
Merge branch 'isolatingMock' of eng-git.canterbury.ac.nz:seng302-2017/team-7 into isolatingMock
9 years ago
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]
9 years ago
David Wu
be59bb853c
Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock
9 years ago
David Wu
265bece9ed
Added a heartbeat value to the race.
...
-Heartbeat will display and update every 5 seconds.
#story[778]
9 years ago
Erika Savell
33e3b3713c
Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock
9 years ago
Erika Savell
97c5c9662b
Wrapped race in an event which sends out starting xml files
...
#story[778]
9 years ago
fjc40
ef53dee7fe
Changed device type constants to bytes.
...
#fix #story[778]
9 years ago
fjc40
421663c145
Added device type enumerations as static ints for BoatLocationMessage.
...
#story[778]
9 years ago
fjc40
1a085e881d
Merge branch 'isolatingMock' of eng-git.canterbury.ac.nz:seng302-2017/team-7 into isolatingMock
9 years ago
fjc40
8da67d1dbc
Added class to encapsulate a BoatLocationMessage.
...
#story[778]
9 years ago
Erika Savell
231a1824d1
Condensed Race and ConstantVelocityRace into one class
...
#story[778]
9 years ago
Erika Savell
34c0aec0b9
Mock race runs without an fx component
...
#story[778]
9 years ago
Erika Savell
3326da4f5d
Started removing fx component from mock module.
...
- Stuck on animation timer not running
#story[778]
9 years ago
Erika Savell
a584400e24
Actually added sub modules this time
...
#story[778]
9 years ago
Erika Savell
669718d406
Cloned the main project into two submodules, mock and visualiser
...
#story[778]
9 years ago
cbt24
d12f70c8f8
Merge remote-tracking branch 'origin/story_30' into story_30
9 years ago
cbt24
0f22cf81ef
Moved implementational details of generated races to ConstantVelocityRace.
...
- Boat headings are now treated as a property, not a calculation
#story[758]
9 years ago
Joseph Gardner
3321727999
Tests for RegattaXMLReader #Story[782]
9 years ago
Joseph Gardner
b825790acd
Moved package to correct spot
9 years ago
Joseph Gardner
c40967f972
Added Regatta class and Regatta xml reader. This will be needed for the mock #Story[30]
9 years ago
Connor Taylor-Brown
316c0dda76
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# src/main/java/seng302/Controllers/RaceController.java
9 years ago
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]
9 years ago
David Wu
668758f6f8
Fixed boat path not being toggled when annotation is toggled.
...
#story[759]
9 years ago
Erika Savell
028cb33509
Fixing fxml problems
...
#story[760]
9 years ago