85f4117666
Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story13
...
# Conflicts:
# src/main/java/seng302/Controllers/RaceController.java
9 years ago
456925c4c6
Implemented table view for finishing list
...
- Added auto-numbered placing, team name, and last mark columns
- Added dummy 'Finish' mark to race
- Added callback for race to update controller
#story [13]
9 years ago
2811a09784
Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9
9 years ago
bc4701ef32
Fixed Canvas not filling screen issue
...
- Created ResizableRaceCanvas Class
- Moved all draw functions to ResizableRaceCanvas
#fix
9 years ago
d393766027
Partially completed story 13
9 years ago
ddbb77a610
Arrow is now movable around the canvas
...
-Arrow method is changed to take coordinates and an angle
-Arrow will now be drawn around the coordinate
#story [14]
9 years ago
b82ded6014
Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9
9 years ago
8090108b12
Began implementing function to calculate boat's new coordinates
...
-Using haversine function
-current values being produced are too small
#implement #story[9]
9 years ago
43c84cb677
Added draw ability to draw arrow on the canvas
...
- displayArrow() function created
- rotate() function created.
#story [14] #pair[fwy13, zwu18]
9 years ago
2551dd7362
Added single test to debug race process
9 years ago
dbbfece149
Fixed resources issue
9 years ago
6f509e25ea
Implementing the boats movement throught a race
...
-Not complete! Still need to create function to calculate new coordinates
-Doesn't run because of problems with resource folder
#refactor
9 years ago
b73fee2cb5
Rewriting code to work with the transplanted loop
...
- Event has been replaced by leg, which holds the start and end coordinates, and total distance needed to pass it.
- The boats coordinates will be recalculated at each run through of the loop
- Not worrying about randomised race for now.
#refactor
9 years ago
54d4ea2d03
Merge remote-tracking branch 'origin/story9' into mergePacedLoop
...
# Conflicts:
# .idea/compiler.xml
# .idea/misc.xml
9 years ago
0dc5efd830
Just trying to fix my ide
9 years ago
ffaed5ef47
Implemented Finish Line
...
-Altered others drawing to utilise drawLine in RaceMap
-Added Finish Line
-Rescaled Canvas (To be fixed in the future).
#story[11]
9 years ago
ec03ec9be9
Merge remote-tracking branch 'origin/story9' into story9
...
# Conflicts:
# src/main/java/seng302/Controllers/RaceController.java
9 years ago
b4baba8c15
Implemented display a gate as a line
...
-method created to add a line to canvas
-added points for mark, north gate, and south gate
#story [12]
9 years ago
5108c0eaf5
Implemented Finish Line to show
...
- shows a dark red line with 2 thickness
- shows two rectangles at the ends of each line
#story [11]
9 years ago
6c3b7ccee7
Implemented start line in RaceController
...
- Added coordinates as given in Story 10
- Displayed start line
- Marked line ends with circles
#story [10]
9 years ago
6ca26d5bb1
Implemented race map usage by JavaFX controller
...
- Renamed Map to RaceMap
- Fixed RaceMap.convertGPS bug
- Defined canvas coordinates in terms of map GPS
#story [9] #pair [cbt24,fwy13,zwu18]
9 years ago
0729ae719d
Implemented Display a Boat as a circle.
...
- created displayBoat function which will display a circle at a Coordinate.
#story[9] #pair[cbt24, fwy13]
9 years ago
fbb3094da8
Implemented GPS coordinate to screen coordinate conversion
...
- Created Coordinate class with getters
- Created Map class
- Created convertGPS method in Map
#story [9], #pair [cbt24,fwy13]
9 years ago
41cdf09dc2
Started merging team 8 paced loop into team 7 codebase.
...
-No running! Syntax errors and not done merging
-Just pushing so David can pull changes
#pair[zwu18, esa46]
9 years ago
a7c64dc401
Implemented base UI and abstract controller for parent coupling
...
-Added Controller abstract class that all JavaFX controllers are to be a child of.
-Added MainController in case in the future we need a menu.
-Added mainpane.fxml as a base pane that we can mount the future menu on.
-Added RaceController so where the race will be made and displayed.
-Added racepane.fxml which includes a Canvas and a tableview
-Added loadPane() function to the mainApp which will swap the pane the app is currently on.
#story[9]
9 years ago
3ac93ae1e5
Documentation and Refactor
...
- Changed Race to an abstract class
- Protected and privated certain variables
- Wrote Javadocs for the classes and functions
- Moved generate race from RandomisedRace and ConstantVelocityRace to the abstract Race class
- Added string checking exception for Scanner for whether to run in 1 minute or 5 minutes
#pair[fwy13, cbt24]
9 years ago
2d777b8903
Implemented user input
...
- Changed it from launching the program with args setting to with Scanner.
- Changed field 'factor' to 'timescale' in Race class
#story [5] #pair[fwy13, cbt24]
9 years ago
1a9cf5bdda
Allow users to choose timescale of race playback. Playback is ~1 min by default, real-time selected with command line variable '-5'. Rescaled race marker positions to distances appropriate for a ~5 minute race.
9 years ago
b1f588248b
Display list of finishers after race ends.
9 years ago
2db4beadcb
Boats now display knots, also the racecouse has been modified to reflect the AC35 racecourse via linear coordinates.
9 years ago
f62c4dcb3d
Added Display of all Boats participating in the race, and a message to seperate this and the events in the console.
9 years ago
377683ef8c
Displayed information for all boats.
9 years ago
00bd194361
Added heading from each event that the boat is heading towards.
9 years ago
7c0d9203a5
Boats pass marks at times according to boat speed and distance of mark from start.
9 years ago
4f6ab7b4bc
Added simulation of a race with randomised time events. This is reported in time order and shown in the console which is displayed as "Boat passed Mark at 60 (seconds)"
9 years ago
2148c1e06d
Added mark and gate events to race
9 years ago
02cc98b0b6
Story 3 complete added all AC35 Teams into the program.
9 years ago
987dcdac01
Display order of boats per event
9 years ago
21487340ab
Story 1 completion, Added Boat and Event classes. The program displays two boats New Zealand and America.
9 years ago
7ef64ad7a0
Moved CI runner set-up instructions to student guide.
9 years ago
fea7c98874
Added .mailmap file (includes basic info for students)
10 years ago
bf3a0eb713
update maven pom
...
embed properties that were in a local settings.xml
fix tag names and properties that have changed from maven 2 and new plugin versions
specify compiler plugin version.
10 years ago
9649f67863
initial commit
10 years ago
cbt24
Erika Savell
Fan-Wu Yang
David Wu
Connor Benjamin Alexander Taylor Brown
SENG302