Split extract_crossword into extract_crossword_grid and grid_to_png

functions.

home/management/commands/extract.py

@@ -1,5 +1,5 @@
 from django.core.management.base import BaseCommand
-from ...xword import extract_crossword
+from ...xword import extract_crossword_grid, grid_to_png
 
 
 class Command(BaseCommand):
@@ -37,7 +37,7 @@ class Command(BaseCommand):
         group.add_argument('--html')
 
     def handle(self, *args, **options):
-        image, warnings = extract_crossword(
+        warnings, grid, num_rows, num_cols, block_img = extract_crossword_grid(
             options['input_file_name'],
             gaussian_blur_size=options['gaussian_blur_size'],
             adaptive_threshold_block_size=options['adaptive_threshold_block_size'],
@@ -49,7 +49,12 @@ class Command(BaseCommand):
             line_detector_element_size=options['line_detector_element_size'],
             sampling_block_size_ratio=options['sampling_block_size_ratio'],
             sampling_threshold_quantile=options['sampling_threshold_quantile'],
-            sampling_threshold=options['sampling_threshold'],
+            sampling_threshold=options['sampling_threshold']
+        )
+        image = grid_to_png(
+            grid,
+            num_rows,
+            num_cols,
             grid_line_thickness=options['grid_line_thickness'],
             grid_square_size=options['grid_square_size'],
             grid_border_size=options['grid_border_size']

home/views.py

@@ -4,7 +4,7 @@ from django.http import HttpResponse, HttpResponseBadRequest
 from django.shortcuts import render
 from django.views import View
 from .forms import CrosswordForm
-from .xword import extract_crossword
+from .xword import extract_crossword_grid, grid_to_png
 
 
 class HomeView(View):
@@ -15,10 +15,11 @@ class HomeView(View):
         form = CrosswordForm(request.POST, request.FILES)
         if not form.is_valid():
             return HttpResponseBadRequest('Invalid form data')
-        image, warnings = extract_crossword(
+        warnings, grid, num_rows, num_cols, block_img = extract_crossword_grid(
             form.cleaned_data['file'].temporary_file_path(),
             filter_colours=False
         )
+        image = grid_to_png(grid, num_rows, num_cols)
         return render(request, 'home/output.html', {
             'warnings': warnings,
             'image_file_name': 'xword_{}.png'.format(datetime.now().strftime('%Y%m%d_%H%M%S')),

home/xword.py

@@ -196,7 +196,7 @@ def show_image(image):
     cv2.destroyAllWindows()
 
 
-def extract_crossword(
+def extract_crossword_grid(
     file_name,
     filter_colours=False,
     colour_filter_threshold=48,
@@ -210,10 +210,7 @@ def extract_crossword(
     line_detector_element_size=51,
     sampling_block_size_ratio=0.25,
     sampling_threshold_quantile=0.3,
-    sampling_threshold=None,
-    grid_line_thickness=4,
-    grid_square_size=64,
-    grid_border_size=20,
+    sampling_threshold=None
 ):
     warnings = []
 
@@ -245,6 +242,17 @@ def extract_crossword(
     if warning:
         warnings.append("Some blocks may be the wrong colour")
 
+    return warnings, grid, num_rows, num_cols, block_img
+
+
+def grid_to_png(
+    grid,
+    num_rows,
+    num_cols,
+    grid_line_thickness=4,
+    grid_square_size=64,
+    grid_border_size=20
+):
     step = grid_square_size + grid_line_thickness
     grid_height = num_rows * step + grid_line_thickness
     grid_width = num_cols * step + grid_line_thickness
@@ -258,4 +266,4 @@ def extract_crossword(
                 cv2.rectangle(output, (x, y), (x + grid_square_size - 1, y + grid_square_size - 1), 255, -1)
 
     _, png = cv2.imencode('.png', output)
-    return png.tobytes(), warnings
+    return png.tobytes()