From fd30d581025a6262f33aea8d943c2457bc32c0e4 Mon Sep 17 00:00:00 2001 From: nwickel Date: Fri, 28 Jun 2024 18:29:27 +0200 Subject: [PATCH] Fixed issue with glossar in add_path_items --- DESCRIPTION | 2 +- R/add_path.R | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 7f9f7f1..55b017c 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -8,4 +8,4 @@ Description: Creating event logs from raw log files from a Multi-Touch-Table at License: GPL (>= 2) Encoding: UTF-8 Roxygen: list(markdown = TRUE) -RoxygenNote: 7.2.3 +RoxygenNote: 7.3.1 diff --git a/R/add_path.R b/R/add_path.R index ce691f6..3a1a532 100644 --- a/R/add_path.R +++ b/R/add_path.R @@ -1,10 +1,12 @@ ########################################################################### -add_path_items <- function(subdata) { +add_path_items <- function(subdata, glossar) { pbapply::pboptions(style = 3, char = "=") - subdata_glossar <- subdata[subdata$item == "glossar", ] - subdata_glossar$path <- NA + if (glossar) { + subdata_glossar <- subdata[subdata$item == "glossar", ] + subdata_glossar$path <- NA + } items <- unique(subdata$item)[unique(subdata$item) != "glossar"] @@ -56,6 +58,7 @@ add_path_items <- function(subdata) { ########################################################################### add_path_glossar <- function(subdata, xmlpath) { # TODO: I think this needs to be completely redone +# TODO: Think about getting rid of all of the glossar stuff pb <- utils::txtProgressBar(min = 0, max = nrow(subdata), initial = NA, style = 3) @@ -116,7 +119,7 @@ add_path <- function(data, xmlpath, glossar) { subdata1 <- data[data$event %in% c("Transform start", "Transform stop"), ] subdata2 <- data[!data$event %in% c("Transform start", "Transform stop"), ] - subdata2 <- add_path_items(subdata2) + subdata2 <- add_path_items(subdata2, glossar = glossar) if (glossar) { subdata2 <- add_path_glossar(subdata2, xmlpath)