cleanup setting of blurred/concealed check boxes

Author: timonegk

imagetagger/imagetagger/annotations/static/annotations/js/annotations.js

@@ -521,6 +521,8 @@ function calculateImageScale() {
     gEditAnnotationId = undefined;
     $('.annotation').removeClass('alert-info');
     $('#edit_active').addClass('hidden');
+    $('#concealed').prop('checked', false);
+    $('#blurred').prop('checked', false);
   }
 
   /**
@@ -821,11 +823,6 @@ function calculateImageScale() {
 
     let loadImage = displayImage(imageId);
 
-    if (!$('#keep_selection').prop('checked')) {
-      $('#concealed').prop('checked', false);
-      $('#blurred').prop('checked', false);
-    }
-
     $('.annotate_image_link').removeClass('active');
     let link = $('#annotate_image_link_' + imageId);
     link.addClass('active');
@@ -838,8 +835,14 @@ function calculateImageScale() {
     $('#delete-image-form').attr('action', DELETE_IMAGE_URL.replace('%s', imageId));
 
     tool.clear();
-    if (globals.restoreSelection !== undefined) {
+    if (globals.restoreSelection !== undefined && $('#keep_selection').prop('checked')) {
       tool.restoreSelection();
+      if (globals.restoreSelection === null) {
+        // not in image
+        $('#not_in_image').prop('checked', true);
+        $('#coordinate_table').hide();
+        setupCBCheckboxes();
+      }
     } else {
       resetSelection();
     }

imagetagger/imagetagger/annotations/static/annotations/js/boundingboxes.js

@@ -150,13 +150,8 @@ class BoundingBoxes {
    * Restore the selection.
    */
   restoreSelection() {
-    if (!$('#keep_selection').prop('checked')) {
-      return;
-    }
     if (globals.restoreSelection !== undefined) {
       if (globals.restoreSelection === null) {
-        $('#not_in_image').prop('checked', true);
-        $('#coordinate_table').hide();
       } else {
         $('#x1Field').val(globals.restoreSelection.x1);
         $('#x2Field').val(globals.restoreSelection.x2);

imagetagger/imagetagger/annotations/static/annotations/js/canvas.js

@@ -572,23 +572,8 @@ class Canvas {
    * Restore the selection.
    */
   restoreSelection() {
-    if (!$('#keep_selection').prop('checked')) {
-      return;
-    }
     if (globals.restoreSelection !== undefined) {
       if (globals.restoreSelection === null) {
-        $('#not_in_image').prop('checked', true);
-        $('#coordinate_table').hide();
-        let concealed = $('#concealed');
-        let concealedP = $('#concealed_p');
-        let blurred = $('#blurred');
-        let blurredP = $('#blurred_p');
-        concealedP.hide();
-        concealed.prop('checked', false);
-        concealed.prop('disabled', true);
-        blurredP.hide();
-        blurred.prop('checked', false);
-        blurred.prop('disabled', true);
       } else if (globals.restoreSelectionVectorType === 4) {
         // this is not implemented for multilines, so just do nothing
         this.old = undefined;