diff --git a/src/main/java/com/application/DB/Constants.java b/src/main/java/com/application/DB/Constants.java
index da40820ae3c062b766189fea6c92cb55048adcd1..84b9a5eeabd3527d6c60e6e02d96b74562bec144 100644
--- a/src/main/java/com/application/DB/Constants.java
+++ b/src/main/java/com/application/DB/Constants.java
@@ -71,8 +71,8 @@ public final class Constants {
public static final String START_DRYING_NAME = "DryingStarted";
public static final String STOP_DRYING_NAME = "DryingCompleted";
public static final String KILIN_NAME = "KilinId";
- public static int KILIN_ID = 18;
- //public static int KILIN_ID = 18554;
+ //public static int KILIN_ID = 18;
+ public static int KILIN_ID = 18554;
// Swappconsensordata
public static final String KWH_NAME = "RealValue";
diff --git a/src/main/java/com/application/GUI/Input.java b/src/main/java/com/application/GUI/InputPopUpWindow.java
similarity index 94%
rename from src/main/java/com/application/GUI/Input.java
rename to src/main/java/com/application/GUI/InputPopUpWindow.java
index d94d71d4c387be2c5b699a831ebaf519547d9023..71bfe5897889b3147cc507ccbd11378868c136fe 100644
--- a/src/main/java/com/application/GUI/Input.java
+++ b/src/main/java/com/application/GUI/InputPopUpWindow.java
@@ -15,7 +15,7 @@ import com.application.Main;
* @author Eilert Tunheim, Karin Pettersen, Mads Arnesen
* @version 1.0
*/
-public class Input {
+public class InputPopUpWindow {
public static void display()
{
@@ -79,7 +79,7 @@ public class Input {
// Call på getKwh()
try {
- Main.createLineChart();
+ //Main.createLineChart();
} catch (Exception ex) {
ex.printStackTrace();
}
@@ -92,7 +92,7 @@ public class Input {
layout.setAlignment(Pos.CENTER);
Scene scene = new Scene(layout, 600, 600);
- scene.getStylesheets().add(Input.class.getResource("/com.application/CSS/styleSheet.css").toExternalForm());
+ scene.getStylesheets().add(InputPopUpWindow.class.getResource("/com.application/CSS/styleSheet.css").toExternalForm());
window.setScene(scene);
window.showAndWait();
}
diff --git a/src/main/java/com/application/GUI/LineChartFunctionality.java b/src/main/java/com/application/GUI/LineChartFunctionality.java
new file mode 100644
index 0000000000000000000000000000000000000000..a9282391e2206aeb5d609df6ed368c50885b4005
--- /dev/null
+++ b/src/main/java/com/application/GUI/LineChartFunctionality.java
@@ -0,0 +1,43 @@
+package com.application.GUI;
+
+import javafx.scene.chart.CategoryAxis;
+import javafx.scene.chart.LineChart;
+import javafx.scene.chart.NumberAxis;
+import javafx.scene.chart.XYChart;
+
+public class LineChartFunctionality {
+
+ LineChart<String, Number> lineChart;
+ XYChart.Series<String, Number> series;
+ CategoryAxis xAxis;
+ 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");
+ }
+
+ public LineChart<String, Number> getLineChart() {
+ return lineChart;
+ }
+
+ public void setLineChart(LineChart<String, Number> lineChart) {
+ this.lineChart = lineChart;
+ }
+
+ public XYChart.Series<String, Number> getSeries() {
+ return series;
+ }
+
+ public void setSeries(XYChart.Series<String, Number> series) {
+ this.series = series;
+ }
+
+}
diff --git a/src/main/java/com/application/Main.java b/src/main/java/com/application/Main.java
index 2f19a2160608c3afa07cd341f7b1601a6ab7cac9..39fa1a09d3b4aa7d1680fbc398e472f97f9209e7 100644
--- a/src/main/java/com/application/Main.java
+++ b/src/main/java/com/application/Main.java
@@ -1,8 +1,8 @@
package com.application;
-import com.application.DB.DB;
-import com.application.GUI.Input;
+import com.application.GUI.InputPopUpWindow;
import com.application.GUI.RingProgressIndicator;
+import com.application.GUI.LineChartFunctionality;
import javafx.application.Application;
import javafx.application.Platform;
@@ -13,14 +13,10 @@ import javafx.scene.image.ImageView;
import javafx.scene.layout.*;
import javafx.scene.Scene;
import javafx.stage.Stage;
-import javafx.scene.chart.CategoryAxis;
-import javafx.scene.chart.NumberAxis;
-import javafx.scene.chart.XYChart;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
-import java.util.*;
import java.util.logging.Logger;
import static java.util.logging.Level.SEVERE;
@@ -37,6 +33,7 @@ public class Main extends Application {
private HBox logoBar;
private VBox sideBar;
private MenuBar menuBar;
+ private LineChartFunctionality lineChartFunctionality;
/**
* Starts the application
@@ -62,6 +59,7 @@ public class Main extends Application {
this.logoBar = new HBox();
this.sideBar = new VBox();
this.menuBar = new MenuBar();
+ this.lineChartFunctionality = new LineChartFunctionality();
}
/**
@@ -78,7 +76,8 @@ public class Main extends Application {
this.menuBar = createMenuBar();
this.sideBar = createSideBar();
this.logoBar = createLogoBar();
- LineChart<String, Number> lineChart = createLineChart();
+
+ LineChart<String, Number> lineChart = this.lineChartFunctionality.getLineChart();
//Set id's to connect to css stylesheet
root.setId("root");
@@ -174,7 +173,7 @@ public class Main extends Application {
Button finish = new Button("Finish");
finish.setId("sideBarButtonFinish");
- finish.setOnAction(e -> Input.display());
+ finish.setOnAction(e -> InputPopUpWindow.display());
// Creating the circular progressbar
@@ -261,16 +260,9 @@ public class Main extends Application {
}
- public static LineChart<String,Number> createLineChart() throws Exception {
-
- final CategoryAxis xAxis = new CategoryAxis();
- final NumberAxis yAxis = new NumberAxis();
- xAxis.setLabel("Date");
-
- final LineChart<String, Number> lineChart = new LineChart<>(xAxis, yAxis);
- lineChart.setTitle("Drying Processes");
+ /*
Map<Integer, Map> kWh = DB.getKwh();
@@ -293,13 +285,13 @@ public class Main extends Application {
lineChart.getData().add(series);
//System.out.println("\n\nNew line\n\n");
}
+
+ */
/*
for (Map.Entry<Integer, Map> entryKwh : kWh.entrySet()) {
System.out.printf("Index: \t%s\t\t\tkWh: \t%s\n",entryKwh.getKey(),entryKwh.getValue());
}
*/
- return lineChart;
- }
}
diff --git a/target/classes/com/application/DB/Constants.class b/target/classes/com/application/DB/Constants.class
index 7cf43aea48c35042683a053b5794db086fc0ec92..3cffa8e8d8a94a99337892ff984d856f80e48a45 100644
Binary files a/target/classes/com/application/DB/Constants.class and b/target/classes/com/application/DB/Constants.class differ
diff --git a/target/classes/com/application/GUI/Input.class b/target/classes/com/application/GUI/Input.class
deleted file mode 100644
index 90cc636ac48decad559bbc5e830e886dd9fdcb9d..0000000000000000000000000000000000000000
Binary files a/target/classes/com/application/GUI/Input.class and /dev/null differ
diff --git a/target/classes/com/application/Main$1WorkerThread.class b/target/classes/com/application/Main$1WorkerThread.class
index fc1cb79295b938a5ba6bc65d216611f6e1d0be64..ecdd8db78db05984f51b2e5159c022801f31209d 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 80979f33ddbb4b67750a37f6c45e96cd1f729d8e..ba9aec1158e5eb2b28ba0a08e90d814dcfda0e05 100644
Binary files a/target/classes/com/application/Main.class and b/target/classes/com/application/Main.class differ