diff --git a/src/main/java/com/application/Main.java b/src/main/java/com/application/Main.java index 12ab7699ea382eb7614e21f001a11a3e43fd31e4..6085a371541012335d207df92bb14876f70efaac 100644 --- a/src/main/java/com/application/Main.java +++ b/src/main/java/com/application/Main.java @@ -93,7 +93,7 @@ public class Main extends Application { this.menuBar = createMenuBar(); this.sideBar = createSideBar(); this.logoBar = createLogoBar(); - this.bottomBar = createBottomBar(); + LineChart<String, Number> lineChart = LineChartFunctionality.getLineChart(); @@ -102,6 +102,7 @@ public class Main extends Application { this.logoBar.setId("logoBar"); this.menuBar.setId("menuBar"); this.sideBar.setId("sideBar"); + this.bottomBar = createBottomBar(); this.bottomBar.setId("bottomBar"); lineChart.setId("lineChart"); @@ -314,12 +315,30 @@ public class Main extends Application { private HBox createBottomBar(){ HBox hBox = new HBox(); - hBox.setId("bottomBar"); - Button button = new Button("Test"); - button.setId("bottomBarButtons"); - //button.setAlignment(Pos.CENTER_RIGHT); - hBox.getChildren().addAll(button); - hBox.getStylesheets().add(getClass().getResource("/com.application/CSS/styleSheet.css").toExternalForm()); + + Label liveDataText = new Label("View Live Data"); + CheckBox liveDataBox = new CheckBox(); + liveDataBox.setOnAction(event -> { + + }); + + Label regressionText = new Label("View Regression"); + CheckBox regressionBox = new CheckBox(); + regressionBox.setOnAction(event -> { + + }); + + Label previousText = new Label("View Previous Data"); + CheckBox previousBox = new CheckBox(); + previousBox.setOnAction(event -> { + + }); + + + hBox.getChildren().addAll(liveDataText, liveDataBox, regressionText, regressionBox, previousText, previousBox); + hBox.setAlignment(Pos.CENTER_RIGHT); + hBox.setSpacing(5); + return hBox; } diff --git a/src/main/resources/com.application/CSS/styleSheet.css b/src/main/resources/com.application/CSS/styleSheet.css index 7480586c4a83eba4ce23254f6e83e665888b9879..278e82918bec639cf5a468a90c1da76834953170 100644 --- a/src/main/resources/com.application/CSS/styleSheet.css +++ b/src/main/resources/com.application/CSS/styleSheet.css @@ -86,9 +86,8 @@ #bottomBarButtons { -fx-alignment: center-right; -fx-tile-alignment: center-right; - -fx-text-fill: rgba(12, 76, 81, 1); - -fx-background-color: red; - -fx-pref-width: 50; + -fx-translate-x: -5; + -fx-pref-width: 150; -fx-pref-height: 25; } diff --git a/target/classes/com.application/CSS/styleSheet.css b/target/classes/com.application/CSS/styleSheet.css index 70d9445d4fce81779c39abcc8e07c3b966ab826c..278e82918bec639cf5a468a90c1da76834953170 100644 --- a/target/classes/com.application/CSS/styleSheet.css +++ b/target/classes/com.application/CSS/styleSheet.css @@ -23,6 +23,7 @@ */ #sideBar { -fx-pref-width: 250; + -fx-pref-height: infinity; } #sideBarLabel { @@ -74,6 +75,22 @@ -fx-text-fill: white; } +/* + BottomBar styling + */ +#bottomBar { + -fx-pref-width: infinity; + -fx-pref-height: 50; +} + +#bottomBarButtons { + -fx-alignment: center-right; + -fx-tile-alignment: center-right; + -fx-translate-x: -5; + -fx-pref-width: 150; + -fx-pref-height: 25; +} + /* Input popup window */ diff --git a/target/classes/com/application/Main$1WorkerThread.class b/target/classes/com/application/Main$1WorkerThread.class index bbd12e82197545541306e3ec5c8db9559fde98b6..f6e6cd8b00c8837ce18449ad89b1066a75542127 100644 Binary files a/target/classes/com/application/Main$1WorkerThread.class and b/target/classes/com/application/Main$1WorkerThread.class differ diff --git a/target/classes/com/application/Main.class b/target/classes/com/application/Main.class index e329d02c168a11cda60cf107ae80c2494383cbeb..28bccc7bcccdc96f79f9cb927e5b5b18209107c2 100644 Binary files a/target/classes/com/application/Main.class and b/target/classes/com/application/Main.class differ