omit need for openxlsx dependency #974

wadpac · Nov 23, 2023 · a225e33 · a225e33
1 parent 5ce2096
commit a225e33
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -29,7 +29,7 @@ Description: A tool to process and analyse data collected with wearable raw acce
 URL: https://github.com/wadpac/GGIR/, https://groups.google.com/forum/#!forum/RpackageGGIR, https://wadpac.github.io/GGIR/
 BugReports: https://github.com/wadpac/GGIR/issues
 License: Apache License (== 2.0) | file LICENSE
-Suggests: testthat, covr, knitr, rmarkdown, actilifecounts, ActCR, GGIRread, read.gt3x, readxl, openxlsx
+Suggests: testthat, covr, knitr, rmarkdown, actilifecounts, ActCR, GGIRread, read.gt3x, readxl
 Imports: data.table, foreach, doParallel, signal, zoo, unisensR, ineq, methods, psych, irr
 Depends: stats, utils, R (>= 3.5)
 VignetteBuilder: knitr
diff --git a/R/convertEpochData.R b/R/convertEpochData.R
@@ -187,8 +187,7 @@ convertEpochData = function(datadir = c(), metadatadir = c(),
       } else if (params_general[["dataFormat"]] == "sensewear_xls") {
         # read data
         D = as.data.frame(readxl::read_excel(path = fnames[i], col_types = "text"))
-        timestamp_POSIX = openxlsx::convertToDateTime(as.numeric(D$`Time (GMT-04:00)`), tz = tz)
-
+        timestamp_POSIX = as.POSIXct(as.numeric(D[, grep(pattern = "Time", x = colnames(D))]) * (60*60*24), origin = "1899-12-30", tz = tz)
         D = D[, c("METs", "Step Counter", "Sleep")]
         colnames(D) = c("ExtAct", "ExtStep", "ExtSleep")
         D$ExtAct = as.numeric(D$ExtAct)