|
|
|
@ -3,15 +3,18 @@ package seng302.Controllers;
|
|
|
|
|
|
|
|
|
|
|
|
import javafx.collections.ObservableList;
|
|
|
|
import javafx.collections.ObservableList;
|
|
|
|
import javafx.fxml.FXML;
|
|
|
|
import javafx.fxml.FXML;
|
|
|
|
|
|
|
|
import javafx.scene.chart.LineChart;
|
|
|
|
|
|
|
|
import javafx.scene.chart.NumberAxis;
|
|
|
|
|
|
|
|
import javafx.scene.chart.XYChart;
|
|
|
|
import javafx.scene.control.*;
|
|
|
|
import javafx.scene.control.*;
|
|
|
|
import javafx.scene.layout.GridPane;
|
|
|
|
import javafx.scene.layout.GridPane;
|
|
|
|
|
|
|
|
import javafx.scene.paint.Color;
|
|
|
|
import seng302.Mock.StreamedRace;
|
|
|
|
import seng302.Mock.StreamedRace;
|
|
|
|
import seng302.Model.*;
|
|
|
|
import seng302.Model.*;
|
|
|
|
import seng302.VisualiserInput;
|
|
|
|
import seng302.VisualiserInput;
|
|
|
|
|
|
|
|
|
|
|
|
import java.net.URL;
|
|
|
|
import java.net.URL;
|
|
|
|
import java.util.ArrayList;
|
|
|
|
import java.util.*;
|
|
|
|
import java.util.ResourceBundle;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* Created by fwy13 on 15/03/2017.
|
|
|
|
* Created by fwy13 on 15/03/2017.
|
|
|
|
@ -21,9 +24,13 @@ public class RaceController extends Controller {
|
|
|
|
|
|
|
|
|
|
|
|
//user saved data for annotation display
|
|
|
|
//user saved data for annotation display
|
|
|
|
private ArrayList<Boolean> presetAnno;
|
|
|
|
private ArrayList<Boolean> presetAnno;
|
|
|
|
|
|
|
|
private ArrayList<Boat> startBoats;
|
|
|
|
|
|
|
|
private Integer sparkLineNumber = 0;
|
|
|
|
private ResizableRaceCanvas raceMap;
|
|
|
|
private ResizableRaceCanvas raceMap;
|
|
|
|
private ResizableRaceMap raceBoundaries;
|
|
|
|
private ResizableRaceMap raceBoundaries;
|
|
|
|
|
|
|
|
private ArrayList<String> colours;
|
|
|
|
|
|
|
|
private Map<Integer, String> boatColours = new HashMap<>();
|
|
|
|
|
|
|
|
private int legNum;
|
|
|
|
@FXML SplitPane race;
|
|
|
|
@FXML SplitPane race;
|
|
|
|
@FXML CheckBox showFPS;
|
|
|
|
@FXML CheckBox showFPS;
|
|
|
|
@FXML CheckBox showBoatPath;
|
|
|
|
@FXML CheckBox showBoatPath;
|
|
|
|
@ -41,6 +48,9 @@ public class RaceController extends Controller {
|
|
|
|
@FXML TableColumn<Boat, String> boatTeamColumn;
|
|
|
|
@FXML TableColumn<Boat, String> boatTeamColumn;
|
|
|
|
@FXML TableColumn<Boat, String> boatMarkColumn;
|
|
|
|
@FXML TableColumn<Boat, String> boatMarkColumn;
|
|
|
|
@FXML TableColumn<Boat, String> boatSpeedColumn;
|
|
|
|
@FXML TableColumn<Boat, String> boatSpeedColumn;
|
|
|
|
|
|
|
|
@FXML LineChart<Number, Number> sparklineChart;
|
|
|
|
|
|
|
|
@FXML NumberAxis xAxis;
|
|
|
|
|
|
|
|
@FXML NumberAxis yAxis;
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* Updates the ResizableRaceCanvas (raceMap) with most recent data
|
|
|
|
* Updates the ResizableRaceCanvas (raceMap) with most recent data
|
|
|
|
@ -76,6 +86,7 @@ public class RaceController extends Controller {
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public void initialize(URL location, ResourceBundle resources) {
|
|
|
|
public void initialize(URL location, ResourceBundle resources) {
|
|
|
|
//listener for fps
|
|
|
|
//listener for fps
|
|
|
|
|
|
|
|
startBoats = new ArrayList<>();
|
|
|
|
showFPS.selectedProperty().addListener((ov, old_val, new_val) -> {
|
|
|
|
showFPS.selectedProperty().addListener((ov, old_val, new_val) -> {
|
|
|
|
if (showFPS.isSelected()) {
|
|
|
|
if (showFPS.isSelected()) {
|
|
|
|
FPS.setVisible(true);
|
|
|
|
FPS.setVisible(true);
|
|
|
|
@ -85,6 +96,64 @@ public class RaceController extends Controller {
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
|
|
|
* Creates and sets initial display for Sparkline for race positions.
|
|
|
|
|
|
|
|
* A data series for each boat in the race is added.
|
|
|
|
|
|
|
|
* Position numbers are displayed.
|
|
|
|
|
|
|
|
*
|
|
|
|
|
|
|
|
* @param boats boats to display on the sparkline
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
public void createSparkLine(ObservableList<Boat> boats){
|
|
|
|
|
|
|
|
// NOTE: Y axis is in negatives to display correct positions
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
makeColours();
|
|
|
|
|
|
|
|
startBoats.addAll(boats);
|
|
|
|
|
|
|
|
mapBoatColours();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// all boats start in 'last' place
|
|
|
|
|
|
|
|
for (int i=0; i<startBoats.size(); i++){
|
|
|
|
|
|
|
|
XYChart.Series<Number, Number> series = new XYChart.Series();
|
|
|
|
|
|
|
|
series.getData().add(new XYChart.Data(0, -startBoats.size()));
|
|
|
|
|
|
|
|
series.getData().add(new XYChart.Data(0, -startBoats.size()));
|
|
|
|
|
|
|
|
sparklineChart.getData().add(series);
|
|
|
|
|
|
|
|
sparklineChart.getData().get(i).getNode().setStyle("-fx-stroke: " +
|
|
|
|
|
|
|
|
""+boatColours.get(startBoats.get(i).getSourceID())+";");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
sparklineChart.setCreateSymbols(false);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// set x axis details
|
|
|
|
|
|
|
|
xAxis.setAutoRanging(false);
|
|
|
|
|
|
|
|
xAxis.setTickMarkVisible(false);
|
|
|
|
|
|
|
|
xAxis.setTickLabelsVisible(false);
|
|
|
|
|
|
|
|
xAxis.setMinorTickVisible(false);
|
|
|
|
|
|
|
|
xAxis.setUpperBound(startBoats.size()*legNum);
|
|
|
|
|
|
|
|
xAxis.setTickUnit(startBoats.size()*legNum);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// set y axis details
|
|
|
|
|
|
|
|
yAxis.setLowerBound(-(startBoats.size()+1));
|
|
|
|
|
|
|
|
yAxis.setUpperBound(0);
|
|
|
|
|
|
|
|
yAxis.setAutoRanging(false);
|
|
|
|
|
|
|
|
yAxis.setLabel("Position in Race");
|
|
|
|
|
|
|
|
yAxis.setTickUnit(1);
|
|
|
|
|
|
|
|
yAxis.setTickMarkVisible(false);
|
|
|
|
|
|
|
|
yAxis.setMinorTickVisible(false);
|
|
|
|
|
|
|
|
// hide minus number from displaying on axis
|
|
|
|
|
|
|
|
yAxis.setTickLabelFormatter(new NumberAxis.DefaultFormatter(yAxis) {
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
|
|
|
public String toString(Number value) {
|
|
|
|
|
|
|
|
if ((Double)value == 0.0
|
|
|
|
|
|
|
|
|| (Double)value < -startBoats.size()){
|
|
|
|
|
|
|
|
return "";
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else {
|
|
|
|
|
|
|
|
return String.format("%7.0f", -value.doubleValue());
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* Initializes and runs the race, based on the user's chosen scale factor
|
|
|
|
* Initializes and runs the race, based on the user's chosen scale factor
|
|
|
|
* Currently uses an example racecourse
|
|
|
|
* Currently uses an example racecourse
|
|
|
|
@ -95,7 +164,7 @@ public class RaceController extends Controller {
|
|
|
|
public void startRace(VisualiserInput visualiserInput, RaceClock raceClock) {
|
|
|
|
public void startRace(VisualiserInput visualiserInput, RaceClock raceClock) {
|
|
|
|
StreamedRace newRace = new StreamedRace(visualiserInput, this);
|
|
|
|
StreamedRace newRace = new StreamedRace(visualiserInput, this);
|
|
|
|
//newRace.initialiseBoats();
|
|
|
|
//newRace.initialiseBoats();
|
|
|
|
|
|
|
|
legNum = visualiserInput.getCourse().getLegs().size()-1;
|
|
|
|
raceMap = new ResizableRaceCanvas(visualiserInput.getCourse());
|
|
|
|
raceMap = new ResizableRaceCanvas(visualiserInput.getCourse());
|
|
|
|
raceMap.setMouseTransparent(true);
|
|
|
|
raceMap.setMouseTransparent(true);
|
|
|
|
raceMap.widthProperty().bind(canvasBase.widthProperty());
|
|
|
|
raceMap.widthProperty().bind(canvasBase.widthProperty());
|
|
|
|
@ -163,6 +232,77 @@ public class RaceController extends Controller {
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
|
|
|
* Updates the sparkline to display current boat positions.
|
|
|
|
|
|
|
|
* New points are plotted to represent each boat when required.
|
|
|
|
|
|
|
|
*
|
|
|
|
|
|
|
|
* @param boatsInRace used for current boat positions.
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
public void updateSparkline(ObservableList<Boat> boatsInRace){
|
|
|
|
|
|
|
|
int placingVal = boatsInRace.size();
|
|
|
|
|
|
|
|
sparkLineNumber++;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
for (int i = boatsInRace.size() - 1; i >= 0; i--){
|
|
|
|
|
|
|
|
for (int j = startBoats.size() - 1; j >= 0; j--){
|
|
|
|
|
|
|
|
if (boatsInRace.get(i)==startBoats.get(j)){
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// when a boat is on its first leg
|
|
|
|
|
|
|
|
if (boatsInRace.get(i).getCurrentLeg().getLegNumber()==0){
|
|
|
|
|
|
|
|
// adjust boats latest point on X axis
|
|
|
|
|
|
|
|
sparklineChart.getData().get(j).getData().get(1)
|
|
|
|
|
|
|
|
.setXValue(sparkLineNumber);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// when a boat first enters its second leg
|
|
|
|
|
|
|
|
else if (boatsInRace.get(i).getCurrentLeg().getLegNumber
|
|
|
|
|
|
|
|
()==1 && sparklineChart.getData().get(j).getData
|
|
|
|
|
|
|
|
().size()==2){
|
|
|
|
|
|
|
|
// adjust boats position from start mark
|
|
|
|
|
|
|
|
sparklineChart.getData().get(j).getData().get(1)
|
|
|
|
|
|
|
|
.setYValue(-placingVal);
|
|
|
|
|
|
|
|
sparklineChart.getData().get(j).getData().get(1)
|
|
|
|
|
|
|
|
.setXValue(sparkLineNumber);
|
|
|
|
|
|
|
|
sparklineChart.getData().get(j).getData().add(new XYChart.Data<>
|
|
|
|
|
|
|
|
(sparkLineNumber, -placingVal));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// plot new point for boats current position
|
|
|
|
|
|
|
|
else {
|
|
|
|
|
|
|
|
sparklineChart.getData().get(j).getData().add
|
|
|
|
|
|
|
|
(new XYChart.Data<>(sparkLineNumber, -placingVal));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
placingVal-=1;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
// xAxis.setUpperBound(sparkLineNumber);
|
|
|
|
|
|
|
|
// xAxis.setTickUnit(sparkLineNumber);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private void makeColours() {
|
|
|
|
|
|
|
|
colours = new ArrayList<>(Arrays.asList(
|
|
|
|
|
|
|
|
colourToHex(Color.BLUEVIOLET),
|
|
|
|
|
|
|
|
colourToHex(Color.BLACK),
|
|
|
|
|
|
|
|
colourToHex(Color.RED),
|
|
|
|
|
|
|
|
colourToHex(Color.ORANGE),
|
|
|
|
|
|
|
|
colourToHex(Color.DARKOLIVEGREEN),
|
|
|
|
|
|
|
|
colourToHex(Color.LIMEGREEN),
|
|
|
|
|
|
|
|
colourToHex(Color.PURPLE),
|
|
|
|
|
|
|
|
colourToHex(Color.DARKGRAY),
|
|
|
|
|
|
|
|
colourToHex(Color.YELLOW)
|
|
|
|
|
|
|
|
));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private void mapBoatColours() {
|
|
|
|
|
|
|
|
int currentColour = 0;
|
|
|
|
|
|
|
|
for (Boat boat : startBoats) {
|
|
|
|
|
|
|
|
if (!boatColours.containsKey(boat.getSourceID())) {
|
|
|
|
|
|
|
|
boatColours.put(boat.getSourceID(), colours.get(currentColour));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
currentColour = (currentColour + 1) % colours.size();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* Set up boat annotations
|
|
|
|
* Set up boat annotations
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@ -213,4 +353,11 @@ public class RaceController extends Controller {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private String colourToHex(Color color) {
|
|
|
|
|
|
|
|
return String.format( "#%02X%02X%02X",
|
|
|
|
|
|
|
|
(int)( color.getRed() * 255 ),
|
|
|
|
|
|
|
|
(int)( color.getGreen() * 255 ),
|
|
|
|
|
|
|
|
(int)( color.getBlue() * 255 ) );
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|