diff --git a/src/main/java/com/application/GUI/LineChartFunctionality.java b/src/main/java/com/application/GUI/LineChartFunctionality.java index a9282391e2206aeb5d609df6ed368c50885b4005..0817beefd54d15c909238a4f4defde34e2e62728 100644 --- a/src/main/java/com/application/GUI/LineChartFunctionality.java +++ b/src/main/java/com/application/GUI/LineChartFunctionality.java @@ -7,25 +7,25 @@ import javafx.scene.chart.XYChart; public class LineChartFunctionality { - LineChart<String, Number> lineChart; - XYChart.Series<String, Number> series; - CategoryAxis xAxis; - NumberAxis yAxis; + private LineChart<String, Number> lineChart; + private XYChart.Series<String, Number> series; + private final CategoryAxis xAxis; + private final NumberAxis yAxis; public LineChartFunctionality(){ - xAxis = new CategoryAxis(); - yAxis = new NumberAxis(); - series = new XYChart.Series<String, Number>(); - lineChart = new LineChart<>(xAxis,yAxis); - lineChart.getData().add(series); - xAxis.setLabel("Date"); - yAxis.setLabel("Kwh"); - lineChart.setTitle("Drying Processes"); + this.xAxis = new CategoryAxis(); + this.yAxis = new NumberAxis(); + this.series = new XYChart.Series<String, Number>(); + this.lineChart = new LineChart<>(xAxis,yAxis); + this.lineChart.getData().add(series); + this.xAxis.setLabel("Date"); + this.yAxis.setLabel("Kwh"); + this.lineChart.setTitle("Drying Processes"); } public LineChart<String, Number> getLineChart() { - return lineChart; + return this.lineChart; } public void setLineChart(LineChart<String, Number> lineChart) { @@ -33,11 +33,12 @@ public class LineChartFunctionality { } public XYChart.Series<String, Number> getSeries() { - return series; + return this.series; } public void setSeries(XYChart.Series<String, Number> series) { this.series = series; + this.lineChart.getData().add(series); } } diff --git a/src/main/java/com/application/Main.java b/src/main/java/com/application/Main.java index 39fa1a09d3b4aa7d1680fbc398e472f97f9209e7..d6d7bbc4c8b845c69aeb4e56b4ad3a5918695012 100644 --- a/src/main/java/com/application/Main.java +++ b/src/main/java/com/application/Main.java @@ -171,9 +171,13 @@ public class Main extends Application { moistureGoalText.setId("sideBarLabelText"); moistureGoalText.setPromptText("12%"); - Button finish = new Button("Finish"); - finish.setId("sideBarButtonFinish"); - finish.setOnAction(e -> InputPopUpWindow.display()); + Button inputParametersButton = new Button("Input Parameters"); + inputParametersButton.setId("sideBarButtonInputParameters"); + inputParametersButton.setOnAction(e -> InputPopUpWindow.display()); + + Button finishButton = new Button("Finish"); + finishButton.setId("sideBarButtonFinish"); + // Creating the circular progressbar @@ -217,7 +221,8 @@ public class Main extends Application { - sideBarVBox.getChildren().addAll(ringProgressIndicator, treeSpeciesLabel, treeSpeciesText, dimensionsLabel, dimensionsText, sawsetLabel, sawsetText, moistureGoalLabel, moistureGoalText, finish); + sideBarVBox.getChildren().addAll(ringProgressIndicator, treeSpeciesLabel, treeSpeciesText, dimensionsLabel, dimensionsText, + sawsetLabel, sawsetText, moistureGoalLabel, moistureGoalText, inputParametersButton, finishButton); VBox.setVgrow(sideBarVBox, Priority.ALWAYS); diff --git a/src/main/resources/com.application/CSS/styleSheet.css b/src/main/resources/com.application/CSS/styleSheet.css index 54b83c3aa452a8106d95786adbda1fc6490ad038..76111b5e69c7085c3fc25b6f99d29126621ace76 100644 --- a/src/main/resources/com.application/CSS/styleSheet.css +++ b/src/main/resources/com.application/CSS/styleSheet.css @@ -17,6 +17,10 @@ -fx-alignment: center; } + +/* + Sidebar styling + */ #sideBar { -fx-pref-width: 250; } @@ -39,11 +43,21 @@ -fx-font-family: Arial; } -#sideBarButtonFinish { +#sideBarButtonInputParameters { -fx-translate-x: 5; -fx-translate-y: 20; -fx-pref-width: infinity; -fx-pref-height: 25; + -fx-font-size: 16; + -fx-font-weight: 200; + -fx-font-family: Arial; +} + +#sideBarButtonFinish { + -fx-translate-x: 5; + -fx-translate-y: 50; + -fx-pref-width: infinity; + -fx-pref-height: 25; -fx-font-size: 20; -fx-font-family: Arial; -fx-background-color: rgba(104, 229, 59, 1); diff --git a/target/classes/com/application/GUI/InputPopUpWindow.class b/target/classes/com/application/GUI/InputPopUpWindow.class new file mode 100644 index 0000000000000000000000000000000000000000..6d5867cd2617d66b840aed7ac25dce4b744bcf28 Binary files /dev/null and b/target/classes/com/application/GUI/InputPopUpWindow.class differ diff --git a/target/classes/com/application/GUI/LineChartFunctionality.class b/target/classes/com/application/GUI/LineChartFunctionality.class new file mode 100644 index 0000000000000000000000000000000000000000..eaa8f1e713b3132b236b7b894f0529f111199898 Binary files /dev/null and b/target/classes/com/application/GUI/LineChartFunctionality.class differ diff --git a/target/classes/com/application/Main$1WorkerThread.class b/target/classes/com/application/Main$1WorkerThread.class index ecdd8db78db05984f51b2e5159c022801f31209d..9abb12eca1a252de3954b0675b49e8a0237e772b 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 ba9aec1158e5eb2b28ba0a08e90d814dcfda0e05..39fa3937ebc8e1f685f160bf072975ffcae6a97d 100644 Binary files a/target/classes/com/application/Main.class and b/target/classes/com/application/Main.class differ