Update yolo_qr

Author: yushulx

examples/official/9.x/yolo_qr/README.md

@@ -75,8 +75,9 @@ def on_captured_result_received(self, captured_result):
                         y3 = location.points[2].y
                         x4 = location.points[3].x
                         y4 = location.points[3].y
+                        pts = np.array([(x1, y1), (x2, y2), (x3, y3), (x4, y4)], np.int32).reshape((-1, 1, 2))
                         cv2.drawContours(
-                            frame, [np.intp([(x1, y1), (x2, y2), (x3, y3), (x4, y4)])], 0, (0, 255, 0), 2)
+                            frame, [pts], 0, (0, 255, 0), 2)
 
                         cv2.putText(frame, text, (x1, y1),
                                     cv2.FONT_HERSHEY_SIMPLEX, 1, (0, 255, 0), 2)

examples/official/9.x/yolo_qr/dbr-only.py

@@ -67,8 +67,9 @@
                     print("({}, {})".format(x4, y4))
                     print("-------------------------------------------------")
 
+                    pts = np.array([(x1, y1), (x2, y2), (x3, y3), (x4, y4)], np.int32).reshape((-1, 1, 2))
                     cv2.drawContours(
-                        cv_image, [np.intp([(x1, y1), (x2, y2), (x3, y3), (x4, y4)])], 0, (0, 255, 0), 2)
+                        cv_image, [pts], 0, (0, 255, 0), 2)
 
                     cv2.putText(cv_image, text, (x1, y1 - 10),
                                 cv2.FONT_HERSHEY_SIMPLEX, 0.5, (0, 0, 255), 2)

examples/official/camera_file/camera.py

