Speedup HoughLinesP by filtering image before

bansan85 · Nov 17, 2020 · 5c7409b · 5c7409b
1 parent 667b56f
commit 5c7409b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 43 deletions.
diff --git a/page/split.py b/page/split.py
@@ -411,9 +411,11 @@ def __found_candidates_split_line_with_line(
         apertureSize=param.canny.aperture_size,
     )
     cv2ext.write_image_if(canny, enable_debug, "_2_3.png")
+    canny_filtered = cv2.bitwise_and(canny, cv2.bitwise_not(images_mask))
+    cv2ext.write_image_if(canny_filtered, enable_debug, "_2_4.png")
 
     list_lines_p = cv2.HoughLinesP(
-        canny,
+        canny_filtered,
         param.hough_lines.delta_rho,
         param.hough_lines.delta_tetha,
         param.hough_lines.threshold,
@@ -446,21 +448,8 @@ def __found_candidates_split_line_with_line(
                 image, lines_valid, (0, 0, 255), 1
             ),
         )
-    lines_valid2 = list(
-        filter(
-            lambda x: cv2ext.is_line_not_cross_images(x[0], images_mask),
-            lines_valid,
-        )
-    )
-    if enable_debug is not None:
-        cv2ext.secure_write(
-            enable_debug + "_2_8.png",
-            cv2ext.draw_lines_from_hough_lines(
-                image, lines_valid2, (0, 0, 255), 1
-            ),
-        )
 
-    return list(map(lambda p: p[0], lines_valid2))
+    return list(map(lambda p: p[0], lines_valid))
 
 
 def __loop_to_find_best_mean_angle_pos(

diff --git a/page/unskew.py b/page/unskew.py
@@ -134,11 +134,15 @@ def find_rotation(
         apertureSize=parameters.canny.aperture_size,
     )
     cv2ext.write_image_if(canny, enable_debug, "_" + str(n_page) + "_3.png")
+    canny_filtered = cv2.bitwise_and(canny, cv2.bitwise_not(images_mask))
+    cv2ext.write_image_if(
+        canny_filtered, enable_debug, "_" + str(n_page) + "_4.png"
+    )
 
     # Détection des lignes.
     # La précision doit être de l'ordre de 0.05°
     list_lines = cv2.HoughLinesP(
-        canny,
+        canny_filtered,
         parameters.hough_lines.delta_rho,
         parameters.hough_lines.delta_tetha,
         parameters.hough_lines.threshold,
@@ -169,34 +173,12 @@ def find_rotation(
                 1,
             )
         cv2ext.secure_write(
-            enable_debug + "_" + str(n_page) + "_4.png", image_with_lines
-        )
-        cv2ext.secure_write(
-            enable_debug + "_" + str(n_page) + "_4bbbb.png", img
-        )
-
-    lines_filtered = list(
-        filter(
-            lambda x: cv2ext.is_line_not_cross_images(x, images_mask), lines
-        )
-    )
-
-    if enable_debug is not None:
-        image_with_lines = cv2ext.convertion_en_couleur(image)
-        for line_x1, line_y1, line_x2, line_y2 in lines_filtered:
-            cv2.line(
-                image_with_lines,
-                (line_x1, line_y1),
-                (line_x2, line_y2),
-                (255, 0, 0),
-                1,
-            )
-        cv2ext.secure_write(
-            enable_debug + "_" + str(n_page) + "_4ccccc.png", image_with_lines
+            enable_debug + "_" + str(n_page) + "_5.png", image_with_lines
         )
+        cv2ext.secure_write(enable_debug + "_" + str(n_page) + "_6.png", img)
 
     return found_angle_unskew_page(
-        lines_filtered,
+        lines,
         parameters.hough_lines.delta_tetha / np.pi * 180.0,
         approximate_angle,
     )
diff --git a/script.py b/script.py
@@ -100,7 +100,7 @@ def unskew_page(
         img_rotated = cv2ext.rotate_image(image, rotate_angle)
         if enable_debug is not None:
             cv2ext.secure_write(
-                enable_debug + "_" + str(n_page) + "_5.png", img_rotated
+                enable_debug + "_" + str(n_page) + "_8.png", img_rotated
             )
         return img_rotated
 

diff --git a/tests b/tests