Merge pull request #94 from swarm-lab/develop

Develop

.Rbuildignore

@@ -15,3 +15,6 @@ ci_script
 ^docs$
 ^pkgdown$
 ^codecov\.yml$
+^doc$
+^Meta$
+.vscode

.gitignore

@@ -13,3 +13,6 @@ src/.DS_Store
 tmp.def
 *.insyncdl
 docs
+/doc/
+/Meta/
+.vscode

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: Rvision
 Type: Package
 Title: Computer Vision Library for R
-Version: 0.7.0
-Date: 2022-01-25
+Version: 0.7.1
+Date: 2023-10-25
 Authors@R: c(
     person("Simon", "Garnier", email = "[email protected]", role = c("aut", "cre"),
       comment = c(ORCID = "0000-0002-3886-3974")),
@@ -15,7 +15,7 @@ License: GPL-3
 LazyData: TRUE
 NeedsCompilation: yes
 Depends: 
-    R (>= 3.5.0)
+    R (>= 4.0.0)
 Imports:
     Rcpp (>= 1.0.1),
     ROpenCVLite (>= 4.70.0),
@@ -28,9 +28,9 @@ RcppModules: class_Image, class_Capture, class_VideoWriter,
     methods_Arithmetic, methods_Statistics, methods_Comparisons, methods_Logical, 
     methods_OpticalFlow, methods_Blob, methods_Morphology, methods_Filters, 
     methods_Display, methods_Draw, methods_Geometry, methods_Shape, methods_Transform,
-    methods_Feature, methods_Autothresh, methods_Ximgproc
-RoxygenNote: 7.2.3
-Biarch: true
+    methods_Feature, methods_Autothresh, methods_Ximgproc, methods_Calib3d
+RoxygenNote: 7.3.1
+Biarch: false
 StagedInstall: false
 Encoding: UTF-8
 Suggests: 

NAMESPACE

@@ -67,13 +67,8 @@ export("%i^%")
 export("%i|%")
 export("frame<-")
 export(CLAHE)
-export(Image)
 export(LUT)
 export(ORBkeypoints)
-export(Queue)
-export(Stream)
-export(Video)
-export(VideoWriter)
 export(absdiff)
 export(adaptiveThreshold)
 export(add)
@@ -94,6 +89,7 @@ export(blur)
 export(border)
 export(boxFilter)
 export(boxPoints)
+export(calibrateCamera)
 export(canny)
 export(capacity)
 export(cartToPolar)
@@ -111,6 +107,7 @@ export(connectedComponents)
 export(contourArea)
 export(convexHull)
 export(convexityDefects)
+export(cornerSubPix)
 export(countNonZero)
 export(destroyAllDisplays)
 export(destroyDisplay)
@@ -133,7 +130,9 @@ export(farneback)
 export(fillConvexPoly)
 export(fillPoly)
 export(filter2D)
+export(findChessboardCorners)
 export(findContours)
+export(findHomography)
 export(findNonZero)
 export(findTransformECC)
 export(findTransformORB)
@@ -147,6 +146,7 @@ export(full)
 export(gaussianBlur)
 export(getAffineTransform)
 export(getGaborKernel)
+export(getOptimalNewCameraMatrix)
 export(getPerspectiveTransform)
 export(getProp)
 export(getStructuringElement)
@@ -221,6 +221,7 @@ export(reduce)
 export(release)
 export(reset)
 export(resize)
+export(rotate)
 export(rotateScale)
 export(scharr)
 export(selectROI)
@@ -241,6 +242,8 @@ export(thinning)
 export(threshold)
 export(tile)
 export(timelapse)
+export(undistort)
+export(undistortPoints)
 export(video)
 export(videoStack)
 export(videoWriter)

R/ImageClass.R

@@ -2,14 +2,15 @@
 #'
 #' @name Image-class
 #'
-#' @aliases Rcpp_Image
+#' @aliases Rcpp_Image Image
 #'
 #' @docType class
 #'
-#' @description \code{Image} objects are the base objects of the \pkg{\link{Rvision}}
-#'  package. They contain an \href{http://opencv.org/}{OpenCV} image that can
-#'  originate from an image file, an array, a video file or a video stream.
-#'  This image can be manipulated using the functions of \pkg{\link{Rvision}}.
+#' @description \code{Image} objects are the base objects of the
+#'  \pkg{\link{Rvision}} package. They contain an
+#'  \href{http://opencv.org/}{OpenCV} image that can originate from an image
+#'  file, an array, a video file or a video stream. This image can be
+#'  manipulated using the functions of \pkg{\link{Rvision}}.
 #'
 #' @slot depth A function returning the bit depth of the object.
 #'
@@ -31,10 +32,7 @@
 #'
 #' @author Simon Garnier, \email{garnier@@njit.edu}
 #'
-#' @seealso \code{\link{image}}, \code{\link{Video}}, \code{\link{Stream}}
-#'
-#' @export
-"Image"
+#' @seealso \code{\link{image}}
 
 
 #' @title Create an Object of Class \code{Image}
@@ -65,7 +63,7 @@
 #'
 #' @export
 image <- function(..., colorspace = "BGR") {
-  new(Rvision::Image, ..., colorspace)
+  new(Image, ..., colorspace)
 }
 
 

R/QueueClass.R

@@ -2,7 +2,7 @@
 #'
 #' @name Queue-class
 #'
-#' @aliases Rcpp_Queue
+#' @aliases Rcpp_Queue Queue
 #'
 #' @docType class
 #'
@@ -37,10 +37,7 @@
 #'
 #' @author Simon Garnier, \email{garnier@@njit.edu}
 #'
-#' @seealso \code{\link{Image}}, \code{\link{Video}}, \code{\link{Stream}}
-#'
-#' @export
-"Queue"
+#' @seealso \code{\link{queue}}, \code{\link{Video}}, \code{\link{Stream}}
 
 
 #' @title Create an Object of Class \code{Queue}

R/Rvision-package.R

@@ -20,8 +20,5 @@
 #'
 #' @references More about OpenCV at \url{http://opencv.org/}.
 #'
-#' @docType package
-#'
 #' @name Rvision
-NULL
-#> NULL
+"_PACKAGE"

R/StreamClass.R

@@ -2,7 +2,7 @@
 #'
 #' @name Stream-class
 #'
-#' @aliases Rcpp_Stream
+#' @aliases Rcpp_Stream Stream
 #'
 #' @docType class
 #'
@@ -20,8 +20,8 @@
 #' @slot release Function to release the object from memory.
 #'
 #' @author Simon Garnier, \email{garnier@@njit.edu}
-#' @export
-"Stream"
+#' 
+#' @seealso \code{\link{stream}}, \code{\link{queue}}
 
 
 #' @title Create an Object of Class \code{Stream}

R/VideoClass.R

@@ -2,7 +2,7 @@
 #'
 #' @name Video-class
 #'
-#' @aliases Rcpp_Video
+#' @aliases Rcpp_Video Video
 #'
 #' @docType class
 #'
@@ -30,8 +30,8 @@
 #'
 #' @author Simon Garnier, \email{garnier@@njit.edu}
 #'
-#' @export
-"Video"
+#' @seealso \code{\link{video}}, \code{\link{queue}}
+
 
 
 #' @title Create an Object of Class \code{Video}

R/VideoStackClass.R

@@ -19,11 +19,12 @@
 #'
 #' @export
 setClass("VideoStack",
-         contains = "list",
-         slots = c(nframes = "numeric"),
-         prototype = structure(
-           list(),
-           nframes = numeric())
+  contains = "list",
+  slots = c(nframes = "numeric"),
+  prototype = structure(
+    list(),
+    nframes = numeric()
+  )
 )
 
 

R/VideoWriterClass.R

@@ -2,7 +2,7 @@
 #'
 #' @name VideoWriter-class
 #'
-#' @aliases Rcpp_VideoWriter
+#' @aliases Rcpp_VideoWriter VideoWriter
 #'
 #' @docType class
 #'
@@ -29,8 +29,8 @@
 #' @slot release Function to release the object from memory.
 #'
 #' @author Simon Garnier, \email{garnier@@njit.edu}
-#' @export
-"VideoWriter"
+#'
+#' @seealso \code{\link{videoWriter}}
 
 
 #' @title Create an object of class \code{VideoWriter}