diff --git a/src/main/java/com/application/GUI/InputPopUpWindow.java b/src/main/java/com/application/GUI/InputPopUpWindow.java index 9948507afc38e63f0607b940341f318ca3f02b06..545e799d67c88fd3f0e2501ad365955b2570bf8d 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 com.application.DB.Constants; import com.application.DB.HelpingFunctions; +import com.application.Main; import javafx.application.Platform; import javafx.collections.FXCollections; import javafx.collections.ObservableList; @@ -19,10 +20,9 @@ import static com.application.DB.Constants.*; import static com.application.DB.DB.getCurrentDrying; import static com.application.DB.HelpingFunctions.LOADED_DATA; import static com.application.DB.HelpingFunctions.setLoadedData; -import static com.application.GUI.LineChartFunctionality.loadLiveData; +import static com.application.GUI.LineChartFunctionality.*; import static com.application.Main.*; import static com.application.DB.DB.setInputParameters; -import static com.application.GUI.LineChartFunctionality.loadSingleSeries; /** @@ -187,6 +187,7 @@ public class InputPopUpWindow { Thread thread = new Thread(() -> { try { + setLoadedData(false); // Henter her data fra databasen Map<Integer, Map<String, Number>> data = setInputParameters(); Platform.runLater(() -> { @@ -203,6 +204,9 @@ public class InputPopUpWindow { } ); thread.setDaemon(true); + thread.interrupt(); + thread.join(); + //Platform.exit(); thread.start(); } catch (Exception ex) { @@ -211,7 +215,7 @@ public class InputPopUpWindow { // Retrieve data for current drying period try { - Thread thread = new Thread(() -> { + Thread liveDataThread = new Thread(() -> { try { while (!HelpingFunctions.IS_FINISHED) { @@ -231,8 +235,11 @@ public class InputPopUpWindow { } } ); - thread.setDaemon(true); - thread.start(); + liveDataThread.setDaemon(true); + liveDataThread.interrupt(); + liveDataThread.join(); + //Platform.exit(); + liveDataThread.start(); } 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 8b23f2f789da186b16b8c6e7c0893a4aae969467..98836700a206684aaa85ffedcc236c24b080999a 100644 --- a/src/main/java/com/application/GUI/LineChartFunctionality.java +++ b/src/main/java/com/application/GUI/LineChartFunctionality.java @@ -1,7 +1,6 @@ package com.application.GUI; import com.application.Main; -import javafx.collections.ObservableList; import javafx.scene.chart.CategoryAxis; import javafx.scene.chart.LineChart; import javafx.scene.chart.NumberAxis; @@ -12,12 +11,9 @@ import org.apache.commons.math3.exception.MathIllegalArgumentException; import org.apache.commons.math3.stat.descriptive.SummaryStatistics; import org.apache.commons.math3.stat.regression.SimpleRegression; -import java.lang.reflect.Array; import java.util.*; import static com.application.DB.Constants.ADJUST_REGRESSION; -import static com.application.DB.Constants.TIME_LEFT; -//import static com.application.DB.DB. public class LineChartFunctionality { @@ -31,7 +27,6 @@ public class LineChartFunctionality { public LineChartFunctionality() { - liveDataSeries = new XYChart.Series<String, Number>(); xAxis = new CategoryAxis(); yAxis = new NumberAxis(); lineChart = new LineChart<>(xAxis, yAxis); @@ -40,7 +35,6 @@ public class LineChartFunctionality { yAxis.setLabel("Kwh"); yAxis.setAnimated(false); lineChart.setTitle("Drying Processes"); - lineChart.getData().add(liveDataSeries); } @@ -204,7 +198,8 @@ public class LineChartFunctionality { dataPoints = dataPoints/endOfGraphPoints.size(); - + liveDataSeries = new XYChart.Series<String, Number>(); + updateLineChart(liveDataSeries); XYChart.Series<String, Number> regressionSeries = new XYChart.Series<String, Number>(); diff --git a/src/main/java/com/application/Main.java b/src/main/java/com/application/Main.java index 222383388cf064d9ba7e3e5e7642a14a70a72057..b795ec3dd57730f274660ee66ea94c309ac7b5c7 100644 --- a/src/main/java/com/application/Main.java +++ b/src/main/java/com/application/Main.java @@ -23,6 +23,7 @@ import java.util.logging.Logger; import static com.application.DB.Constants.*; import static com.application.DB.HelpingFunctions.*; +import static com.application.DB.HelpingFunctions.isLoadedData; import static com.application.GUI.LineChartFunctionality.getDataPoints; import static com.application.GUI.LineChartFunctionality.getLiveData; import static java.util.logging.Level.SEVERE; @@ -233,6 +234,7 @@ public class Main extends Application { while (!IS_FINISHED) { try { + ringProgressIndicator.makeIndeterminate(); Thread.sleep(500L * NUMBER_OF_SECONDS_LIVE_DATA); } catch (InterruptedException e) { e.printStackTrace(); diff --git a/src/main/resources/com.application/GUI/graphStyles.css b/src/main/resources/com.application/GUI/graphStyles.css index bbef3d52ce4941ae4c58f31aa59e4f0e8b31486e..ce64d11a6212e471d83818c65688d7718b717114 100644 --- a/src/main/resources/com.application/GUI/graphStyles.css +++ b/src/main/resources/com.application/GUI/graphStyles.css @@ -4,8 +4,8 @@ -fx-effect: null; } -.default-color0.chart-series-line{-fx-stroke: green; -fx-opacity: 1.0} -.default-color1.chart-series-line{-fx-stroke: rgba(0,168,355,0.3); -fx-opacity: 0.1} +.default-color0.chart-series-line{-fx-stroke: red; -fx-opacity: 1.0} +.default-color1.chart-series-line{-fx-stroke: green; -fx-opacity: 1.0} .default-color2.chart-series-line{-fx-stroke: rgba(0,168,355,0.3); -fx-opacity: 0.1} .default-color3.chart-series-line{-fx-stroke: rgba(0,168,355,0.3); -fx-opacity: 0.1} .default-color4.chart-series-line{-fx-stroke: rgba(0,168,355,0.3); -fx-opacity: 0.1} @@ -13,8 +13,8 @@ .default-color6.chart-series-line{-fx-stroke: rgba(0,168,355,0.3); -fx-opacity: 0.1} .default-color7.chart-series-line{-fx-stroke: rgba(0,168,355,0.3); -fx-opacity: 0.1} -.default-color0.chart-line-symbol{-fx-background-color: green,green;} -.default-color1.chart-line-symbol{-fx-background-color: rgba(0,168,355,0.3),rgba(0,168,355,0.3);} +.default-color0.chart-line-symbol{-fx-background-color: red,red;} +.default-color1.chart-line-symbol{-fx-background-color: green,green;} .default-color2.chart-line-symbol{-fx-background-color: rgba(0,168,355,0.3),rgba(0,168,355,0.3);} .default-color3.chart-line-symbol{-fx-background-color: rgba(0,168,355,0.3),rgba(0,168,355,0.3);} .default-color4.chart-line-symbol{-fx-background-color: rgba(0,168,355,0.3),rgba(0,168,355,0.3);} diff --git a/target/classes/com/application/GUI/InputPopUpWindow.class b/target/classes/com/application/GUI/InputPopUpWindow.class index 693a41bb2cb82fe3ac72db67a1a64d3c9e0e6c67..037171ffa7925880946ed5def0d7a08388321c3e 100644 Binary files a/target/classes/com/application/GUI/InputPopUpWindow.class 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 index 788df9c9e54e551c5257d324a400315d5da5957e..125b40b88613c6967a6c7d4b98232326c6796831 100644 Binary files a/target/classes/com/application/GUI/LineChartFunctionality.class 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 e8cca2d060725d070d2d935b0729639bbfc300ef..8764a06752f05b58c77755135c22afadf0c8bbf2 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 c789b814911ed9f3efdd6b32281a13d5263a2432..b9e38140f6b49fd482603f5b043ca7205cbe4856 100644 Binary files a/target/classes/com/application/Main.class and b/target/classes/com/application/Main.class differ