@@ -0,0 +1,109 @@
+# QR Detection with OpenCV and YOLO Model in Python
+This repository provides samples demonstrating how to detect QR codes using **YOLO** and how to read QR codes with the [Dynamsoft Barcode Reader](https://www.dynamsoft.com/barcode-reader/overview/).
+
+## Prerequisites
+- OpenCV 4.x
+    
+    ```
+    pip install opencv-python
+    ```
+
+- Dynamsoft Barcode Reader
+
+    ```
+    pip install dynamsoft-capture-vision-bundle
+    ```
+- Obtain a [Dynamsoft Barcode Reader trial license](https://www.dynamsoft.com/customer/license/trialLicense/?product=dcv&package=cross-platform) and update your code with the provided license key:
+    
+    ```python
+    from dynamsoft_capture_vision_bundle import *
+
+    errorCode, errorMsg = LicenseManager.init_license("LICENSE-KEY")
+    if errorCode != EnumErrorCode.EC_OK and errorCode != EnumErrorCode.EC_LICENSE_CACHE_USED:
+        print("License initialization failed: ErrorCode:",
+                errorCode, ", ErrorString:", errorMsg)
+    
+    cvr_instance = CaptureVisionRouter() 
+    ```
+    
+
+## Usage
+
+#### QR Detection
+
+- From Image File:
+
+    ```
+    python3 opencv-yolo.py
+    ```
+
+- From Camera:
+
+    ```
+    python3 opencv-yolo-camera.py
+    ```
+
+    ![OpenCV YOLO for QR detection](https://www.dynamsoft.com/codepool/img/2020/11/opencv-dnn-yolo3-qr-detection.gif)
+
+#### QR Reading with Dynamsoft Barcode Reader
+
+Below is a sample code snippet for reading QR codes with the Dynamsoft Barcode Reader:
+
+```py
+from dynamsoft_capture_vision_bundle import *
+
+errorCode, errorMsg = LicenseManager.init_license("LICENSE-KEY")
+if errorCode != EnumErrorCode.EC_OK and errorCode != EnumErrorCode.EC_LICENSE_CACHE_USED:
+    print("License initialization failed: ErrorCode:",
+            errorCode, ", ErrorString:", errorMsg)
+
+cvr_instance = CaptureVisionRouter() 
+
+error_code, error_msg, settings = cvr_instance.get_simplified_settings(EnumPresetTemplate.PT_READ_BARCODES.value)
+quad = Quadrilateral()
+quad.points = [Point(left, top), Point(right, top), Point(right, bottom), Point(left, bottom)]
+settings.roi = quad
+settings.roi_measured_in_percentage = False
+cvr_instance.update_settings(EnumPresetTemplate.PT_READ_BARCODES.value, settings)
+
+result = cvr_instance.capture(frame, EnumPresetTemplate.PT_READ_BARCODES.value)
+
+items = result.get_items()
+for item in items:
+    print("Barcode Format :")
+    print(item.get_format_string())
+    print("Barcode Text :")
+    print(item.get_text())
+
+    location = item.get_location()
+    x1 = location.points[0].x
+    y1 = location.points[0].y
+    x2 = location.points[1].x
+    y2 = location.points[1].y
+    x3 = location.points[2].x
+    y3 = location.points[2].y
+    x4 = location.points[3].x
+    y4 = location.points[3].y
+
+    print("Location Points:")
+    print("({}, {})".format(x1, y1))
+    print("({}, {})".format(x2, y2))
+    print("({}, {})".format(x3, y3))
+    print("({}, {})".format(x4, y4))
+    print("-------------------------------------------------")
+```
+
+- From Image File:
+
+    ```
+    python3 yolo-dbr.py
+    ```
+
+- From Camera:
+
+    ```
+    python3 yolo-dbr-camera.py
+    ```
+
+## Blog
+[How to Detect and Decode QR Code with YOLO, OpenCV, and Dynamsoft Barcode Reader](https://www.dynamsoft.com/codepool/qr-code-detect-decode-yolo-opencv.html)

examples/official/camera_file/file.py

@@ -4,43 +4,48 @@
 import time
 from threading import Thread
 import queue
-from dbr import *
+from dynamsoft_capture_vision_bundle import *
+
+errorCode, errorMsg = LicenseManager.init_license(
+        "DLS2eyJoYW5kc2hha2VDb2RlIjoiMjAwMDAxLTE2NDk4Mjk3OTI2MzUiLCJvcmdhbml6YXRpb25JRCI6IjIwMDAwMSIsInNlc3Npb25QYXNzd29yZCI6IndTcGR6Vm05WDJrcEQ5YUoifQ==")
+if errorCode != EnumErrorCode.EC_OK and errorCode != EnumErrorCode.EC_LICENSE_CACHE_USED:
+    print("License initialization failed: ErrorCode:",
+            errorCode, ", ErrorString:", errorMsg)
+
+cvr_instance = CaptureVisionRouter()    
 
-license_key = "DLS2eyJoYW5kc2hha2VDb2RlIjoiMjAwMDAxLTE2NDk4Mjk3OTI2MzUiLCJvcmdhbml6YXRpb25JRCI6IjIwMDAwMSIsInNlc3Npb25QYXNzd29yZCI6IndTcGR6Vm05WDJrcEQ5YUoifQ=="
-BarcodeReader.init_license(license_key)
-reader = BarcodeReader()
 color = (0, 0, 255)
 thickness = 2
 
 
 def decodeframe(frame):
 
-    try:
-        outs = reader.decode_buffer(frame)
-        if outs != None:
-            return outs
-    except BarcodeReaderError as bre:
-        print(bre)
-
-    return None
+    result = cvr_instance.capture(frame, EnumPresetTemplate.PT_READ_BARCODES.value)
+    return result
 
 
 winName = 'QR Detection'
 
 
-def postprocess(frame, outs):
-    if outs == None:
-        return
+def postprocess(frame, result):
+    items = result.get_items()
+    for item in items:
+        location = item.get_location()
+        x1 = location.points[0].x
+        y1 = location.points[0].y
+        x2 = location.points[1].x
+        y2 = location.points[1].y
+        x3 = location.points[2].x
+        y3 = location.points[2].y
+        x4 = location.points[3].x
+        y4 = location.points[3].y
 
-    for out in outs:
-        points = out.localization_result.localization_points
+        pts = np.array([(x1, y1), (x2, y2), (x3, y3), (x4, y4)], np.int32).reshape((-1, 1, 2))
+        cv.drawContours(
+            frame, [pts], 0, (0, 255, 0), 2)
 
-        cv.line(frame, points[0], points[1], color, thickness)
-        cv.line(frame, points[1], points[2], color, thickness)
-        cv.line(frame, points[2], points[3], color, thickness)
-        cv.line(frame, points[3], points[0], color, thickness)
-        cv.putText(frame, out.barcode_text, (min([point[0] for point in points]), min(
-            [point[1] for point in points])), cv.FONT_HERSHEY_SIMPLEX, 1, color, thickness)
+        cv.putText(frame, item.get_text(), (x1, y1 - 10),
+                    cv.FONT_HERSHEY_SIMPLEX, 0.5, color, thickness)
 
 
 cap = cv.VideoCapture(0)
@@ -52,8 +57,8 @@ def __init__(self):
         self.startTime = 0
         self.counter = 0
 
-    def put(self, v):
-        queue.Queue.put(self, v)
+    def put(self, item, block=True, timeout=None):
+        queue.Queue.put(self, item, block=block, timeout=timeout)
         self.counter += 1
         if self.counter == 1:
             self.startTime = time.time()