Merge PR #323 | Proofreading undo/redo & load/save state

kreshuklab · Sep 19, 2024 · 2083be1 · 2083be1
2 parents 9588363 + 8ac7db1
commit 2083be1
Show file tree

Hide file tree

Showing 4 changed files with 281 additions and 81 deletions.
diff --git a/plantseg/core/image.py b/plantseg/core/image.py
@@ -35,15 +35,15 @@ class SemanticType(Enum):
 
     Attributes:
         RAW (str): Reserved for raw images (e.g. microscopy images)
-        SEGMENTATION (str): Reserved for segmentation masks
-        PREDICTION (str): Reserved for model prediction
         LABEL (str): Reserved for ground truth labels
+        PREDICTION (str): Reserved for model prediction
+        SEGMENTATION (str): Reserved for segmentation masks
     """
 
     RAW = "raw"
-    SEGMENTATION = "segmentation"
-    PREDICTION = "prediction"
     LABEL = "label"
+    PREDICTION = "prediction"
+    SEGMENTATION = "segmentation"
 
 
 class ImageType(Enum):

diff --git a/plantseg/viewer_napari/containers.py b/plantseg/viewer_napari/containers.py
@@ -15,10 +15,14 @@
     widget_infos,
     widget_lifted_multicut,
     widget_open_file,
+    widget_proofreading_initialisation,
+    widget_redo,
     widget_remove_false_positives_by_foreground,
     widget_rescaling,
+    widget_save_state,
     widget_show_info,
     widget_split_and_merge_from_scribbles,
+    widget_undo,
     widget_unet_prediction,
 )
 
@@ -104,9 +108,13 @@ def get_extras_tab():
 def get_proofreading_tab():
     container = MainWindow(
         widgets=[
+            widget_proofreading_initialisation,
             widget_split_and_merge_from_scribbles,
             widget_clean_scribble,
             widget_filter_segmentation,
+            widget_undo,
+            widget_redo,
+            widget_save_state,
             widget_remove_false_positives_by_foreground,
             widget_fix_over_under_segmentation_from_nuclei,
         ],

diff --git a/plantseg/viewer_napari/widgets/__init__.py b/plantseg/viewer_napari/widgets/__init__.py
@@ -10,7 +10,11 @@
     widget_add_label_to_corrected,
     widget_clean_scribble,
     widget_filter_segmentation,
+    widget_proofreading_initialisation,
+    widget_redo,
+    widget_save_state,
     widget_split_and_merge_from_scribbles,
+    widget_undo,
 )
 from plantseg.viewer_napari.widgets.segmentation import widget_agglomeration, widget_dt_ws, widget_lifted_multicut
 
@@ -32,9 +36,13 @@
     "widget_lifted_multicut",
     "widget_add_custom_model",
     # Proofreading
+    "widget_proofreading_initialisation",
     "widget_split_and_merge_from_scribbles",
     "widget_clean_scribble",
     "widget_filter_segmentation",
+    "widget_undo",
+    "widget_redo",
+    "widget_save_state",
     "widget_add_label_to_corrected",  # XXX: Not used in container
     "widget_remove_false_positives_by_foreground",
     "widget_fix_over_under_segmentation_from_nuclei",