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

minor updates to the InputPopUpWindow

parent a1c06e04
No related branches found
No related tags found
No related merge requests found
...@@ -2,6 +2,7 @@ package com.application.GUI; ...@@ -2,6 +2,7 @@ package com.application.GUI;
import javafx.geometry.Pos; import javafx.geometry.Pos;
import javafx.scene.*; import javafx.scene.*;
import javafx.scene.chart.LineChart;
import javafx.scene.control.*; import javafx.scene.control.*;
import javafx.scene.layout.*; import javafx.scene.layout.*;
import javafx.stage.*; import javafx.stage.*;
...@@ -80,9 +81,9 @@ public class InputPopUpWindow { ...@@ -80,9 +81,9 @@ public class InputPopUpWindow {
// Call på getKwh() // Call på getKwh()
try { try {
//LineChartFunctionality.loadSingleSeries(); LineChartFunctionality.loadSingleSeries();
LineChartFunctionality.loadMultipleSeries(); //LineChartFunctionality.loadMultipleSeries();
//Main.createLineChart();
} catch (Exception ex) { } catch (Exception ex) {
ex.printStackTrace(); ex.printStackTrace();
} }
......
...@@ -11,8 +11,6 @@ import java.util.Map; ...@@ -11,8 +11,6 @@ import java.util.Map;
public class LineChartFunctionality { public class LineChartFunctionality {
private static LineChart<String, Number> lineChart; 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 CategoryAxis xAxis;
private static NumberAxis yAxis; private static NumberAxis yAxis;
...@@ -20,11 +18,11 @@ public class LineChartFunctionality { ...@@ -20,11 +18,11 @@ public class LineChartFunctionality {
public LineChartFunctionality(){ public LineChartFunctionality(){
xAxis = new CategoryAxis(); xAxis = new CategoryAxis();
yAxis = new NumberAxis(); yAxis = new NumberAxis();
series = new XYChart.Series<String, Number>();
chartData = new XYChart.Data<String, Number>();
lineChart = new LineChart<>(xAxis,yAxis); lineChart = new LineChart<>(xAxis,yAxis);
xAxis.setLabel("Date"); xAxis.setLabel("Date");
xAxis.setAnimated(false);
yAxis.setLabel("Kwh"); yAxis.setLabel("Kwh");
yAxis.setAnimated(false);
lineChart.setTitle("Drying Processes"); lineChart.setTitle("Drying Processes");
} }
...@@ -32,10 +30,6 @@ public class LineChartFunctionality { ...@@ -32,10 +30,6 @@ public class LineChartFunctionality {
return lineChart; return lineChart;
} }
public static XYChart.Series<String, Number> getSeries() {
return series;
}
public static void updateLineChart(XYChart.Series<String, Number> series){ public static void updateLineChart(XYChart.Series<String, Number> series){
lineChart.getData().add(series); lineChart.getData().add(series);
} }
......
...@@ -104,6 +104,7 @@ ...@@ -104,6 +104,7 @@
#inputButtonStart { #inputButtonStart {
-fx-pref-width: infinity; -fx-pref-width: infinity;
-fx-translate-y: 10;
-fx-pref-height: 25; -fx-pref-height: 25;
-fx-font-size: 20; -fx-font-size: 20;
-fx-font-family: Arial; -fx-font-family: Arial;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment