From 428ed331a5ec2441c28023fd4dac7442368de029 Mon Sep 17 00:00:00 2001 From: Eilert Tunheim <emtunhei@stud.ntnu.no> Date: Sat, 9 Apr 2022 22:26:40 +0200 Subject: [PATCH] Good enough x-axis, not smooth, but best i could do... --- .../GUI/LineChartFunctionality.java | 10 +++++----- .../GUI/LineChartFunctionality.class | Bin 4505 -> 5589 bytes 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/application/GUI/LineChartFunctionality.java b/src/main/java/com/application/GUI/LineChartFunctionality.java index b257001..f4c249b 100644 --- a/src/main/java/com/application/GUI/LineChartFunctionality.java +++ b/src/main/java/com/application/GUI/LineChartFunctionality.java @@ -4,7 +4,6 @@ import javafx.scene.chart.CategoryAxis; import javafx.scene.chart.LineChart; import javafx.scene.chart.NumberAxis; import javafx.scene.chart.XYChart; -import javafx.scene.shape.Line; import java.text.SimpleDateFormat; import java.util.Date; @@ -21,11 +20,12 @@ public class LineChartFunctionality { xAxis = new CategoryAxis(); yAxis = new NumberAxis(); lineChart = new LineChart<>(xAxis, yAxis); - xAxis.setLabel("Date"); + xAxis.setLabel("Hours"); xAxis.setAnimated(false); yAxis.setLabel("Kwh"); yAxis.setAnimated(false); lineChart.setTitle("Drying Processes"); + lineChart.setCreateSymbols(false); } public static void setLineChart(LineChart<String, Number> lineChart) { @@ -44,7 +44,7 @@ public class LineChartFunctionality { lineChart.getData().clear(); } - private static long findDifference(String start_date, String end_date) { + private static double findDifference(String start_date, String end_date) { // Defining a simple date format SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -54,7 +54,7 @@ public class LineChartFunctionality { Date dateEnd = dateFormat.parse(end_date); // Finds the difference in millis - long differenceMillis = dateEnd.getTime() - dateStart.getTime(); + double differenceMillis = dateEnd.getTime() - dateStart.getTime(); // Finds the difference in minutes return (differenceMillis / (1000 * 60 )) % 60; @@ -95,7 +95,7 @@ public class LineChartFunctionality { minutes += findDifference(previouseDate, currentDate); - hours = (minutes/60); + hours = minutes/60; System.out.println(hours); previouseDate = currentDate; diff --git a/target/classes/com/application/GUI/LineChartFunctionality.class b/target/classes/com/application/GUI/LineChartFunctionality.class index dd012d8d671c613e50c4af95d932546655503bb0..8427e84169ee5bbc8f1c49de41a658e1d8cf6745 100644 GIT binary patch delta 3149 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 TT?T!Ib~a818-{}nXBi{`rn-}E delta 2065 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 -- GitLab