From 1a93c9aab246729bc21dd44fb025d9f0d9e4d293 Mon Sep 17 00:00:00 2001
From: Mateusz Lubecki <sp8ebc@interia.pl>
Date: Thu, 9 Dec 2021 22:05:00 +0100
Subject: [PATCH] excel export

---
 .../mobile/pogodacc/activity/SettingsActivity.java |  7 +++++++
 .../pogoda/mobile/pogodacc/file/ExcelExport.java   | 14 ++++++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/cc/pogoda/mobile/pogodacc/activity/SettingsActivity.java b/app/src/main/java/cc/pogoda/mobile/pogodacc/activity/SettingsActivity.java
index b7c40a7..7336aa8 100644
--- a/app/src/main/java/cc/pogoda/mobile/pogodacc/activity/SettingsActivity.java
+++ b/app/src/main/java/cc/pogoda/mobile/pogodacc/activity/SettingsActivity.java
@@ -95,6 +95,13 @@ public class SettingsActivity extends AppCompatActivity {
                     if (i2 > 0) {
                         try {
                             int newValue = Integer.valueOf(String.valueOf(charSequence), 10);
+
+                            if (newValue > 60) {
+                                newValue = 60;
+
+                                enditTextMinutesPeriod.setText(Integer.toString(newValue));
+                            }
+
                             AppConfiguration.decimationPeriod = newValue;
 
                             confFile.storeToFile();
diff --git a/app/src/main/java/cc/pogoda/mobile/pogodacc/file/ExcelExport.java b/app/src/main/java/cc/pogoda/mobile/pogodacc/file/ExcelExport.java
index e2fb325..7c29470 100644
--- a/app/src/main/java/cc/pogoda/mobile/pogodacc/file/ExcelExport.java
+++ b/app/src/main/java/cc/pogoda/mobile/pogodacc/file/ExcelExport.java
@@ -120,6 +120,14 @@ public class ExcelExport {
         cell = info.createCell(0);
         cell.setCellValue("Windspeed is exported both in m/s and knots. One knot equals one nautical mile per hour");
 
+        if (AppConfiguration.decimationPeriod > 0) {
+            rowNumber++;
+
+            Row decim = sheet.createRow(rowNumber++);
+            cell = decim.createCell(0);
+            cell.setCellValue("Decimation has been applied to the station data and some measurements have been dropped during an export. Minimal time difference between consecutive records is set to " + AppConfiguration.decimationPeriod + " minutes");
+        }
+
         rowNumber++;
         rowNumber++;
 
@@ -224,8 +232,10 @@ public class ExcelExport {
         sheet.setColumnWidth(3, 4600);
         sheet.setColumnWidth(4, 2900);
         sheet.setColumnWidth(5, 3200);
-        sheet.setColumnWidth(6, 3700);
-        sheet.setColumnWidth(7, 3200);
+        sheet.setColumnWidth(6, 5000);
+        sheet.setColumnWidth(7, 4400);
+        sheet.setColumnWidth(8, 4900);
+        sheet.setColumnWidth(9, 4400);
 
         try {
             workbook.write(out);