diff --git a/src/main/java/com/application/GUI/LineChartFunctionality.java b/src/main/java/com/application/GUI/LineChartFunctionality.java index 81d196858496c86c46401c4a3cd6fbc08a547bb2..501eb1460a43fc96348c1ab5cd5665ce87270337 100644 --- a/src/main/java/com/application/GUI/LineChartFunctionality.java +++ b/src/main/java/com/application/GUI/LineChartFunctionality.java @@ -35,7 +35,6 @@ public class LineChartFunctionality { private static boolean printLiveData; private static boolean printPreviousData; - public LineChartFunctionality() { xAxis = new CategoryAxis(); yAxis = new NumberAxis(); @@ -448,23 +447,24 @@ public class LineChartFunctionality { } public static void getTimeLeft(int liveData){ - int time = 0; + int minutes = 0; + int hours = 0; if(liveData == 0) { - time = getDataPointsXAxis()*10; + minutes = getDataPointsXAxis()*10; } else { - time = (getDataPointsXAxis()/liveData)*10; + minutes = (getDataPointsXAxis()/liveData)*10; } - if(time > 60){ - time = time/60; - Main.setTimeLeftText(time + " h"); - if(time == 3){NotificationPopUp.displayNotificationWindow("3 Hours Left!");} + if(minutes > 60){ + hours = minutes/60; + Main.setTimeLeftText(hours + " h"); + if(hours == 3){NotificationPopUp.displayNotificationWindow("3 Hours Left!");} } else { - NotificationPopUp.displayNotificationWindow("1 Hour Left!"); - Main.setTimeLeftText(time + " min"); + if(minutes == 60){NotificationPopUp.displayNotificationWindow("1 Hours Left!");} + Main.setTimeLeftText(minutes + " min"); } - if(time == 0){ + if(minutes == 0){ NotificationPopUp.displayNotificationWindow("Drying Process Finished!"); } } diff --git a/src/main/java/com/application/GUI/NotificationPopUp.java b/src/main/java/com/application/GUI/NotificationPopUp.java index cd2d169863234848d5a1e5634758f5d5f65685d4..7359602fe9f91010895655f3f9edce2136ddd71f 100644 --- a/src/main/java/com/application/GUI/NotificationPopUp.java +++ b/src/main/java/com/application/GUI/NotificationPopUp.java @@ -10,11 +10,11 @@ import javafx.stage.Stage; public class NotificationPopUp { - public static void displayNotificationWindow(String message){ + public static void displayNotificationWindow(String message){ Stage window = new Stage(); window.initModality(Modality.APPLICATION_MODAL); - window.setTitle("Moisture Check"); + window.setTitle("Notification window"); Label messageLabel = new Label(); messageLabel.setText(message); diff --git a/target/classes/com/application/GUI/LineChartFunctionality.class b/target/classes/com/application/GUI/LineChartFunctionality.class index 5ad462985640d5e49cc3b2e207e024aff4e41249..57aee1313539f1ad355d32cb846c027cee1bed12 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/GUI/NotificationPopUp.class b/target/classes/com/application/GUI/NotificationPopUp.class index 766653a9f3f53267f2ad5217e1f8c0e41361fa33..a641aa4f3a2fbca07b4a00092023747f9151dd14 100644 Binary files a/target/classes/com/application/GUI/NotificationPopUp.class and b/target/classes/com/application/GUI/NotificationPopUp.class differ