Wip

Author: jeroen

R/RcppExports.R

@@ -157,8 +157,8 @@ cvmat_qrtext <- function(ptr, use_wechat = TRUE) {
     .Call('_opencv_cvmat_qrtext', PACKAGE = 'opencv', ptr, use_wechat)
 }
 
-cvmat_qrmask <- function(ptr) {
-    .Call('_opencv_cvmat_qrmask', PACKAGE = 'opencv', ptr)
+cvmat_qrmask <- function(ptr, use_wechat = TRUE) {
+    .Call('_opencv_cvmat_qrmask', PACKAGE = 'opencv', ptr, use_wechat)
 }
 
 cvversion <- function() {

R/qr.R

@@ -1,18 +1,21 @@
 #' Detect QR codes
 #'
-#' Detect a QR code
+#' Detect a QR code from an image. The `ocv_qrtext` function returns the text
+#' content from the QR, and `ocv_qrmask` returns an annotated image with the QR
+#' area highlighted, and the QR text as an attribute.
 #'
 #' @export
 #' @inheritParams ocv_write
 #' @rdname qrcode
+#' @param use_wechat use the wechat implementation.
 #' @examples
 #' png("test.png")
 #' plot(qrcode::qr_code("This is a test"))
 #' dev.off()
 #' ocv_qrtext(ocv_read('test.png'))
 #' unlink("test.png")
-ocv_qrtext <- function(image){
-  use_wechat <- TRUE
+ocv_qrtext <- function(image, use_wechat = TRUE){
+  use_wechat <- as.logical(use_wechat)
   cvmat_qrtext(image, use_wechat)
 }
 
@@ -22,18 +25,13 @@ ocv_qrtext <- function(image){
 #' # QR code scanner
 #' ocv_camera(ocv_qrmask)
 #' }
-ocv_qrmask <- function(image){
-  cvmat_qrmask(image)
+ocv_qrmask <- function(image, use_wechat = TRUE){
+  use_wechat <- as.logical(use_wechat)
+  cvmat_qrmask(image, use_wechat)
 }
 
 #' @export
 #' @rdname qrcode
 qr_scanner <- function(){
-  ocv_video(function(im){
-    out <- ocv_qrmask(im)
-    value <- attr(out, 'value')
-    if(length(value)){
-      list(out = out, value = value)
-    }
-  }, stop_on_result = TRUE)
+  ocv_video(ocv_qrmask, stop_on_result = TRUE)
 }

src/RcppExports.cpp

@@ -468,13 +468,14 @@ BEGIN_RCPP
 END_RCPP
 }
 // cvmat_qrmask
-XPtrMat cvmat_qrmask(XPtrMat ptr);
-RcppExport SEXP _opencv_cvmat_qrmask(SEXP ptrSEXP) {
+SEXP cvmat_qrmask(XPtrMat ptr, bool use_wechat);
+RcppExport SEXP _opencv_cvmat_qrmask(SEXP ptrSEXP, SEXP use_wechatSEXP) {
 BEGIN_RCPP
     Rcpp::RObject rcpp_result_gen;
     Rcpp::RNGScope rcpp_rngScope_gen;
     Rcpp::traits::input_parameter< XPtrMat >::type ptr(ptrSEXP);
-    rcpp_result_gen = Rcpp::wrap(cvmat_qrmask(ptr));
+    Rcpp::traits::input_parameter< bool >::type use_wechat(use_wechatSEXP);
+    rcpp_result_gen = Rcpp::wrap(cvmat_qrmask(ptr, use_wechat));
     return rcpp_result_gen;
 END_RCPP
 }
@@ -529,7 +530,7 @@ static const R_CallMethodDef CallEntries[] = {
     {"_opencv_cvmat_hog", (DL_FUNC) &_opencv_cvmat_hog, 1},
     {"_opencv_cvmat_markers", (DL_FUNC) &_opencv_cvmat_markers, 1},
     {"_opencv_cvmat_qrtext", (DL_FUNC) &_opencv_cvmat_qrtext, 2},
-    {"_opencv_cvmat_qrmask", (DL_FUNC) &_opencv_cvmat_qrmask, 1},
+    {"_opencv_cvmat_qrmask", (DL_FUNC) &_opencv_cvmat_qrmask, 2},
     {"_opencv_cvversion", (DL_FUNC) &_opencv_cvversion, 0},
     {NULL, NULL, 0}
 };

src/qrdetect.cpp

@@ -3,48 +3,54 @@
 
 using namespace cv;
 
-std::string qr_scan_opencv(XPtrMat ptr){
+std::string qr_scan_opencv(XPtrMat ptr, Mat &points){
   static QRCodeDetector qrDet = QRCodeDetector();
-  return qrDet.detectAndDecode(get_mat(ptr));
+  return qrDet.detectAndDecode(get_mat(ptr), points);
 }
 
-std::string qr_scan_wechat(XPtrMat ptr){
+std::string qr_scan_wechat(XPtrMat ptr, Mat &points){
   static wechat_qrcode::WeChatQRCode qrDet = wechat_qrcode::WeChatQRCode();
-  std::vector<std::string> data = qrDet.detectAndDecode(get_mat(ptr));
-  if(data.size() > 0)
+  std::vector<Mat> pointsvec;
+  std::vector<std::string> data = qrDet.detectAndDecode(get_mat(ptr), pointsvec);
+  if(data.size() > 0){
+    points = pointsvec.at(0);
     return data.at(0);
+  }
   return std::string();
 }
 
 // [[Rcpp::export]]
 Rcpp::RObject cvmat_qrtext(XPtrMat ptr, bool use_wechat = true){
-  std::string data = use_wechat ? qr_scan_wechat(ptr) : qr_scan_opencv(ptr);
+  Mat points;
+  std::string data = use_wechat ? qr_scan_wechat(ptr, points) : qr_scan_opencv(ptr, points);
   if(data.length()){
     return Rcpp::CharacterVector::create(data);
   }
   return R_NilValue;
 }
 
 // [[Rcpp::export]]
-XPtrMat cvmat_qrmask(XPtrMat ptr){
-  static QRCodeDetector qrDet = QRCodeDetector();
-  Mat img = get_mat(ptr);
-  std::vector<Point> points;
-  std::string data = qrDet.detectAndDecode(img, points);
-  if (data.length() && !points.empty()) {
-    for (int i = 0; i < points.size(); i++) {
-      Point pt1 = points[i];
-      Point pt2 = points[(i + 1) % 4];
+SEXP cvmat_qrmask(XPtrMat ptr, bool use_wechat = true){
+  Mat points;
+  std::string data = use_wechat ? qr_scan_wechat(ptr, points) : qr_scan_opencv(ptr, points);
+  if (data.length()) {
+    cv::Mat img = get_mat(ptr);
+    if(!use_wechat)
+      points = points.reshape(1, 4);
+    for (int i = 0; i < points.size().height; i++) {
+      Point pt1 = cv::Point(points.row(i));
+      Point pt2 = cv::Point(points.row((i + 1) % 4));
       line(img, pt1, pt2, Scalar(255, 0, 0), 3);
     }
     cv::putText(img, data,
-                cv::Point(10, img.rows / 2), //top-left position
+                cv::Point(10, img.rows / 2), //left-middle position
                 cv::FONT_HERSHEY_DUPLEX,
                 1.0,
                 CV_RGB(118, 185, 0), //font color
                 2);
     ptr.attr("value") = Rcpp::CharacterVector::create(data);
+    return ptr;
   }
-  return ptr;
+  return R_NilValue;
 }