Update

Author: yushulx

src/docscanner.cpp

@@ -101,4 +101,3 @@ PyMODINIT_FUNC PyInit_docscanner(void)
 	PyModule_AddStringConstant(module, "version", DDN_GetVersion());
     return module;
 }
-

test.py

@@ -18,26 +18,26 @@ def showNormalizedImage(name, normalized_image):
     return mat
 
 # decodeFile()
-# print('')
-# print('Test decodeFile()')
-# results = scanner.decodeFile("images/1.png")
-# image = cv2.imread("images/1.png")
-# for result in results:
-#     x1 = result.x1
-#     y1 = result.y1
-#     x2 = result.x2
-#     y2 = result.y2
-#     x3 = result.x3
-#     y3 = result.y3
-#     x4 = result.x4
-#     y4 = result.y4
+print('')
+print('Test decodeFile()')
+results = scanner.decodeFile("images/1.png")
+image = cv2.imread("images/1.png")
+for result in results:
+    x1 = result.x1
+    y1 = result.y1
+    x2 = result.x2
+    y2 = result.y2
+    x3 = result.x3
+    y3 = result.y3
+    x4 = result.x4
+    y4 = result.y4
 
-#     normalized_image = scanner.normalizeFile("images/1.png", x1, y1, x2, y2, x3, y3, x4, y4)
-#     showNormalizedImage("Normalized Image", normalized_image)
-#     cv2.drawContours(image, [np.int0([(x1, y1), (x2, y2), (x3, y3), (x4, y4)])], 0, (0, 255, 0), 2)
+    normalized_image = scanner.normalizeFile("images/1.png", x1, y1, x2, y2, x3, y3, x4, y4)
+    showNormalizedImage("Normalized Image", normalized_image)
+    cv2.drawContours(image, [np.int0([(x1, y1), (x2, y2), (x3, y3), (x4, y4)])], 0, (0, 255, 0), 2)
 
-# cv2.imshow("image", image)
-# cv2.waitKey(0)
+cv2.imshow('Document Image', image)
+cv2.waitKey(0)
 
 
 # decodeMat()
@@ -60,7 +60,7 @@ def showNormalizedImage(name, normalized_image):
 #     showNormalizedImage("Normalized Image", normalized_image)
 #     cv2.drawContours(image, [np.int0([(x1, y1), (x2, y2), (x3, y3), (x4, y4)])], 0, (0, 255, 0), 2)
 
-# cv2.imshow("image", image)
+# cv2.imshow('Document Image', image)
 # cv2.waitKey(0)
 
 # decodeMatAsync()
@@ -79,7 +79,7 @@ def showNormalizedImage(name, normalized_image):
 
 #         cv2.drawContours(image, [np.int0([(x1, y1), (x2, y2), (x3, y3), (x4, y4)])], 0, (0, 255, 0), 2)
 
-#     cv2.imshow("image", image)  
+#     cv2.imshow('Document Image', image)  
 #     cv2.waitKey(0)
 
 # import cv2
@@ -88,63 +88,63 @@ def showNormalizedImage(name, normalized_image):
 # scanner.decodeMatAsync(image)
 # sleep(5)
 
-g_results = None
-g_normalized_images = []
+# g_results = None
+# g_normalized_images = []
 
-def callback(results):
-    global g_results
-    g_results = results
+# def callback(results):
+#     global g_results
+#     g_results = results
 
-scanner.addAsyncListener(callback)
+# scanner.addAsyncListener(callback)
 
-cap = cv2.VideoCapture(0)
-while True:
-    ret, image = cap.read()
+# cap = cv2.VideoCapture(0)
+# while True:
+#     ret, image = cap.read()
 
-    ch = cv2.waitKey(1)
-    if ch == 27:
-        break
-    elif ch == ord('n'): # normalize image
-        if g_results != None:
-            g_normalized_images = []
-            index = 0
-            for result in g_results:
-                x1 = result.x1
-                y1 = result.y1
-                x2 = result.x2
-                y2 = result.y2
-                x3 = result.x3
-                y3 = result.y3
-                x4 = result.x4
-                y4 = result.y4
+#     ch = cv2.waitKey(1)
+#     if ch == 27:
+#         break
+#     elif ch == ord('n'): # normalize image
+#         if g_results != None:
+#             g_normalized_images = []
+#             index = 0
+#             for result in g_results:
+#                 x1 = result.x1
+#                 y1 = result.y1
+#                 x2 = result.x2
+#                 y2 = result.y2
+#                 x3 = result.x3
+#                 y3 = result.y3
+#                 x4 = result.x4
+#                 y4 = result.y4
 
-                normalized_image = scanner.normalizeBuffer(image, x1, y1, x2, y2, x3, y3, x4, y4)
-                g_normalized_images.append((str(index), normalized_image))
-                mat = showNormalizedImage(str(index), normalized_image)
-                index += 1
-    elif ch == ord('s'): # save image
-        for data in g_normalized_images:
-            # cv2.imwrite('images/' + str(time.time()) + '.png', image)
-            cv2.destroyWindow(data[0])
-            data[1].save(str(time.time()) + '.png')
-            print('Image saved')
+#                 normalized_image = scanner.normalizeBuffer(image, x1, y1, x2, y2, x3, y3, x4, y4)
+#                 g_normalized_images.append((str(index), normalized_image))
+#                 mat = showNormalizedImage(str(index), normalized_image)
+#                 index += 1
+#     elif ch == ord('s'): # save image
+#         for data in g_normalized_images:
+#             # cv2.imwrite('images/' + str(time.time()) + '.png', image)
+#             cv2.destroyWindow(data[0])
+#             data[1].save(str(time.time()) + '.png')
+#             print('Image saved')
 
-        g_normalized_images = []
+#         g_normalized_images = []
 
-    if image is not None:
-        scanner.decodeMatAsync(image)
+#     if image is not None:
+#         scanner.decodeMatAsync(image)
 
-    if g_results != None:
-        for result in g_results:
-            x1 = result.x1
-            y1 = result.y1
-            x2 = result.x2
-            y2 = result.y2
-            x3 = result.x3
-            y3 = result.y3
-            x4 = result.x4
-            y4 = result.y4
+#     if g_results != None:
+#         for result in g_results:
+#             x1 = result.x1
+#             y1 = result.y1
+#             x2 = result.x2
+#             y2 = result.y2
+#             x3 = result.x3
+#             y3 = result.y3
+#             x4 = result.x4
+#             y4 = result.y4
 
-            cv2.drawContours(image, [np.int0([(x1, y1), (x2, y2), (x3, y3), (x4, y4)])], 0, (0, 255, 0), 2)
+#             cv2.drawContours(image, [np.int0([(x1, y1), (x2, y2), (x3, y3), (x4, y4)])], 0, (0, 255, 0), 2)
 
-    cv2.imshow('Document Scanner', image)
+#     cv2.imshow('Document Scanner', image)