Merge pull request #81 from swarm-lab/develop

Develop
swarm-lab · Feb 7, 2023 · 1ad0f19 · 1ad0f19
2 parents 5f106cb + 58da801
commit 1ad0f19
Show file tree

Hide file tree

Showing 194 changed files with 872 additions and 35 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -2,7 +2,8 @@
 
 ## New features
 
-* Introducing video stacks.
+* Introduces video stacks.
+* Adds frame setters for Video and VideoStack objects. 
 
 ## Minor improvements and fixes
 

diff --git a/R/VideoStackClass.R b/R/VideoStackClass.R
@@ -35,8 +35,8 @@ setClass("VideoStack",
 #' @param ... Character strings (separately or in a vector or list), each
 #'  corresponding to the path to a video file, or \code{\link{Video}} objects
 #'  (separately or in a vector or list). All videos must have the same
-#'  dimensions and frame rate. If left empty, an empty \code{\link{VideoStack}}
-#'  object will be created and videos can be added to it later.
+#'  dimensions. If left empty, an empty \code{\link{VideoStack}} object will be
+#'  created and videos can be added to it later.
 #'
 #' @param api A character string corresponding to the API to use for reading the
 #'  video from a file (see Note; default: "ANY").
@@ -94,8 +94,8 @@ videoStack <- function(..., api = "ANY") {
     }
   })
 
-  if (length(unique(lapply(stack, fps))) > 1)
-    stop("All videos should have the same frame rate.")
+  # if (length(unique(lapply(stack, fps))) > 1)
+  #   stop("All videos should have the same frame rate.")
 
   if (length(unique(lapply(stack, nrow))) > 1)
     stop("All videos should have the dimensions.")
@@ -166,8 +166,8 @@ videoStack <- function(..., api = "ANY") {
 
   x@.Data[[i]] <- value
 
-  if (length(unique(lapply(x, fps))) > 1)
-    stop("All videos should have the same frame rate.")
+  # if (length(unique(lapply(x, fps))) > 1)
+  #   stop("All videos should have the same frame rate.")
 
   if (length(unique(lapply(x, nrow))) > 1)
     stop("All videos should have the dimensions.")
@@ -234,8 +234,8 @@ videoStack <- function(..., api = "ANY") {
     }
   }
 
-  if (length(unique(lapply(x, fps))) > 1)
-    stop("All videos should have the same frame rate.")
+  # if (length(unique(lapply(x, fps))) > 1)
+  #   stop("All videos should have the same frame rate.")
 
   if (length(unique(lapply(x, nrow))) > 1)
     stop("All videos should have the dimensions.")
@@ -380,7 +380,7 @@ frame.VideoStack <- function(x) {
 #' @export
 #' @rdname fps
 fps.VideoStack <- function(x) {
-  x[[1]]$fps()
+  sapply(x, function(x) x$fps())
 }
 
 

diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html
diff --git a/docs/articles/index.html b/docs/articles/index.html
diff --git a/docs/articles/z1_install.html b/docs/articles/z1_install.html
diff --git a/docs/articles/z2_io.html b/docs/articles/z2_io.html
diff --git a/docs/articles/z3_basic.html b/docs/articles/z3_basic.html
diff --git a/docs/articles/z4_inplace.html b/docs/articles/z4_inplace.html
diff --git a/docs/articles/z5_gpu.html b/docs/articles/z5_gpu.html
diff --git a/docs/articles/z6_queue.html b/docs/articles/z6_queue.html
diff --git a/docs/authors.html b/docs/authors.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/news/index.html b/docs/news/index.html
diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
@@ -8,7 +8,8 @@ articles:
   z4_inplace: z4_inplace.html
   z5_gpu: z5_gpu.html
   z6_queue: z6_queue.html
-last_built: 2023-02-05T15:10Z
+  z7_stack: z7_stack.html
+last_built: 2023-02-06T22:33Z
 urls:
   reference: https://swarm-lab.github.io/Rvision/reference
   article: https://swarm-lab.github.io/Rvision/articles

diff --git a/docs/reference/CLAHE.html b/docs/reference/CLAHE.html
diff --git a/docs/reference/Image-class.html b/docs/reference/Image-class.html
diff --git a/docs/reference/LUT.html b/docs/reference/LUT.html
diff --git a/docs/reference/Queue-class.html b/docs/reference/Queue-class.html
diff --git a/docs/reference/Rvision.html b/docs/reference/Rvision.html
diff --git a/docs/reference/RvisionAck.html b/docs/reference/RvisionAck.html
diff --git a/docs/reference/Stream-class.html b/docs/reference/Stream-class.html
diff --git a/docs/reference/Video-class.html b/docs/reference/Video-class.html
diff --git a/docs/reference/VideoWriter-class.html b/docs/reference/VideoWriter-class.html
diff --git a/docs/reference/adaptiveThreshold.html b/docs/reference/adaptiveThreshold.html
diff --git a/docs/reference/addWeighted.html b/docs/reference/addWeighted.html
diff --git a/docs/reference/anisotropicDiffusion.html b/docs/reference/anisotropicDiffusion.html
diff --git a/docs/reference/api.html b/docs/reference/api.html
diff --git a/docs/reference/arcLength.html b/docs/reference/arcLength.html
diff --git a/docs/reference/as.array.Rcpp_Image.html b/docs/reference/as.array.Rcpp_Image.html
diff --git a/docs/reference/autothreshold.html b/docs/reference/autothreshold.html
diff --git a/docs/reference/bilateralFilter.html b/docs/reference/bilateralFilter.html
diff --git a/docs/reference/bitdepth.html b/docs/reference/bitdepth.html
diff --git a/docs/reference/blur.html b/docs/reference/blur.html
diff --git a/docs/reference/border.html b/docs/reference/border.html
diff --git a/docs/reference/boxFilter.html b/docs/reference/boxFilter.html
diff --git a/docs/reference/canny.html b/docs/reference/canny.html
diff --git a/docs/reference/capacity.html b/docs/reference/capacity.html
diff --git a/docs/reference/cartToPolar.html b/docs/reference/cartToPolar.html
diff --git a/docs/reference/cc_table.html b/docs/reference/cc_table.html
diff --git a/docs/reference/changeBitDepth.html b/docs/reference/changeBitDepth.html