From 3edf8cf11ab063aaccb66394b7be292ff8dfb075 Mon Sep 17 00:00:00 2001 From: Simon Garnier Date: Mon, 6 Feb 2023 14:45:33 -0500 Subject: [PATCH 1/2] Update NEWS --- NEWS.md | 3 ++- docs/news/index.html | 3 ++- docs/pkgdown.yml | 2 +- docs/reference/convexHull.html | 2 +- docs/reference/fitEllipse.html | 8 ++++---- docs/reference/minAreaRect.html | 8 ++++---- 6 files changed, 14 insertions(+), 12 deletions(-) diff --git a/NEWS.md b/NEWS.md index edb0669a..f7df72c7 100644 --- 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/docs/news/index.html b/docs/news/index.html index f9f6dc7e..c656edb2 100644 --- a/docs/news/index.html +++ b/docs/news/index.html @@ -59,7 +59,8 @@

Rvision 0.7.0

New features

-

Minor improvements and fixes

diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml index a28af686..e2c9bc16 100644 --- a/docs/pkgdown.yml +++ b/docs/pkgdown.yml @@ -8,7 +8,7 @@ articles: z4_inplace: z4_inplace.html z5_gpu: z5_gpu.html z6_queue: z6_queue.html -last_built: 2023-02-05T15:10Z +last_built: 2023-02-06T19:34Z urls: reference: https://swarm-lab.github.io/Rvision/reference article: https://swarm-lab.github.io/Rvision/articles diff --git a/docs/reference/convexHull.html b/docs/reference/convexHull.html index 17e61b99..036da71e 100644 --- a/docs/reference/convexHull.html +++ b/docs/reference/convexHull.html @@ -97,7 +97,7 @@

Author<

Examples

convexHull(rnorm(100), rnorm(100))
-#>  [1] 81 72 61 49 15  2 87 94 82 14
+#> [1] 37 14 31 40 39 65 43
 
 
diff --git a/docs/reference/fitEllipse.html b/docs/reference/fitEllipse.html index 9edd3ead..fcf72005 100644 --- a/docs/reference/fitEllipse.html +++ b/docs/reference/fitEllipse.html @@ -118,16 +118,16 @@

Author<

Examples

fitEllipse(rnorm(100), rnorm(100))
 #> $angle
-#> [1] 88.28801
+#> [1] 114.8883
 #> 
 #> $height
-#> [1] 4.551149
+#> [1] 5.049275
 #> 
 #> $width
-#> [1] 3.453217
+#> [1] 3.249608
 #> 
 #> $center
-#> [1] -0.07406638  0.02945708
+#> [1] -0.1695812  0.1933473
 #> 
 
 
diff --git a/docs/reference/minAreaRect.html b/docs/reference/minAreaRect.html index 121e341b..68ece697 100644 --- a/docs/reference/minAreaRect.html +++ b/docs/reference/minAreaRect.html @@ -99,16 +99,16 @@

Author<

Examples

minAreaRect(rnorm(100), rnorm(100))
 #> $angle
-#> [1] 74.43822
+#> [1] 78.55891
 #> 
 #> $height
-#> [1] 4.051167
+#> [1] 5.362702
 #> 
 #> $width
-#> [1] 5.154503
+#> [1] 4.240335
 #> 
 #> $center
-#> [1] 0.2884874 0.6139913
+#> [1] 0.03336668 0.26076555
 #> 
 
 
