internal recoding of topoplot to play nice with tidy; initial dplyr s…

…tyle functions

NAMESPACE

@@ -155,8 +155,8 @@ importFrom(purrr,is_empty)
 importFrom(purrr,map)
 importFrom(purrr,map_df)
 importFrom(purrr,partial)
+importFrom(rlang,current_env)
 importFrom(rlang,parse_quo)
-importFrom(rlang,parse_quosure)
 importFrom(scales,squish)
 importFrom(signal,butter)
 importFrom(signal,decimate)

R/data_averaging.R

@@ -52,13 +52,15 @@ eeg_average.eeg_epochs <- function(data,
   } else {
 
     # Check for presence of labels
-    lab_check <- label_check(cond_label, unique(list_epochs(data)$event_label))
+    lab_check <- label_check(cond_label,
+                             unique(list_epochs(data)$event_label))
 
     if (!all(lab_check)) {
       stop("Not all labels found. Use list_events to check labels.")
     }
 
     evoked <- vector("list", length(cond_label))
+
     for (i in seq_along(cond_label)) {
       tmp_dat <- select_epochs(data,
                                epoch_events = cond_label[[i]])
@@ -71,6 +73,7 @@ eeg_average.eeg_epochs <- function(data,
       row.names(evoked[[i]]) <- NULL
     }
     data$signals <- evoked
+
     if (length(cond_label) > 1) {
       names(data$signals) <- cond_label
     } else {

R/dplyr-extenstions.R

@@ -0,0 +1,37 @@
+#' @noRd
+filter.eeg_epochs <- function(.data, ...) {
+  .data$signals <- as.data.frame(.data)
+  .data$signals <- dplyr::filter(.data$signals, ...)
+  .data$signals$time <- NULL
+  .data$signals$epoch <- NULL
+  .data$timings <- dplyr::filter(.data$timings, ...)
+  .data
+}
+
+#' @noRd
+filter.eeg_data <- function(.data, ...) {
+  .data$signals <- as.data.frame(.data)
+  .data$signals <- dplyr::filter(.data$signals, ...)
+  .data$signals$time <- NULL
+  .data$signals$sample <- NULL
+  .data$timings <- dplyr::filter(.data$timings, ...)
+  .data
+}
+
+#' @noRd
+select.eeg_epochs <- function(.data, ...) {
+  .data$signals <- dplyr::select(.data$signals, ...)
+  if (!is.null(.data$chan_info)) {
+    .data$chan_info <- .data$chan_info[.data$chan_info$electrode %in% names(.data$signals), ]
+  }
+  .data
+}
+
+#' @noRd
+select.eeg_data <- function(.data, ...) {
+  .data$signals <- dplyr::select(.data$signals, ...)
+  if (!is.null(.data$chan_info)) {
+    .data$chan_info <- .data$chan_info[.data$chan_info$electrode %in% names(.data$signals), ]
+  }
+  .data
+}

R/epoch_images.R

@@ -56,7 +56,8 @@ erp_image.eeg_epochs <- function(data,
                       clim = NULL,
                       interpolate = FALSE,
                       ...) {
-  if (!electrode %in% names(data$signals)) {
+
+   if (!electrode %in% names(data$signals)) {
     stop("Specified electrode not found.")
   }
   data <- select_elecs(data,