From c3d419ae371e9acfd3df7837767e16948ff4f69d Mon Sep 17 00:00:00 2001 From: Eilert Tunheim <emtunhei@stud.ntnu.no> Date: Thu, 31 Mar 2022 14:59:14 +0200 Subject: [PATCH] minor updates to the InputPopUpWindow --- .../java/com/application/GUI/InputPopUpWindow.java | 7 ++++--- .../com/application/GUI/LineChartFunctionality.java | 10 ++-------- src/main/resources/com.application/CSS/styleSheet.css | 1 + 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/application/GUI/InputPopUpWindow.java b/src/main/java/com/application/GUI/InputPopUpWindow.java index 730687c..af64cb9 100644 --- a/src/main/java/com/application/GUI/InputPopUpWindow.java +++ b/src/main/java/com/application/GUI/InputPopUpWindow.java @@ -2,6 +2,7 @@ package com.application.GUI; import javafx.geometry.Pos; import javafx.scene.*; +import javafx.scene.chart.LineChart; import javafx.scene.control.*; import javafx.scene.layout.*; import javafx.stage.*; @@ -80,9 +81,9 @@ public class InputPopUpWindow { // Call på getKwh() try { - //LineChartFunctionality.loadSingleSeries(); - LineChartFunctionality.loadMultipleSeries(); - //Main.createLineChart(); + LineChartFunctionality.loadSingleSeries(); + //LineChartFunctionality.loadMultipleSeries(); + } catch (Exception ex) { ex.printStackTrace(); } diff --git a/src/main/java/com/application/GUI/LineChartFunctionality.java b/src/main/java/com/application/GUI/LineChartFunctionality.java index 446a8f2..821ee6a 100644 --- a/src/main/java/com/application/GUI/LineChartFunctionality.java +++ b/src/main/java/com/application/GUI/LineChartFunctionality.java @@ -11,8 +11,6 @@ import java.util.Map; public class LineChartFunctionality { private static LineChart<String, Number> lineChart; - private static XYChart.Series<String, Number> series; - private static XYChart.Data<String, Number> chartData; private static CategoryAxis xAxis; private static NumberAxis yAxis; @@ -20,11 +18,11 @@ public class LineChartFunctionality { public LineChartFunctionality(){ xAxis = new CategoryAxis(); yAxis = new NumberAxis(); - series = new XYChart.Series<String, Number>(); - chartData = new XYChart.Data<String, Number>(); lineChart = new LineChart<>(xAxis,yAxis); xAxis.setLabel("Date"); + xAxis.setAnimated(false); yAxis.setLabel("Kwh"); + yAxis.setAnimated(false); lineChart.setTitle("Drying Processes"); } @@ -32,10 +30,6 @@ public class LineChartFunctionality { return lineChart; } - public static XYChart.Series<String, Number> getSeries() { - return series; - } - public static void updateLineChart(XYChart.Series<String, Number> series){ lineChart.getData().add(series); } diff --git a/src/main/resources/com.application/CSS/styleSheet.css b/src/main/resources/com.application/CSS/styleSheet.css index 76111b5..9669a07 100644 --- a/src/main/resources/com.application/CSS/styleSheet.css +++ b/src/main/resources/com.application/CSS/styleSheet.css @@ -104,6 +104,7 @@ #inputButtonStart { -fx-pref-width: infinity; + -fx-translate-y: 10; -fx-pref-height: 25; -fx-font-size: 20; -fx-font-family: Arial; -- GitLab