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

Fixed some issue after merge as well as set the minimum race time to 2 minutes. #story[1323]

Browse Source
This commit is contained in:
Fan-Wu Yang
2017-09-26 16:48:23 +13:00
parent d6884a6981
commit 1ca276ec62
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/java/mock/app/Event.java
+2 -1
View File
@@ -111,7 +111,8 @@ public class Event {
this.raceXML = RaceXMLCreator.alterRaceToWind(this.raceXML, XMLFileType.Contents, -1); this.raceXML = RaceXMLCreator.alterRaceToWind(this.raceXML, XMLFileType.Contents, -1);
} else { } else {
this.raceXML = RaceXMLCreator.alterRaceToWind(this.raceXML, XMLFileType.Contents, windAngle, false); this.raceXML = Event.setRaceXMLAtCurrentTimeToNow(XMLReader.readXMLFileToString(raceXMLFile, StandardCharsets.UTF_8));
this.raceXML = RaceXMLCreator.alterRaceToWind(this.raceXML, XMLFileType.Contents, windAngle);
this.raceXML = RaceXMLCreator.scaleRaceSize(raceXML, this.raceXML = RaceXMLCreator.scaleRaceSize(raceXML,
windSpeed, raceLength); windSpeed, raceLength);
} }
racevisionGame/src/main/java/visualiser/Controllers/HostGameController.java
+1 -1
View File
@@ -62,7 +62,7 @@ public class HostGameController extends Controller {
}); });
// set values and marks to be displayed // set values and marks to be displayed
sliderLength.setMin(1); sliderLength.setMin(2);
sliderLength.setMax(MAX_RACE_LENGTH); sliderLength.setMax(MAX_RACE_LENGTH);
sliderLength.setShowTickLabels(true); sliderLength.setShowTickLabels(true);
sliderLength.setMajorTickUnit(MAX_RACE_LENGTH-1); sliderLength.setMajorTickUnit(MAX_RACE_LENGTH-1);