Merge pull request #32 from ZoroWang/master

yushulx · web-flow · commit cef7627df81a · 2021-04-15T09:29:37.000+08:00
Update to 8.2
diff --git a/README.md b/README.md
@@ -6,11 +6,11 @@
 ![Dynamsoft](https://dynamsoft.github.io/styleguide/assets/img-icon/logo-dynamsoft-whiteBg-190x47.png "Dynamsoft")  | ![dbr](https://dynamsoft.github.io/styleguide/assets/img-icon/logo-dbr-88x88.png "dbr")
 
 
-**[Dynamsoft's Barcode Reader SDK](https://www.dynamsoft.com/Products/Dynamic-Barcode-Reader.aspx) enables you to efficiently embed barcode reading functionality in your web, desktop or mobile application using just a few lines of code. Saving you months of added development time and resources, our SDK can create high-speed and reliable barcode scanner software applications to meet your business needs.**
+**[Dynamsoft's Barcode Reader SDK](https://www.dynamsoft.com/barcode-reader/overview/?utm_source=github) enables you to efficiently embed barcode reading functionality in your web, desktop or mobile application using just a few lines of code. Saving you months of added development time and resources, our SDK can create high-speed and reliable barcode scanner software applications to meet your business needs.**
 
 ## Dynamsoft Barcode Reader - Python Edition
 
-*Dynamsoft Barcode Reader's Python Edition comes with all the general features of Dynamsoft Barcode Reader, bringing convenience for customers who develop in Python. In addition, you could refer to the Python samples available in our [Github](https://github.com/dynamsoft-dbr/python-barcode) when building your own application. If you have any inquiries about our product, please contact us at support@dynamsoft.com. If you need more information, please check out our [documentation site](https://www.dynamsoft.com/barcode-reader/programming/python/).*
+*Dynamsoft Barcode Reader's Python Edition comes with all the general features of Dynamsoft Barcode Reader, bringing convenience for customers who develop in Python. In addition, you could refer to the Python samples available in our [Github](https://github.com/dynamsoft-dbr/python-barcode) when building your own application. If you have any inquiries about our product, please contact us at support@dynamsoft.com. If you need more information, please check out our [documentation site](https://www.dynamsoft.com/barcode-reader/programming/python/?utm_source=github).*
 
 ## Table Of Contents
 - [Version](#version)
@@ -30,7 +30,7 @@
 
 ### Version
 
-- **8.1.2**
+- **8.2**
 
 ### Supported Platforms
 - **Windows x64**
@@ -55,7 +55,7 @@
 
 ### License
 
-Apply for a trial license: https://www.dynamsoft.com/customer/license/trialLicense
+Apply for a trial license: https://www.dynamsoft.com/customer/license/trialLicense?product=dbr&utm_source=github
 
 ### Supported Symbologies
 *We support all major barcodes symbologies across a variety of industries such as government, finance, retail, warehouse inventory, and healthcare.*
@@ -97,18 +97,18 @@ Apply for a trial license: https://www.dynamsoft.com/customer/license/trialLicen
 
 ### Release Notes 
 
-https://www.dynamsoft.com/barcode-reader/programming/python/?ver=latest#release-notes
+https://www.dynamsoft.com/barcode-reader/programming/python/?ver=latest&utm_source=github#release-notes
 
 ### Interfaces
 
 #### Enumerations
-https://www.dynamsoft.com/barcode-reader/programming/python/api-reference/?ver=latest#enumerations
+https://www.dynamsoft.com/barcode-reader/programming/python/api-reference/?ver=latest&utm_source=github#enumerations
 
 #### Classes
-https://www.dynamsoft.com/barcode-reader/programming/python/api-reference/?ver=latest#classes
+https://www.dynamsoft.com/barcode-reader/programming/python/api-reference/?ver=latest&utm_source=github#classes
 
 #### Main Class Interface
-https://www.dynamsoft.com/barcode-reader/programming/python/api-reference/?ver=latest#barcodereader-methods
+https://www.dynamsoft.com/barcode-reader/programming/python/api-reference/?ver=latest&utm_source=github#barcodereader-methods
 
 ### Appendix
 
diff --git a/demo/BarcodeReaderDemo.py b/demo/BarcodeReaderDemo.py
@@ -186,7 +186,7 @@ def decode_files(path):
 
     license_key = "Input your own license"
 
-    # Apply for a trial license: https://www.dynamsoft.com/CustomerPortal/Portal/Triallicense.aspx
+    # Apply for a trial license: https://www.dynamsoft.com/customer/license/trialLicense?product=dbr&utm_source=github
     reader.init_license(license_key)
     
     ## The code snippet below shows how to use the full license in DBR 8.x:
diff --git a/demo/DecodeVideoDemo.py b/demo/DecodeVideoDemo.py
@@ -203,7 +203,7 @@ def read_barcode():
     # you can change the following variables' value to your own value.
     license_key = "Input your own license"
 
-    # Apply for a trial license: https://www.dynamsoft.com/customer/license/trialLicense
+    # Apply for a trial license: https://www.dynamsoft.com/customer/license/trialLicense?product=dbr&utm_source=github
     reader.init_license(license_key)
 
     ## The code snippet below shows how to use the full license in DBR 8.x:
diff --git a/samples/test_AppendTemplateFile.py b/samples/test_AppendTemplateFile.py
@@ -15,7 +15,7 @@
 
 reader = BarcodeReader()
 
-# Apply for a trial license: https://www.dynamsoft.com/customer/license/trialLicense
+# Apply for a trial license: https://www.dynamsoft.com/customer/license/trialLicense?product=dbr&utm_source=github
 reader.init_license(license_key)
 
 ## The code snippet below shows how to use the full license in DBR 8.x:
diff --git a/samples/test_AppendTemplateString.py b/samples/test_AppendTemplateString.py
@@ -12,7 +12,7 @@
 
 reader = BarcodeReader()
 
-# Apply for a trial license: https://www.dynamsoft.com/customer/license/trialLicense
+# Apply for a trial license: https://www.dynamsoft.com/customer/license/trialLicense?product=dbr&utm_source=github
 reader.init_license(license_key)
 
 ## The code snippet below shows how to use the full license in DBR 8.x:
diff --git a/samples/test_DecodeFile.py b/samples/test_DecodeFile.py
@@ -11,7 +11,7 @@
 
 reader = BarcodeReader()
 
-# Apply for a trial license: https://www.dynamsoft.com/customer/license/trialLicense
+# Apply for a trial license: https://www.dynamsoft.com/customer/license/trialLicense?product=dbr&utm_source=github
 reader.init_license(license_key)
 
 ## The code snippet below shows how to use the full license in DBR 8.x:
diff --git a/samples/test_DecodeFileInMemory.py b/samples/test_DecodeFileInMemory.py
@@ -10,7 +10,7 @@
 
 reader = BarcodeReader()
 
-# Apply for a trial license: https://www.dynamsoft.com/customer/license/trialLicense
+# Apply for a trial license: https://www.dynamsoft.com/customer/license/trialLicense?product=dbr&utm_source=github
 reader.init_license(license_key)
 
 ## The code snippet below shows how to use the full license in DBR 8.x:
diff --git a/samples/test_DecodeImageBufferByOpencv.py b/samples/test_DecodeImageBufferByOpencv.py
@@ -14,7 +14,7 @@
 
 reader = BarcodeReader()
 
-# Apply for a trial license: https://www.dynamsoft.com/customer/license/trialLicense
+# Apply for a trial license: https://www.dynamsoft.com/customer/license/trialLicense?product=dbr&utm_source=github
 reader.init_license(license_key)
 
 ## The code snippet below shows how to use the full license in DBR 8.x:
diff --git a/samples/test_DecodeImagesInFolder.py b/samples/test_DecodeImagesInFolder.py
@@ -14,7 +14,7 @@
 
 reader = BarcodeReader()
 
-# Apply for a trial license: https://www.dynamsoft.com/customer/license/trialLicense
+# Apply for a trial license: https://www.dynamsoft.com/customer/license/trialLicense?product=dbr&utm_source=github
 reader.init_license(license_key)
 
 ## The code snippet below shows how to use the full license in DBR 8.x:
diff --git a/samples/test_DecodeIntermediateResults.py b/samples/test_DecodeIntermediateResults.py
@@ -11,7 +11,7 @@
 
 reader = BarcodeReader()
 
-# Apply for a trial license: https://www.dynamsoft.com/customer/license/trialLicense
+# Apply for a trial license: https://www.dynamsoft.com/customer/license/trialLicense?product=dbr&utm_source=github
 reader.init_license(license_key)
 
 ## The code snippet below shows how to use the full license in DBR 8.x:
diff --git a/samples/test_DecodeLocalVideo.py b/samples/test_DecodeLocalVideo.py
@@ -138,7 +138,7 @@ def read_barcode():
 
 print("-------------------start------------------------")
 
-# Apply for a trial license: https://www.dynamsoft.com/customer/license/trialLicense
+# Apply for a trial license: https://www.dynamsoft.com/customer/license/trialLicense?product=dbr&utm_source=github
 reader.init_license(license_key)
 
 ## The code snippet below shows how to use the full license in DBR 8.x:
diff --git a/samples/test_DecodeLocalVideos.py b/samples/test_DecodeLocalVideos.py
@@ -147,7 +147,7 @@ def read_barcode(video_path):
 
 print("-------------------start------------------------")
 
-# Apply for a trial license: https://www.dynamsoft.com/customer/license/trialLicense
+# Apply for a trial license: https://www.dynamsoft.com/customer/license/trialLicense?product=dbr&utm_source=github
 reader.init_license(license_key)
 
 ## The code snippet below shows how to use the full license in DBR 8.x:
diff --git a/samples/test_DecodeVideoByCamera.py b/samples/test_DecodeVideoByCamera.py
@@ -142,7 +142,7 @@ def read_barcode():
 
 print("-------------------start------------------------")
 
-# Apply for a trial license: https://www.dynamsoft.com/customer/license/trialLicense
+# Apply for a trial license: https://www.dynamsoft.com/customer/license/trialLicense?product=dbr&utm_source=github
 reader.init_license(license_key)
 
 ## The code snippet below shows how to use the full license in DBR 8.x:
diff --git a/samples/test_DecodeVideoByPiCamera.py b/samples/test_DecodeVideoByPiCamera.py
@@ -0,0 +1,188 @@
+import os
+import sys
+import time
+import io
+import numpy as np
+from picamera import PiCamera
+from picamera.array import PiRGBArray
+from dbr import *
+import cv2
+
+# you can change the following variables' value to your own value.
+license_key = "Input your own license"
+json_file = r"Please input your own template path"
+
+reader = BarcodeReader()
+
+def intermediate_results_callback_func(frame_id, i_results, user_data):
+        print(frame_id)
+        for result in i_results:
+            intermediate_result = IntermediateResult(result)
+            print('Intermediate Result data type : {0}'.format(intermediate_result.result_type))
+            print('Intermediate Result data : {0}'.format(intermediate_result.results))
+            print("-------------")
+## Or you can inherit the abstract class IntermediateResultCallBack to implement the abstract method intermediate_results_callback_func.
+# class SubIntermediateResultCallBack(IntermediateResultCallBack):
+#     @staticmethod
+#     def intermediate_results_callback_func(frame_id, i_results, user_data):
+#         print(frame_id)
+#         for result in i_results:
+#             intermediate_result = IntermediateResult(result)
+#             print('Intermediate Result data type : {0}'.format(intermediate_result.result_type))
+#             print('Intermediate Result data : {0}'.format(intermediate_result.results))
+#             print("-------------")
+
+
+def text_results_callback_func(frame_id, t_results, user_data):
+        print(frame_id)
+        for result in t_results:
+            text_result = TextResult(result)
+            print("Barcode Format : ")
+            print(text_result.barcode_format_string)
+            print("Barcode Text : ")
+            print(text_result.barcode_text)
+            print("Localization Points : ")
+            print(text_result.localization_result.localization_points)
+            print("Exception : ")
+            print(text_result.exception)
+            print("-------------")
+## Or you can inherit the abstract class TextResultResultCallBack to implement the abstract method text_results_callback_func.
+# class SubTextResultResultCallBack(TextResultResultCallBack):
+#     @staticmethod
+#     def text_results_callback_func(frame_id, t_results, user_data):
+#         print(frame_id)
+#         for result in t_results:
+#             text_result = TextResult(result)
+#             print("Barcode Format : ")
+#             print(text_result.barcode_format_string)
+#             print("Barcode Text : ")
+#             print(text_result.barcode_text)
+#             print("Localization Points : ")
+#             print(text_result.localization_result.localization_points)
+#             print("Exception : ")
+#             print(text_result.exception)
+#             print("-------------")
+
+
+def error_callback_func(frame_id, error_code, user_data):
+        print(frame_id)
+        error_msg = user_data.get_error_string(error_code)
+        print('Error : {0} ; {1}'.format(error_code, error_msg))
+## Or you can inherit the abstract class ErrorCallBack to implement the abstract method error_callback_func.
+# class SubErrorCallBack(ErrorCallBack):
+#     @staticmethod
+#     def error_callback_func(frame_id, error_code, user_data):
+#         print(frame_id)
+#         error_msg = user_data.get_error_string(error_code)
+#         print('Error : {0} ; {1}'.format(error_code, error_msg))
+
+
+def get_time():
+    localtime = time.localtime()
+    capturetime = time.strftime("%Y%m%d%H%M%S", localtime)
+    return capturetime
+
+def read_barcode():
+    video_width = 0
+    video_height = 0
+    
+    # vc = cv2.VideoCapture(0)
+    camera = PiCamera()
+    camera.resolution = (1024, 1024) # Set image's width and height
+
+    # SetPiCameraParameters(camera):
+    #     camera.saturation = 80 # Video or Image saturation
+    #     camera.brightness = 50 # Video or Image brightness
+    #     camera.shutter_speed = 6000000 # The shutter speed
+    #     camera.iso = 800 # ISO
+    #     camera.sharpness = 0 # Image Sharpness
+    #     camera.hflip = True # Whether to flip horizontally
+    #     camera.vflip = True # Whether to flip vertically
+    #     camera.rotation = 0 # Whether to rotate image
+    #     camera.resolution = (280, 160) # Set image's width and height
+
+
+    video_width = camera.resolution[0]
+    video_height = camera.resolution[1]
+    print(camera.resolution)
+
+    stride = 0
+    stream = io.BytesIO()
+    camera.capture(stream, format='jpeg')
+    # create numpy by stream
+    data = np.frombuffer(stream.getvalue(), dtype=np.uint8)
+    # decode numpy by opencv
+    image = cv2.imdecode(data, 1)
+    stride = image.strides[0]
+    print(stride)
+    rawCapture = PiRGBArray(camera, size=(video_width, video_height))
+
+    windowName = "Barcode Reader"
+
+    parameters = reader.init_frame_decoding_parameters()
+    # you can modify these following parameters.
+    parameters.max_queue_length = 30
+    parameters.max_result_queue_length = 30
+    parameters.width = video_width
+    parameters.height = video_height
+    parameters.stride = stride
+    parameters.image_pixel_format = EnumImagePixelFormat.IPF_RGB_888
+    parameters.region_top = 0
+    parameters.region_bottom = 100
+    parameters.region_left = 0
+    parameters.region_right = 100
+    parameters.region_measured_by_percentage = 1
+    parameters.threshold = 0.01
+    parameters.fps = 0
+    parameters.auto_filter = 1
+
+    reader.start_video_mode(parameters, text_results_callback_func)
+    # reader.start_video_mode(parameters, SubTextResultResultCallBack.text_results_callback_func)
+    ## You can use three callbacks at the same time.
+    # reader.start_video_mode(parameters, text_results_callback_func, "", intermediate_results_callback_func, error_callback_func, reader)
+    # reader.start_video_mode(parameters, SubTextResultResultCallBack.text_results_callback_func, "", SubIntermediateResultCallBack.intermediate_results_callback_func, SubErrorCallBack.error_callback_func, reader)
+
+    for frame in camera.capture_continuous(rawCapture, format='bgr', use_video_port=True):
+        image = frame.array
+
+        try:
+            ret = reader.append_video_frame(image)
+        except:
+            pass
+        
+        # 'ESC' for quit
+        key = cv2.waitKey(1)
+        # reset
+        rawCapture.truncate(0)
+        if key == 27:
+            break
+
+    reader.stop_video_mode()
+    cv2.destroyWindow(windowName)
+
+
+print("-------------------start------------------------")
+
+# Apply for a trial license: https://www.dynamsoft.com/customer/license/trialLicense?product=dbr&utm_source=github
+reader.init_license(license_key)
+
+## The code snippet below shows how to use the full license in DBR 8.x:
+# connection_paras = BarcodeReader.init_lts_connection_parameters()
+## If DBR service is already built on your server, you can fill in the address of your server, or leave this property's default value.
+# connection_paras.main_server_url = "Input your own server url"
+# connection_paras.handshake_code = "Input your own handshake"
+# connection_paras.deployment_type = EnumDMDeploymentType.DM_DT_DESKTOP
+# connection_paras.uuid_generation_method = EnumDMUUIDGenerationMethod.DM_UUIDGM_RANDOM
+# try:
+#     error = BarcodeReader.init_license_from_lts(connection_paras)
+#     if error[0] != EnumErrorCode.DBR_OK:
+#         print(error[1])
+# except BarcodeReaderError as bre:
+#     print(bre)
+
+error = reader.init_runtime_settings_with_file(json_file)
+if error[0] != EnumErrorCode.DBR_OK:
+    print(error[1])
+
+read_barcode()
+print("-------------------over------------------------")
diff --git a/samples/test_InitRuntimeSettingsByFile.py b/samples/test_InitRuntimeSettingsByFile.py
@@ -14,7 +14,7 @@
 
 reader = BarcodeReader()
 
-# Apply for a trial license: https://www.dynamsoft.com/customer/license/trialLicense
+# Apply for a trial license: https://www.dynamsoft.com/customer/license/trialLicense?product=dbr&utm_source=github
 reader.init_license(license_key)
 
 ## The code snippet below shows how to use the full license in DBR 8.x:
diff --git a/samples/test_InitRuntimeSettingsByString.py b/samples/test_InitRuntimeSettingsByString.py
@@ -11,7 +11,7 @@
 
 reader = BarcodeReader()
 
-# Apply for a trial license: https://www.dynamsoft.com/customer/license/trialLicense
+# Apply for a trial license: https://www.dynamsoft.com/customer/license/trialLicense?product=dbr&utm_source=github
 reader.init_license(license_key)
 
 ## The code snippet below shows how to use the full license in DBR 8.x:
diff --git a/samples/test_UpdateRuntimeSettings.py b/samples/test_UpdateRuntimeSettings.py
@@ -8,7 +8,7 @@
 
 reader = BarcodeReader()
 
-# Apply for a trial license: https://www.dynamsoft.com/customer/license/trialLicense
+# Apply for a trial license: https://www.dynamsoft.com/customer/license/trialLicense?product=dbr&utm_source=github
 reader.init_license(license_key)
 
 ## The code snippet below shows how to use the full license in DBR 8.x:
