Skip to content
Snippets Groups Projects
Commit fa9063f2 authored by Eilert Tunheim's avatar Eilert Tunheim
Browse files

Added checkboxes at bottom of screen, non-functional atm

parent 29522e6a
No related branches found
No related tags found
No related merge requests found
...@@ -93,7 +93,7 @@ public class Main extends Application { ...@@ -93,7 +93,7 @@ public class Main extends Application {
this.menuBar = createMenuBar(); this.menuBar = createMenuBar();
this.sideBar = createSideBar(); this.sideBar = createSideBar();
this.logoBar = createLogoBar(); this.logoBar = createLogoBar();
this.bottomBar = createBottomBar();
LineChart<String, Number> lineChart = LineChartFunctionality.getLineChart(); LineChart<String, Number> lineChart = LineChartFunctionality.getLineChart();
...@@ -102,6 +102,7 @@ public class Main extends Application { ...@@ -102,6 +102,7 @@ public class Main extends Application {
this.logoBar.setId("logoBar"); this.logoBar.setId("logoBar");
this.menuBar.setId("menuBar"); this.menuBar.setId("menuBar");
this.sideBar.setId("sideBar"); this.sideBar.setId("sideBar");
this.bottomBar = createBottomBar();
this.bottomBar.setId("bottomBar"); this.bottomBar.setId("bottomBar");
lineChart.setId("lineChart"); lineChart.setId("lineChart");
...@@ -314,12 +315,30 @@ public class Main extends Application { ...@@ -314,12 +315,30 @@ public class Main extends Application {
private HBox createBottomBar(){ private HBox createBottomBar(){
HBox hBox = new HBox(); HBox hBox = new HBox();
hBox.setId("bottomBar");
Button button = new Button("Test"); Label liveDataText = new Label("View Live Data");
button.setId("bottomBarButtons"); CheckBox liveDataBox = new CheckBox();
//button.setAlignment(Pos.CENTER_RIGHT); liveDataBox.setOnAction(event -> {
hBox.getChildren().addAll(button);
hBox.getStylesheets().add(getClass().getResource("/com.application/CSS/styleSheet.css").toExternalForm()); });
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; return hBox;
} }
......
...@@ -86,9 +86,8 @@ ...@@ -86,9 +86,8 @@
#bottomBarButtons { #bottomBarButtons {
-fx-alignment: center-right; -fx-alignment: center-right;
-fx-tile-alignment: center-right; -fx-tile-alignment: center-right;
-fx-text-fill: rgba(12, 76, 81, 1); -fx-translate-x: -5;
-fx-background-color: red; -fx-pref-width: 150;
-fx-pref-width: 50;
-fx-pref-height: 25; -fx-pref-height: 25;
} }
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
*/ */
#sideBar { #sideBar {
-fx-pref-width: 250; -fx-pref-width: 250;
-fx-pref-height: infinity;
} }
#sideBarLabel { #sideBarLabel {
...@@ -74,6 +75,22 @@ ...@@ -74,6 +75,22 @@
-fx-text-fill: white; -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 Input popup window
*/ */
......
No preview for this file type
No preview for this file type
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment