Merge pull request #10 from TheJacksonLaboratory/dev

Fix bugs with user interface

Author: fercer

src/napari_activelearning/_interface.py

@@ -100,14 +100,17 @@ def clear_layer_channel(self):
         while self._curr_scale_le_list:
             item = self._curr_scale_le_list.pop()
             self.edit_scale_lyt.removeWidget(item)
+            item.deleteLater()
 
         while self._curr_labels_list:
             item = self._curr_labels_list.pop()
             self.edit_scale_lyt.removeWidget(item)
+            item.deleteLater()
 
         while self._curr_power_spn_list:
             item = self._curr_power_spn_list.pop()
             self.edit_scale_lyt.removeWidget(item)
+            item.deleteLater()
 
     def update_spin_boxes(self):
         self.clear_layer_channel()
@@ -129,7 +132,7 @@ def update_spin_boxes(self):
                                           0)
 
             scale_le.textChanged.connect(
-                partial(self._set_patch_size)
+                self._set_patch_size
             )
             power_spn.valueChanged.connect(
                 partial(self._modify_size, ax_idx=ax_idx)
@@ -771,7 +774,8 @@ def focus_region(self, label: Optional[QTreeWidgetItem] = None,
         super(LabelsManagerWidget, self).focus_region(label,
                                                       edit_focused_label)
 
-        self.edit_labels_btn.setEnabled(self._active_label is not None)
+        self.edit_labels_btn.setEnabled(self._active_label is not None
+                                        and not edit_focused_label)
         self.remove_labels_btn.setEnabled(self._active_label is not None)
         self.remove_labels_group_btn.setEnabled(
             self._active_label_group is not None
@@ -785,7 +789,7 @@ def focus_region(self, label: Optional[QTreeWidgetItem] = None,
     def edit_labels(self):
         editing = super(LabelsManagerWidget, self).edit_labels()
         self.commit_btn.setEnabled(editing)
-        self.edit_labels_btn.setEnabled(editing)
+        self.edit_labels_btn.setEnabled(not editing)
 
     def commit(self):
         super(LabelsManagerWidget, self).commit()

src/napari_activelearning/_labels.py

@@ -60,6 +60,9 @@ def acquisition_val(self, new_acquisition_val: float):
         self._acquisition_val = new_acquisition_val
         self.setText(0, str(self._acquisition_val))
 
+    def __gt__(self, other_label):
+        return self._acquisition_val > other_label._acquisition_val
+
 
 class LabelGroup(QTreeWidgetItem):
     _layer_channel = None
@@ -208,20 +211,21 @@ def remove_labels(self):
 
         self._active_label_group.removeChild(self._active_label)
         if not self._active_label_group.childCount():
-            self.remove_labels_group(self._active_label_group)
+            self.remove_labels_group()
 
-        self._active_label = None
+        self._requires_commit = False
+        self.commit()
 
     def remove_labels_group(self):
         if self._active_label_group is None:
             return
 
         self.labels_group_root.removeChild(self._active_label_group)
-        self._active_label_group = None
+        self._requires_commit = False
+        self.commit()
 
     def navigate(self, delta_patch_index=0, delta_image_index=0):
-        if self._requires_commit:
-            self.commit()
+        self.commit()
 
         self._active_label_group = self._active_label.parent()
         patch_index = self._active_label_group.indexOfChild(
@@ -403,40 +407,40 @@ def edit_labels(self):
         return True
 
     def commit(self):
-        if not self._requires_commit:
-            return
-
-        edit_data = None
-        if self._active_edit_layer:
-            edit_data = self._active_edit_layer.data
-
         segmentation_channel_layer = None
         segmentation_channel_data = None
-        if self._active_layers_group:
-            segmentation_channel = self._active_layers_group.child(0)
-            segmentation_channel_layer = segmentation_channel.layer
-            if isinstance(segmentation_channel.layer.data, MultiScaleData):
-                segmentation_channel_data = segmentation_channel_layer.data[0]
-            else:
-                segmentation_channel_data = segmentation_channel_layer.data
-
-        if isinstance(self._transaction, ts.Transaction):
-            self._transaction.commit_async()
-        elif (self._active_label.position is not None
-              and segmentation_channel_data is not None):
-            segmentation_channel_data[self._active_label.position] = edit_data
+        edit_data = None
 
-        if segmentation_channel_layer:
-            segmentation_channel_layer.refresh()
-            segmentation_channel_layer.visible = True
+        if self._requires_commit:
+            if self._active_edit_layer:
+                edit_data = self._active_edit_layer.data
+
+            if self._active_layers_group:
+                segmentation_channel = self._active_layers_group.child(0)
+                segmentation_channel_layer = segmentation_channel.layer
+                if isinstance(segmentation_channel.layer.data, MultiScaleData):
+                    segmentation_channel_data =\
+                        segmentation_channel_layer.data[0]
+                else:
+                    segmentation_channel_data = segmentation_channel_layer.data
+
+            if isinstance(self._transaction, ts.Transaction):
+                self._transaction.commit_async()
+            elif (self._active_label.position is not None
+                  and segmentation_channel_data is not None):
+                segmentation_channel_data[self._active_label.position] =\
+                    edit_data
 
         viewer = napari.current_viewer()
         if (self._active_edit_layer
            and self._active_edit_layer in viewer.layers):
             viewer.layers.remove(self._active_edit_layer)
 
+        if segmentation_channel_layer:
+            segmentation_channel_layer.refresh()
+            segmentation_channel_layer.visible = True
+            viewer.layers.selection.add(segmentation_channel_layer)
+
         self._transaction = None
         self._active_edit_layer = None
-
         self._requires_commit = False
-        viewer.layers.selection.add(segmentation_channel_layer)