From 75155fe481fb963e7dbfaa78441d56b5d1a2c3ff Mon Sep 17 00:00:00 2001 From: Peter Galloway Date: Fri, 25 Aug 2017 17:57:45 +1200 Subject: [PATCH 01/30] implemented basic single client proof of concept for the chat history #story[1246] --- .../controllers/RaceViewController.java | 13 ++++++++++ src/main/resources/views/RaceView.fxml | 26 ++++++++++++++++++- 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/src/main/java/seng302/visualiser/controllers/RaceViewController.java b/src/main/java/seng302/visualiser/controllers/RaceViewController.java index a7cd9718..379a2c74 100644 --- a/src/main/java/seng302/visualiser/controllers/RaceViewController.java +++ b/src/main/java/seng302/visualiser/controllers/RaceViewController.java @@ -25,6 +25,8 @@ import javafx.scene.control.Button; import javafx.scene.control.CheckBox; import javafx.scene.control.ComboBox; import javafx.scene.control.Slider; +import javafx.scene.control.TextArea; +import javafx.scene.control.TextField; import javafx.scene.layout.AnchorPane; import javafx.scene.layout.Pane; import javafx.scene.layout.VBox; @@ -53,6 +55,12 @@ import seng302.visualiser.fxObjects.BoatObject; */ public class RaceViewController extends Thread implements ImportantAnnotationDelegate { + @FXML + private Button chatSend; + @FXML + private TextArea chatHistory; + @FXML + private TextField chatInput; @FXML private LineChart raceSparkLine; @FXML @@ -622,4 +630,9 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel this.courseData = raceData; gameView.updateBorder(raceData.getCourseLimit()); } + + @FXML + public void onSendAction() { + chatHistory.setText(chatHistory.getText() + chatInput.getText() + '\n'); + } } \ No newline at end of file diff --git a/src/main/resources/views/RaceView.fxml b/src/main/resources/views/RaceView.fxml index d00f0099..413b38cc 100644 --- a/src/main/resources/views/RaceView.fxml +++ b/src/main/resources/views/RaceView.fxml @@ -47,7 +47,31 @@ + GridPane.columnSpan="2" GridPane.rowSpan="2"> + + + + + +