diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf33..00000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/racevisionGame/src/main/java/visualiser/Controllers/RaceController.java b/racevisionGame/src/main/java/visualiser/Controllers/RaceController.java index 7b495411..e2e8237e 100644 --- a/racevisionGame/src/main/java/visualiser/Controllers/RaceController.java +++ b/racevisionGame/src/main/java/visualiser/Controllers/RaceController.java @@ -10,7 +10,6 @@ import javafx.collections.transformation.SortedList; import javafx.fxml.FXML; import javafx.scene.chart.LineChart; import javafx.scene.control.*; -import javafx.scene.control.Label; import javafx.scene.input.KeyEvent; import javafx.scene.layout.AnchorPane; import javafx.scene.layout.GridPane; @@ -61,6 +60,11 @@ public class RaceController extends Controller { */ private Sparkline sparkline; + /** + * state of the info table + */ + private boolean infoTableShow; + /** * The arrow controller. */ @@ -105,10 +109,14 @@ public class RaceController extends Controller { @Override public void initialize(URL location, ResourceBundle resources) { KeyFactory keyFactory = KeyFactory.getFactory(); + infoTableShow = true; // Initialise keyboard handler race.addEventFilter(KeyEvent.KEY_PRESSED, event -> { String codeString = event.getCode().toString(); + + if (codeString.equals("TAB")){toggleTable();} + ControlKey controlKey = keyFactory.getKey(codeString); if(controlKey != null) { try { @@ -436,4 +444,31 @@ public class RaceController extends Controller { }.start(); } + /** + * toggles if the info table is shown + */ + private void toggleTable() { + double tablePercent = 1 - (boatPlacingColumn.getPrefWidth() + boatTeamColumn.getPrefWidth() + boatMarkColumn.getPrefWidth() + boatSpeedColumn.getPrefWidth())/race.getWidth(); + + if (infoTableShow){ + race.setDividerPositions(tablePercent); + + arrowPane.setScaleX(0.5); + arrowPane.setScaleY(0.5); + arrowPane.setTranslateX(0 + (arrowPane.getScene().getWidth()/4)*tablePercent); + arrowPane.setTranslateY(0 - arrowPane.getScene().getHeight()/4); + + }else{ + race.setDividerPositions(1); + + arrowPane.setScaleX(1); + arrowPane.setScaleY(1); + arrowPane.setTranslateX(0); + arrowPane.setTranslateY(0); + + } + boatInfoTable.refresh(); + infoTableShow = !infoTableShow; + } + } diff --git a/racevisionGame/src/main/resources/visualiser/scenes/race.fxml b/racevisionGame/src/main/resources/visualiser/scenes/race.fxml index 718e65ff..bbc1c077 100644 --- a/racevisionGame/src/main/resources/visualiser/scenes/race.fxml +++ b/racevisionGame/src/main/resources/visualiser/scenes/race.fxml @@ -1,9 +1,5 @@ - - - - @@ -26,7 +22,7 @@ - +