fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Lowered frequency sparkline updates

Browse Source 
- sparkline only updates when a boat passes a point
- all lines start in the middle
- slow frame rate issue resolved

#story[876]
This commit is contained in:
Jessica McAuslin
2017-05-17 19:15:28 +12:00
parent f999967cd5
commit 2e1f8a2e9a
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
visualiser/src/main/java/seng302/Controllers/RaceController.java
+2 -2
View File
@@ -102,8 +102,9 @@ public class RaceController extends Controller {
startBoats.add(boat); startBoats.add(boat);
} }
for (int i=0; i<startBoats.size(); i++){ for (int i=0; i<startBoats.size(); i++){
Float startPos = ((float)startBoats.size()+1)/2;
XYChart.Series<Number, Number> series = new XYChart.Series(); XYChart.Series<Number, Number> series = new XYChart.Series();
series.getData().add(new XYChart.Data(0, i+1)); series.getData().add(new XYChart.Data(0, startPos));
sparklineChart.getData().add(series); sparklineChart.getData().add(series);
} }
@@ -209,7 +210,6 @@ public class RaceController extends Controller {
//int [] boatsInRace = {1, 2, 3, 4, 5, 6}; //int [] boatsInRace = {1, 2, 3, 4, 5, 6};
int placingVal = boatsInRace.size(); int placingVal = boatsInRace.size();
//System.out.println(boatsInRace.get(0).toString()); //System.out.println(boatsInRace.get(0).toString());
System.out.println(startBoats.get(0).toString());
sparkLineNumber++; sparkLineNumber++;
for (int i=0; i<boatsInRace.size(); i++){ for (int i=0; i<boatsInRace.size(); i++){
for (int j=0; j<startBoats.size(); j++){ for (int j=0; j<startBoats.size(); j++){
visualiser/src/main/java/seng302/Mock/StreamedRace.java
+4 -1
View File
@@ -84,7 +84,10 @@ public class StreamedRace implements Runnable {
int legNumber = boatStatusMessage.getLegNumber(); int legNumber = boatStatusMessage.getLegNumber();
if (legNumber >= 1 && legNumber < legs.size()) { if (legNumber >= 1 && legNumber < legs.size()) {
if (boat.getCurrentLeg() != legs.get(legNumber)){
boat.setCurrentLeg(legs.get(legNumber)); boat.setCurrentLeg(legs.get(legNumber));
controller.updateSparkline(startingBoats);
}
} }
if (boatStatusEnum == BoatStatusEnum.RACING) { if (boatStatusEnum == BoatStatusEnum.RACING) {
@@ -190,7 +193,7 @@ public class StreamedRace implements Runnable {
public void handle(long arg0) { public void handle(long arg0) {
if (boatsFinished < startingBoats.size()) { if (boatsFinished < startingBoats.size()) {
boatsFinished = 0; boatsFinished = 0;
controller.updateSparkline(startingBoats); //controller.updateSparkline(startingBoats);
totalTimeElapsed = System.currentTimeMillis() - timeRaceStarted; totalTimeElapsed = System.currentTimeMillis() - timeRaceStarted;
for (Boat boat : startingBoats) { for (Boat boat : startingBoats) {