Fixed bug where pages suggested for whole redaction are one lower than requested

app.py

@@ -117,7 +117,7 @@ with app:
 
 
     ## Annotator zoom value
-    annotator_zoom_number = gr.Number(label = "Current annotator zoom level", value=80, precision=0, visible=False)
+    annotator_zoom_number = gr.Number(label = "Current annotator zoom level", value=100, precision=0, visible=False)
     zoom_true_bool = gr.State(True)
     zoom_false_bool = gr.State(False)
 

tools/file_redaction.py

@@ -708,8 +708,6 @@ def redact_page_with_pymupdf(page:Page, page_annotations:dict, image=None, custo
             if image:
                 img_width, img_height = image.size
 
-                print("annot:", annot)
-
                 x1, image_y1, x2, image_y2 = convert_pymupdf_to_image_coords(page, x1, pymupdf_y1, x2, pymupdf_y2, image)
 
                 img_annotation_box["xmin"] = x1  #* (img_width / rect_width) # Use adjusted x1
@@ -745,9 +743,6 @@ def redact_page_with_pymupdf(page:Page, page_annotations:dict, image=None, custo
         "boxes": all_image_annotation_boxes
     }
 
-    
-
-
     page.apply_redactions(images=0, graphics=0)
     page.clean_contents()
 
@@ -1160,7 +1155,8 @@ def redact_image_pdf(file_path:str,
             else:
                 #print("redact_whole_page_list:", redact_whole_page_list)
                 if redact_whole_page_list:
-                    if current_loop_page in redact_whole_page_list: redact_whole_page = True
+                    int_reported_page_number = int(reported_page_number) 
+                    if int_reported_page_number in redact_whole_page_list: redact_whole_page = True
                     else: redact_whole_page = False
                 else: redact_whole_page = False
 
@@ -1846,8 +1842,9 @@ def redact_text_pdf(
 
                 # Make pymupdf page redactions
                 #print("redact_whole_page_list:", redact_whole_page_list)
-                if redact_whole_page_list:                    
-                    if current_loop_page in redact_whole_page_list: redact_whole_page = True
+                if redact_whole_page_list:
+                    int_reported_page_number = int(reported_page_number)                    
+                    if int_reported_page_number in redact_whole_page_list: redact_whole_page = True
                     else: redact_whole_page = False
                 else: redact_whole_page = False
 

tools/redaction_review.py

@@ -49,7 +49,7 @@ def update_zoom(current_zoom_level:int, annotate_current_page:int, decrease:bool
         
     return current_zoom_level, annotate_current_page
 
-def update_annotator(image_annotator_object:AnnotatedImageData, page_num:int, recogniser_entities_drop=gr.Dropdown(value="ALL", allow_custom_value=True), recogniser_dataframe_gr=gr.Dataframe(pd.DataFrame(data={"page":[], "label":[]})), zoom:int=80):
+def update_annotator(image_annotator_object:AnnotatedImageData, page_num:int, recogniser_entities_drop=gr.Dropdown(value="ALL", allow_custom_value=True), recogniser_dataframe_gr=gr.Dataframe(pd.DataFrame(data={"page":[], "label":[]})), zoom:int=100):
     '''
     Update a gradio_image_annotation object with new annotation data
     '''