diff --git a/racevisionGame/src/main/java/visualiser/Controllers/HostController.java b/racevisionGame/src/main/java/visualiser/Controllers/HostController.java index d6263e3e..3e5a134e 100644 --- a/racevisionGame/src/main/java/visualiser/Controllers/HostController.java +++ b/racevisionGame/src/main/java/visualiser/Controllers/HostController.java @@ -5,12 +5,17 @@ import javafx.fxml.FXML; import javafx.scene.control.*; import javafx.scene.layout.AnchorPane; import javafx.stage.Stage; -import mock.app.App; +import mock.app.Event; +import shared.exceptions.InvalidBoatDataException; +import shared.exceptions.InvalidRaceDataException; +import shared.exceptions.InvalidRegattaDataException; +import shared.exceptions.XMLReaderException; import visualiser.model.RaceConnection; import java.io.IOException; import java.net.Socket; import java.net.URL; +import java.net.UnknownHostException; import java.util.ResourceBundle; /** @@ -33,10 +38,20 @@ public class HostController extends Controller { } public void hostGamePressed() throws IOException{ - new App().start(new Stage()); - System.out.println("Run mock"); - connectSocket(); - } + try { + Event game = Event.getEvent(); + game.start(); + connectSocket(); + } catch (InvalidRaceDataException e) { + e.printStackTrace(); + } catch (XMLReaderException e) { + e.printStackTrace(); + } catch (InvalidBoatDataException e) { + e.printStackTrace(); + } catch (InvalidRegattaDataException e) { + e.printStackTrace(); + + }} public void connectSocket() { try{ diff --git a/racevisionGame/src/main/java/visualiser/Controllers/TitleController.java b/racevisionGame/src/main/java/visualiser/Controllers/TitleController.java index b3613dab..c2f793ef 100644 --- a/racevisionGame/src/main/java/visualiser/Controllers/TitleController.java +++ b/racevisionGame/src/main/java/visualiser/Controllers/TitleController.java @@ -32,28 +32,12 @@ public class TitleController extends Controller { * @throws IOException if main has problems */ public void hostAGame() throws IOException { - // load up the main window - /*Stage stage = new Stage(); - FXMLLoader loader = new FXMLLoader(getClass().getResource("/visualiser/scenes/main.fxml")); - Parent root = loader.load(); - Scene scene = new Scene(root, 1200, 800); - scene.getStylesheets().add("/css/nightMode.css"); - - stage.setScene(scene); - stage.setTitle("RaceVision - Team 7"); - stage.getIcons().add(new Image(getClass().getClassLoader().getResourceAsStream("images/SailIcon.png"))); - stage.show(); - - // close title screen - Stage stageOld = (Stage)btnJoin.getScene().getWindow(); - stageOld.close();*/ titleWrapper.setVisible(false); parent.hostGame(); } public void enterTitle(){ - titleWrapper.setVisible(true); } diff --git a/racevisionGame/src/main/java/visualiser/app/App.java b/racevisionGame/src/main/java/visualiser/app/App.java index 325977ac..05d733d1 100644 --- a/racevisionGame/src/main/java/visualiser/app/App.java +++ b/racevisionGame/src/main/java/visualiser/app/App.java @@ -35,14 +35,12 @@ public class App extends Application { System.exit(0); } }); - FXMLLoader loader = new FXMLLoader(getClass().getResource - ("/visualiser/scenes/main.fxml")); + FXMLLoader loader = new FXMLLoader(getClass().getResource("/visualiser/scenes/main.fxml")); Parent root = loader.load(); stage.setResizable(false); MainController mc = (MainController) loader.getController(); mc.enterTitle(); Scene scene = new Scene(root); - System.out.println(scene.getHeight()); stage.setScene(scene); stage.setTitle("RaceVision - Team 7"); diff --git a/racevisionGame/src/main/java/visualiser/model/RaceConnection.java b/racevisionGame/src/main/java/visualiser/model/RaceConnection.java index 92130095..ca4ddd32 100644 --- a/racevisionGame/src/main/java/visualiser/model/RaceConnection.java +++ b/racevisionGame/src/main/java/visualiser/model/RaceConnection.java @@ -16,13 +16,13 @@ public class RaceConnection { private final StringProperty status; private final StringProperty gamename; - public RaceConnection(String hostname, int port, String gamename) { + /** * Constructor for remote host connections. * @param hostname URL for remote host * @param port port for game feed */ - public RaceConnection(String hostname, int port) { + public RaceConnection(String hostname, int port, String gamename) { this.hostname = new SimpleStringProperty(hostname); this.port = port; this.status = new SimpleStringProperty(""); @@ -34,7 +34,6 @@ public class RaceConnection { * Tries to create a socket to hostname and port, indicates status after test. * @return true if socket can connect */ - @SuppressWarnings("unused") public boolean check() { //TODO the connection needs to be moved to its own thread, so it doesn't block fx thread. InetSocketAddress i = new InetSocketAddress(hostname.get(), port); diff --git a/racevisionGame/src/main/resources/visualiser/scenes/connect.fxml b/racevisionGame/src/main/resources/visualiser/scenes/connect.fxml index 32384999..f620bfeb 100644 --- a/racevisionGame/src/main/resources/visualiser/scenes/connect.fxml +++ b/racevisionGame/src/main/resources/visualiser/scenes/connect.fxml @@ -1,10 +1,13 @@ + + - + + diff --git a/racevisionGame/src/main/resources/visualiser/scenes/main.fxml b/racevisionGame/src/main/resources/visualiser/scenes/main.fxml index 340f2d20..99e802e5 100644 --- a/racevisionGame/src/main/resources/visualiser/scenes/main.fxml +++ b/racevisionGame/src/main/resources/visualiser/scenes/main.fxml @@ -1,7 +1,10 @@ + + - + + diff --git a/racevisionGame/src/main/resources/visualiser/scenes/titleScreen.fxml b/racevisionGame/src/main/resources/visualiser/scenes/titleScreen.fxml index b7559a9a..730af6ef 100644 --- a/racevisionGame/src/main/resources/visualiser/scenes/titleScreen.fxml +++ b/racevisionGame/src/main/resources/visualiser/scenes/titleScreen.fxml @@ -15,7 +15,7 @@ - +