Should now retain modified redactions on first use of zoom

app.py

@@ -308,11 +308,12 @@ with app:
     
     # Zoom in and out on annotator
     annotate_zoom_in.click(modify_existing_page_redactions, inputs = [annotator, annotate_current_page, annotate_previous_page, all_image_annotations_state], outputs = [all_image_annotations_state, annotate_previous_page, annotate_current_page_bottom]).\
-        then(update_zoom, inputs=[annotator_zoom_number, zoom_true_bool], outputs=[annotator_zoom_number]).\
-        then(update_annotator, inputs=[all_image_annotations_state, annotate_current_page, annotator_zoom_number], outputs = [annotator, annotate_current_page, annotate_current_page_bottom])
+        then(update_zoom, inputs=[annotator_zoom_number, annotate_current_page, zoom_true_bool], outputs=[annotator_zoom_number, annotate_current_page])
+        
     annotate_zoom_out.click(modify_existing_page_redactions, inputs = [annotator, annotate_current_page, annotate_previous_page, all_image_annotations_state], outputs = [all_image_annotations_state, annotate_previous_page, annotate_current_page_bottom]).\
-        then(update_zoom, inputs=[annotator_zoom_number, zoom_false_bool], outputs=[annotator_zoom_number]).\
-        then(update_annotator, inputs=[all_image_annotations_state, annotate_current_page, annotator_zoom_number], outputs = [annotator, annotate_current_page, annotate_current_page_bottom])
+        then(update_zoom, inputs=[annotator_zoom_number, annotate_current_page, zoom_false_bool], outputs=[annotator_zoom_number, annotate_current_page])
+    
+    annotator_zoom_number.change(update_annotator, inputs=[all_image_annotations_state, annotate_current_page, annotator_zoom_number], outputs = [annotator, annotate_current_page, annotate_current_page_bottom])
 
     #annotation_button_get.click(get_boxes_json, annotator, json_boxes)
     annotation_button_apply.click(apply_redactions, inputs=[annotator, in_doc_files, pdf_doc_state, all_image_annotations_state, annotate_current_page], outputs=[pdf_doc_state, all_image_annotations_state, output_review_files], scroll_to_output=True)

tools/redaction_review.py

@@ -37,7 +37,7 @@ def increase_page(number:int, image_annotator_object:AnnotatedImageData):
     else:
         return max_pages, max_pages
 
-def update_zoom(current_zoom_level:int, decrease:bool=True):
+def update_zoom(current_zoom_level:int, annotate_current_page:int, decrease:bool=True):
     if decrease == False:
         if current_zoom_level >= 50:
             current_zoom_level -= 10
@@ -45,7 +45,7 @@ def update_zoom(current_zoom_level:int, decrease:bool=True):
         if current_zoom_level < 100:
             current_zoom_level += 10
         
-    return current_zoom_level
+    return current_zoom_level, annotate_current_page
 
 
 def update_annotator(image_annotator_object:AnnotatedImageData, page_num:int, zoom:int=100):
@@ -110,13 +110,15 @@ def modify_existing_page_redactions(image_annotated:AnnotatedImageData, current_
     '''
     Overwrite current image annotations with modifications
     '''
-    #If no previous page or is 0, i.e. first time run, then make no changes
-    if not previous_page:
-        return all_image_annotations, current_page, current_page
-
+    
     if not current_page:
         current_page = 1
 
+    #If no previous page or is 0, i.e. first time run, then rewrite current page
+    if not previous_page:
+        previous_page = current_page
+        #return all_image_annotations, current_page, current_page
+
     #print("all_image_annotations before:",all_image_annotations)
     
     image_annotated['image'] = all_image_annotations[previous_page - 1]["image"]