From 58da801e04407653a8b674205c40baaecfa36589 Mon Sep 17 00:00:00 2001 From: Simon Garnier Date: Mon, 6 Feb 2023 17:38:11 -0500 Subject: [PATCH 2/2] Add vignette for video stacks. --- R/VideoStackClass.R | 18 +- docs/404.html | 1 + docs/LICENSE-text.html | 1 + docs/articles/index.html | 3 + docs/articles/z1_install.html | 1 + docs/articles/z2_io.html | 1 + docs/articles/z3_basic.html | 1 + docs/articles/z4_inplace.html | 1 + docs/articles/z5_gpu.html | 1 + docs/articles/z6_queue.html | 1 + docs/authors.html | 1 + docs/index.html | 1 + docs/news/index.html | 1 + docs/pkgdown.yml | 3 +- docs/reference/CLAHE.html | 1 + docs/reference/Image-class.html | 1 + docs/reference/LUT.html | 1 + docs/reference/Queue-class.html | 1 + docs/reference/Rvision.html | 1 + docs/reference/RvisionAck.html | 1 + docs/reference/Stream-class.html | 1 + docs/reference/Video-class.html | 1 + docs/reference/VideoWriter-class.html | 1 + docs/reference/adaptiveThreshold.html | 1 + docs/reference/addWeighted.html | 1 + docs/reference/anisotropicDiffusion.html | 1 + docs/reference/api.html | 1 + docs/reference/arcLength.html | 1 + docs/reference/as.array.Rcpp_Image.html | 1 + docs/reference/autothreshold.html | 1 + docs/reference/bilateralFilter.html | 1 + docs/reference/bitdepth.html | 1 + docs/reference/blur.html | 1 + docs/reference/border.html | 1 + docs/reference/boxFilter.html | 1 + docs/reference/canny.html | 1 + docs/reference/capacity.html | 1 + docs/reference/cartToPolar.html | 1 + docs/reference/cc_table.html | 1 + docs/reference/changeBitDepth.html | 1 + docs/reference/changeColorSpace.html | 1 + docs/reference/click.html | 1 + docs/reference/cloneImage.html | 1 + docs/reference/codec.html | 1 + docs/reference/col2bgr.html | 1 + docs/reference/colorspace.html | 1 + docs/reference/compare.html | 1 + docs/reference/computeECC.html | 1 + docs/reference/concatenate.html | 1 + docs/reference/connectedComponents.html | 1 + docs/reference/contourArea.html | 1 + docs/reference/convexHull.html | 3 +- docs/reference/convexityDefects.html | 1 + docs/reference/countNonZero.html | 1 + docs/reference/destroyDisplay.html | 1 + docs/reference/dim.Rcpp_Image.html | 1 + docs/reference/dim.Rcpp_Queue.html | 1 + docs/reference/dim.Rcpp_Stream.html | 1 + docs/reference/dim.Rcpp_Video.html | 1 + docs/reference/dim.Rcpp_VideoWriter.html | 1 + docs/reference/display.html | 1 + docs/reference/distanceTransform.html | 1 + docs/reference/drawArrow.html | 1 + docs/reference/drawCircle.html | 1 + docs/reference/drawEllipse.html | 1 + docs/reference/drawLine.html | 1 + docs/reference/drawPolyline.html | 1 + docs/reference/drawRectangle.html | 1 + docs/reference/drawRotatedRectangle.html | 1 + docs/reference/drawText.html | 1 + docs/reference/edgePreservingFilter.html | 1 + docs/reference/exp.html | 1 + docs/reference/extractChannel.html | 1 + docs/reference/farneback.html | 1 + docs/reference/fillConvexPoly.html | 1 + docs/reference/fillPoly.html | 1 + docs/reference/filter2D.html | 1 + docs/reference/findContours.html | 1 + docs/reference/findNonZero.html | 1 + docs/reference/findTransformECC.html | 1 + docs/reference/findTransformORB.html | 1 + docs/reference/fitEllipse.html | 9 +- docs/reference/flip.html | 1 + docs/reference/floodFill.html | 1 + docs/reference/fourcc.html | 1 + docs/reference/fps.html | 1 + docs/reference/frame.html | 1 + docs/reference/full.html | 1 + docs/reference/gaussianBlur.html | 1 + docs/reference/getGaborKernel.html | 1 + docs/reference/getPerspectiveTransform.html | 1 + docs/reference/getStructuringElement.html | 1 + docs/reference/getTextSize.html | 1 + docs/reference/grabCut.html | 1 + docs/reference/histEq.html | 1 + docs/reference/histmatch.html | 1 + docs/reference/houghCircles.html | 1 + docs/reference/huInvariants.html | 1 + docs/reference/image.html | 1 + docs/reference/imageArithmetic.html | 1 + docs/reference/imageLogic.html | 1 + docs/reference/imageMinMax.html | 1 + docs/reference/imhist.html | 1 + docs/reference/improfile.html | 1 + docs/reference/inPlaceArithmetic.html | 1 + docs/reference/inPlaceComparison.html | 1 + docs/reference/inPlaceLogical.html | 1 + docs/reference/inRange.html | 1 + docs/reference/index.html | 25 +- docs/reference/inpaint.html | 1 + docs/reference/insertChannel.html | 1 + docs/reference/invert.html | 1 + docs/reference/isBlob.html | 1 + docs/reference/isImage.html | 1 + docs/reference/isQueue.html | 1 + docs/reference/isStream.html | 1 + docs/reference/isVideo.html | 1 + docs/reference/isVideoWriter.html | 1 + docs/reference/laplacian.html | 1 + docs/reference/log.html | 1 + docs/reference/matchShapes.html | 1 + docs/reference/matchTemplate.html | 1 + docs/reference/mean.Rcpp_Image.html | 1 + docs/reference/mean.list.html | 1 + docs/reference/medianBlur.html | 1 + docs/reference/merge.html | 1 + docs/reference/min.Rcpp_Image.html | 1 + docs/reference/minAreaRect.html | 9 +- docs/reference/minMaxLoc.html | 1 + docs/reference/moments.html | 1 + docs/reference/morph.html | 1 + docs/reference/newDisplay.html | 1 + docs/reference/niBlackThreshold.html | 1 + docs/reference/nrow.Rcpp_Image.html | 1 + docs/reference/ones.html | 1 + docs/reference/pget.html | 1 + docs/reference/pixelsInContour.html | 1 + docs/reference/plot.Image.html | 1 + docs/reference/plot.blob.html | 1 + docs/reference/plotOF.html | 1 + docs/reference/polarToCart.html | 1 + docs/reference/pow.html | 1 + docs/reference/pset.html | 1 + docs/reference/queue.html | 1 + docs/reference/queue_dimensions.html | 1 + docs/reference/randn.html | 1 + docs/reference/randu.html | 1 + docs/reference/readFrame.html | 1 + docs/reference/readHIS.html | 1 + docs/reference/readMulti.html | 1 + docs/reference/readNext.html | 1 + docs/reference/reduce.html | 1 + docs/reference/release.html | 1 + docs/reference/reset.html | 1 + docs/reference/resize.html | 1 + docs/reference/rotateScale.html | 1 + docs/reference/scharr.html | 1 + docs/reference/selectROI.html | 1 + docs/reference/sepFilter2D.html | 1 + docs/reference/setProp.html | 1 + docs/reference/setTo.html | 1 + docs/reference/simpleBlobDetector.html | 1 + docs/reference/sobel.html | 1 + docs/reference/spatialGradient.html | 1 + docs/reference/split.html | 1 + docs/reference/sqrBoxFilter.html | 1 + docs/reference/sqrt.html | 1 + docs/reference/stream.html | 1 + docs/reference/stream_dimensions.html | 1 + docs/reference/sub-.Rcpp_Image.html | 1 + docs/reference/subImage.html | 1 + docs/reference/sum.html | 1 + docs/reference/thinning.html | 1 + docs/reference/threshold.html | 1 + docs/reference/tile.html | 1 + docs/reference/timelapse.html | 1 + docs/reference/video.html | 1 + docs/reference/videoWriter.html | 1 + docs/reference/video_dimensions.html | 1 + docs/reference/videowriter_dimensions.html | 1 + docs/reference/warpAffine.html | 1 + docs/reference/warpPerspective.html | 1 + docs/reference/watershed.html | 1 + docs/reference/write.Image.html | 1 + docs/reference/writeFrame.html | 1 + docs/reference/writeMulti.html | 1 + docs/reference/writerOuput.html | 1 + docs/reference/zeros.html | 1 + docs/sitemap.xml | 3 + man/videoStack.Rd | 4 +- vignettes/z7_stack.R | 54 +++ vignettes/z7_stack.Rmd | 122 +++++ vignettes/z7_stack.html | 467 ++++++++++++++++++++ 193 files changed, 868 insertions(+), 33 deletions(-) create mode 100644 vignettes/z7_stack.R create mode 100644 vignettes/z7_stack.Rmd create mode 100644 vignettes/z7_stack.html diff --git a/R/VideoStackClass.R b/R/VideoStackClass.R index cbc85865..557e5516 100644 --- 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 index 56ac6fbb..41607cf6 100644 --- a/docs/404.html +++ b/docs/404.html @@ -52,6 +52,7 @@ 4 - In-place, copy, and target operations 5 - GPU operations 6 - Capture queues + 7 - Video stacks