diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MenuBorderPaneController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MenuBorderPaneController.java index d0a9572af9d11c5ba023c951d987fbed453be1c3..49dc199bb7b3fb74ef1962070992960f2b110326 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MenuBorderPaneController.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MenuBorderPaneController.java @@ -37,7 +37,6 @@ public class MenuBorderPaneController implements Initializable { List<String> shuffledVideos = Arrays.asList(videoFiles); Rectangle2D screen = Screen.getPrimary().getVisualBounds(); - Screen windows = Screen.getPrimary(); @Override public void initialize(URL url, ResourceBundle resourceBundle) { center.getChildren().add(sceneLoader.loadScene("MainMenu")); diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/StatisticsController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/StatisticsController.java index e50fbec724aa8cd0b61930e45d3f19b96207dcfe..e5a6196af7672f681b40368721a12755853db140 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/StatisticsController.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/StatisticsController.java @@ -27,9 +27,12 @@ public class StatisticsController implements Initializable { parent.getChildren().add(sceneLoader.loadScene("MainMenu")); } + @Override public void initialize(URL url, ResourceBundle resourceBundle) { iniPieChartkd(); iniPieChartwl(); + kd.setLegendVisible(false); + wl.setLegendVisible(false); } public void iniPieChartkd() { diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Main/Main.java b/src/main/java/de/hdm_stuttgart/battlearena/Main/Main.java index 6e767ce6095035a20943a911f6d867b55f577155..1925554e2b86d0efcb4b469b1ca2d799c6ecaec0 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Main/Main.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Main/Main.java @@ -33,7 +33,8 @@ public class Main extends Application { // loading font in start() because CSS can't handle whitespace in folder names Font.loadFont(getClass().getResourceAsStream("/fonts/StarshipShadow.ttf"), 50); - Parent root = FXMLLoader.load(Objects.requireNonNull(getClass().getResource("/fxml/Intro.fxml"))); +// TODO: revert back to intro scene + Parent root = FXMLLoader.load(Objects.requireNonNull(getClass().getResource("/fxml/MenuBorderPane.fxml"))); Scene scene = new Scene(root); diff --git a/src/main/resources/fxml/Statistics.fxml b/src/main/resources/fxml/Statistics.fxml index cb429d7b51d3d377a00e0495feee430c61cd7998..6c98b4e5e5aa7e8efd880b6945b8c7091aa04d32 100644 --- a/src/main/resources/fxml/Statistics.fxml +++ b/src/main/resources/fxml/Statistics.fxml @@ -7,10 +7,9 @@ <?import javafx.scene.layout.VBox?> <?import javafx.scene.text.Text?> - <VBox fx:id="parent" alignment="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" spacing="50.0" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hdm_stuttgart.battlearena.Controller.StatisticsController"> <children> - <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" spacing="30.0"> + <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" spacing="30.0" VBox.vgrow="ALWAYS"> <children> <VBox alignment="CENTER_RIGHT" prefHeight="200.0" prefWidth="100.0" spacing="10.0" HBox.hgrow="ALWAYS"> <children> @@ -35,10 +34,16 @@ <Insets /> </HBox.margin> </VBox> - <VBox prefHeight="200.0" prefWidth="100.0"> + <VBox prefHeight="200.0" prefWidth="100.0" HBox.hgrow="ALWAYS"> <children> - <PieChart fx:id="kd" /> - <PieChart fx:id="wl" /> + <PieChart fx:id="kd" minHeight="-Infinity" minWidth="-Infinity" VBox.vgrow="ALWAYS"> + <VBox.margin> + <Insets bottom="-200.0" /> + </VBox.margin></PieChart> + <PieChart fx:id="wl" minHeight="-Infinity" minWidth="-Infinity" VBox.vgrow="ALWAYS"> + <VBox.margin> + <Insets top="-40.0" /> + </VBox.margin></PieChart> </children> </VBox> </children> diff --git a/src/main/resources/styles/style.css b/src/main/resources/styles/style.css index b66dc39809bc14237d0d4a55b10861b6e98baa07..5ba6c2d273c9ac17509b5bcfbd772abec2725706 100644 --- a/src/main/resources/styles/style.css +++ b/src/main/resources/styles/style.css @@ -155,4 +155,29 @@ .table-row-cell:selected { -fx-background-color: rgba(255, 255, 255, 0.3); -} \ No newline at end of file +} + +.chart { + -fx-pref-width: 600; + -fx-pref-height: 620; + -fx-min-width: 600; + -fx-min-height: 620; + -fx-max-width: 916; + -fx-max-height: 620; +} + +.chart-pie { + -fx-border-color: black; +} + +.chart-pie-label { + -fx-font-size: 0.7em; +} + +.chart-legend { + -fx-background-color: rgba(60, 32, 20, 0.2); +} + +.default-color0.chart-pie {-fx-pie-color: transparent;} +.default-color1.chart-pie {-fx-pie-color: transparent;} +.default-color2.chart-pie {-fx-pie-color: transparent;}