Remove start button from StartController.
#story[778]
This commit is contained in:
@@ -43,7 +43,7 @@ public class StartController extends Controller implements Observer {
|
||||
@FXML private Label timer;
|
||||
@FXML private int PRERACE_TIME = 10;
|
||||
|
||||
@FXML Button fifteenMinButton;
|
||||
//@FXML Button fifteenMinButton;
|
||||
|
||||
private RaceClock raceClock;
|
||||
|
||||
@@ -56,12 +56,13 @@ public class StartController extends Controller implements Observer {
|
||||
* Begins the race with a scale factor of 1
|
||||
*/
|
||||
public void startRaceNoScaling() {
|
||||
startRace(1);
|
||||
//startRace(1);
|
||||
countdownTimer(1);
|
||||
}
|
||||
|
||||
private void startRace(int raceScale){
|
||||
fifteenMinButton.setDisable(true);
|
||||
countdownTimer(raceScale);
|
||||
//fifteenMinButton.setDisable(true);
|
||||
//countdownTimer(raceScale);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -107,11 +108,12 @@ public class StartController extends Controller implements Observer {
|
||||
@Override
|
||||
public void handle(long arg0) {
|
||||
timeLeft = startTime - currentTime;
|
||||
if (timeLeft <= 0) {
|
||||
if (visualiserInput.getRaceStatus().getRaceStatus()==2) {
|
||||
updateTime("Race is starting...");
|
||||
stop();
|
||||
parent.beginRace(visualiserInput);
|
||||
startWrapper.setVisible(false);
|
||||
start.setVisible(false);
|
||||
|
||||
} else {
|
||||
updateTime(timerFormat.format(currentTime));
|
||||
@@ -166,4 +168,5 @@ public class StartController extends Controller implements Observer {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<?import java.lang.*?>
|
||||
<?import javafx.scene.control.*?>
|
||||
<?import javafx.scene.layout.*?>
|
||||
<?import javafx.scene.text.*?>
|
||||
<?import javafx.scene.control.Button?>
|
||||
<?import javafx.scene.control.Label?>
|
||||
<?import javafx.scene.control.TableColumn?>
|
||||
@@ -10,7 +14,7 @@
|
||||
<?import javafx.scene.layout.RowConstraints?>
|
||||
<?import javafx.scene.text.Font?>
|
||||
|
||||
<AnchorPane fx:id="startWrapper" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" visible="false" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng302.Controllers.StartController">
|
||||
<AnchorPane fx:id="startWrapper" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng302.Controllers.StartController">
|
||||
<children>
|
||||
<GridPane fx:id="start" prefHeight="600.0" prefWidth="780.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
|
||||
<columnConstraints>
|
||||
@@ -29,7 +33,6 @@
|
||||
<RowConstraints maxHeight="191.5" minHeight="10.0" prefHeight="82.0" vgrow="SOMETIMES" />
|
||||
</rowConstraints>
|
||||
<children>
|
||||
<Button fx:id="fifteenMinButton" maxWidth="-Infinity" minWidth="-Infinity" mnemonicParsing="false" onAction="#startRaceNoScaling" prefWidth="100.0" text="Start" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.rowIndex="4" />
|
||||
<TableView fx:id="boatNameTable" prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.columnSpan="3" GridPane.rowIndex="2">
|
||||
<placeholder>
|
||||
<Label text="Initial lineup..." />
|
||||
|
||||
@@ -4,7 +4,8 @@ import org.junit.Before;
|
||||
import org.junit.Ignore;
|
||||
import org.junit.Test;
|
||||
|
||||
import static org.testng.Assert.*;
|
||||
import static org.junit.Assert.assertFalse;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
|
||||
/**
|
||||
* Created by connortaylorbrown on 3/05/17.
|
||||
|
||||
Reference in New Issue
Block a user