coralnet-toolbox 0.0.69__tar.gz → 0.0.70__tar.gz

{coralnet_toolbox-0.0.69 → coralnet_toolbox-0.0.70}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: coralnet-toolbox
-Version: 0.0.69
+Version: 0.0.70
 Summary: Tools for annotating and developing ML models for benthic imagery
 Author-email: Jordan Pierce <jordan.pierce@noaa.gov>
 License: MIT License
@@ -94,10 +94,12 @@ coralnet-toolbox
 
 ## 📚 Guides
 
-For further instructions please see the following guides:
+For further information and instructions, please see the following guides:
+- [Overview](https://jordan-pierce.github.io/CoralNet-Toolbox/overview)
 - [Installation](https://jordan-pierce.github.io/CoralNet-Toolbox/installation)
 - [Usage](https://jordan-pierce.github.io/CoralNet-Toolbox/usage)
-- [Patch-based Image Classifier](https://jordan-pierce.github.io/CoralNet-Toolbox/classify)
+- Community Provided:
+  - [Patch-based Image Classifier](https://jordan-pierce.github.io/CoralNet-Toolbox/classify)
 
 <details open>
   <summary><h2><b>🎥 Watch the Video Demos</b></h2></summary>

{coralnet_toolbox-0.0.69 → coralnet_toolbox-0.0.70}/README.md

@@ -50,10 +50,12 @@ coralnet-toolbox
 
 ## 📚 Guides
 
-For further instructions please see the following guides:
+For further information and instructions, please see the following guides:
+- [Overview](https://jordan-pierce.github.io/CoralNet-Toolbox/overview)
 - [Installation](https://jordan-pierce.github.io/CoralNet-Toolbox/installation)
 - [Usage](https://jordan-pierce.github.io/CoralNet-Toolbox/usage)
-- [Patch-based Image Classifier](https://jordan-pierce.github.io/CoralNet-Toolbox/classify)
+- Community Provided:
+  - [Patch-based Image Classifier](https://jordan-pierce.github.io/CoralNet-Toolbox/classify)
 
 <details open>
   <summary><h2><b>🎥 Watch the Video Demos</b></h2></summary>

{coralnet_toolbox-0.0.69 → coralnet_toolbox-0.0.70}/coralnet_toolbox/Annotations/QtAnnotation.py

@@ -262,7 +262,7 @@ class Annotation(QObject):
             # [1, 2] - Very small dots with small gaps
             # [2, 4] - Small dots with larger gaps
             # [1, 3] - Tiny dots with medium gaps
-            pen = QPen(pen_color, 3)  # Width for dotted line
+            pen = QPen(pen_color, 4)  # Width for dotted line
             pen.setStyle(Qt.CustomDashLine)
             pen.setDashPattern([1, 2])  # Dotted pattern: 2 pixels on, 3 pixels off
             pen.setDashOffset(self._animated_line)

{coralnet_toolbox-0.0.69 → coralnet_toolbox-0.0.70}/coralnet_toolbox/Explorer/QtExplorer.py

@@ -346,6 +346,39 @@ class EmbeddingViewer(QWidget):
 
     def mousePressEvent(self, event):
         """Handle mouse press for selection (point or rubber band) and panning."""
+        # Ctrl+Right-Click for context menu selection 
+        if event.button() == Qt.RightButton and event.modifiers() == Qt.ControlModifier:
+            item_at_pos = self.graphics_view.itemAt(event.pos())
+            if isinstance(item_at_pos, EmbeddingPointItem):
+                # 1. Clear all selections in both viewers
+                self.graphics_scene.clearSelection()
+                item_at_pos.setSelected(True)
+                self.on_selection_changed()  # Updates internal state and emits signals
+
+                # 2. Sync annotation viewer selection
+                ann_id = item_at_pos.data_item.annotation.id
+                self.explorer_window.annotation_viewer.render_selection_from_ids({ann_id})
+
+                # 3. Update annotation window (set image, select, center)
+                explorer = self.explorer_window
+                annotation = item_at_pos.data_item.annotation
+                image_path = annotation.image_path
+
+                if hasattr(explorer, 'annotation_window'):
+                    if explorer.annotation_window.current_image_path != image_path:
+                        if hasattr(explorer.annotation_window, 'set_image'):
+                            explorer.annotation_window.set_image(image_path)
+                    if hasattr(explorer.annotation_window, 'select_annotation'):
+                        explorer.annotation_window.select_annotation(annotation)
+                    if hasattr(explorer.annotation_window, 'center_on_annotation'):
+                        explorer.annotation_window.center_on_annotation(annotation)
+
+                explorer.update_label_window_selection()
+                explorer.update_button_states()
+                event.accept()
+                return
+
+        # Handle left-click for selection or rubber band
         if event.button() == Qt.LeftButton and event.modifiers() == Qt.ControlModifier:
             item_at_pos = self.graphics_view.itemAt(event.pos())
             if isinstance(item_at_pos, EmbeddingPointItem):
@@ -701,6 +734,14 @@ class AnnotationViewer(QScrollArea):
             explorer = self.explorer_window
             image_path = widget.annotation.image_path
             annotation_to_select = widget.annotation
+        
+            # ctrl+right click to only select this annotation (single selection):
+            self.clear_selection()
+            self.select_widget(widget)
+            changed_ids = [widget.data_item.annotation.id]
+
+            if changed_ids:
+                self.selection_changed.emit(changed_ids)
 
             if hasattr(explorer, 'annotation_window'):
                 # Check if the image needs to be changed
@@ -710,15 +751,17 @@ class AnnotationViewer(QScrollArea):
 
                 # Now, select the annotation in the annotation_window
                 if hasattr(explorer.annotation_window, 'select_annotation'):
-                    # This method by default unselects other annotations
                     explorer.annotation_window.select_annotation(annotation_to_select)
+                    
+                # Center the annotation window view on the selected annotation
+                if hasattr(explorer.annotation_window, 'center_on_annotation'):
+                    explorer.annotation_window.center_on_annotation(annotation_to_select)
 
                 # Also clear any existing selection in the explorer window itself
-                explorer.annotation_viewer.clear_selection()
-                explorer.embedding_viewer.render_selection_from_ids(set())
+                explorer.embedding_viewer.render_selection_from_ids({widget.data_item.annotation.id})
                 explorer.update_label_window_selection()
                 explorer.update_button_states()
-
+            
             event.accept()
 
     @pyqtSlot()
@@ -982,6 +1025,8 @@ class AnnotationViewer(QScrollArea):
 
         self.recalculate_widget_positions()
         self._update_toolbar_state()
+        # Update the label window with the new annotation count
+        self.explorer_window.main_window.label_window.update_annotation_count()
 
     def resizeEvent(self, event):
         """On window resize, reflow the annotation widgets."""
@@ -1027,11 +1072,17 @@ class AnnotationViewer(QScrollArea):
                             break
                         widget = widget.parent()
 
-                # If click is outside widgets and there is a selection, clear it
-                if not is_on_widget and self.selected_widgets:
-                    changed_ids = [w.data_item.annotation.id for w in self.selected_widgets]
-                    self.clear_selection()
-                    self.selection_changed.emit(changed_ids)
+                # If click is outside widgets, clear annotation_window selection
+                if not is_on_widget:
+                    # Clear annotation selection in the annotation_window as well
+                    if hasattr(self.explorer_window, 'annotation_window') and self.explorer_window.annotation_window:
+                        if hasattr(self.explorer_window.annotation_window, 'unselect_annotations'):
+                            self.explorer_window.annotation_window.unselect_annotations()
+                    # If there is a selection in the viewer, clear it
+                    if self.selected_widgets:
+                        changed_ids = [w.data_item.annotation.id for w in self.selected_widgets]
+                        self.clear_selection()
+                        self.selection_changed.emit(changed_ids)
                     return
 
             elif event.modifiers() == Qt.ControlModifier:
@@ -2488,6 +2539,10 @@ class ExplorerWindow(QMainWindow):
             # Reset sort options when filters change
             self.annotation_viewer.active_ordered_ids = []
             self.annotation_viewer.set_confidence_sort_availability(False)
+            
+            # Update the annotation count in the label window
+            self.label_window.update_annotation_count()
+
         finally:
             QApplication.restoreOverrideCursor()
 

{coralnet_toolbox-0.0.69 → coralnet_toolbox-0.0.70}/coralnet_toolbox/QtAnnotationWindow.py

@@ -448,7 +448,7 @@ class AnnotationWindow(QGraphicsView):
         # Center the view on the work area's center
         self.centerOn(work_area_center)
 
-    def center_on_annotation(self, annotation):
+    def just_center_on_annotation(self, annotation):
         """Center the view on the specified annotation."""
         # Create graphics item if it doesn't exist
         if not annotation.graphics_item:
@@ -460,6 +460,33 @@ class AnnotationWindow(QGraphicsView):
 
         # Center the view on the annotation's center
         self.centerOn(annotation_center)
+    
+    def center_on_annotation(self, annotation):
+        """Center and zoom in to focus on the specified annotation."""
+        # Create graphics item if it doesn't exist
+        if not annotation.graphics_item:
+            annotation.create_graphics_item(self.scene)
+
+        # Get the bounding rect of the annotation in scene coordinates
+        annotation_rect = annotation.graphics_item.boundingRect()
+        
+        # Add some padding around the annotation (20% on each side)
+        padding_x = annotation_rect.width() * 0.2
+        padding_y = annotation_rect.height() * 0.2
+        padded_rect = annotation_rect.adjusted(-padding_x, -padding_y, padding_x, padding_y)
+        
+        # Fit the padded annotation rect in the view
+        self.fitInView(padded_rect, Qt.KeepAspectRatio)
+        
+        # Update the zoom factor based on the new view transformation
+        # We can calculate this by comparing the viewport size to the scene rect size
+        view_rect = self.viewport().rect()
+        zoom_x = view_rect.width() / padded_rect.width() 
+        zoom_y = view_rect.height() / padded_rect.height()
+        self.zoom_factor = min(zoom_x, zoom_y)
+        
+        # Signal that the view has changed
+        self.viewChanged.emit(*self.get_image_dimensions())
 
     def cycle_annotations(self, direction):
         """Cycle through annotations in the specified direction."""

{coralnet_toolbox-0.0.69 → coralnet_toolbox-0.0.70}/coralnet_toolbox/QtMainWindow.py

@@ -1398,6 +1398,9 @@ class MainWindow(QMainWindow):
 
     def update_label_transparency(self, value):
         """Update the label transparency value in LabelWindow, AnnotationWindow and the Slider"""
+        if self.explorer_window:
+            return  # Do not update transparency if explorer window is open
+        
         if self.all_labels_button.isChecked():
             # Set transparency for all labels in LabelWindow, AnnotationWindow
             self.label_window.set_all_labels_transparency(value)
@@ -1677,6 +1680,9 @@ class MainWindow(QMainWindow):
         
         try:
             self.untoggle_all_tools()
+            # Set the transparency value ahead of time
+            self.update_transparency_slider(0)
+            
             # Recreate the explorer window, passing the main window instance
             self.explorer_window = ExplorerWindow(self)
             
@@ -1688,8 +1694,7 @@ class MainWindow(QMainWindow):
             # Disable all main window widgets except select few
             self.set_main_window_enabled_state(
                 enable_list=[self.annotation_window, 
-                             self.label_window,
-                             self.transparency_widget],
+                             self.label_window],
                 disable_list=[self.toolbar, 
                               self.menu_bar, 
                               self.image_window, 
@@ -1708,7 +1713,7 @@ class MainWindow(QMainWindow):
             self.explorer_window = None
             # Re-enable everything if there was an error
             self.set_main_window_enabled_state()
-
+        
     def explorer_closed(self):
         """Handle the explorer window being closed."""
         if self.explorer_window:

{coralnet_toolbox-0.0.69 → coralnet_toolbox-0.0.70}/coralnet_toolbox/__init__.py

@@ -1,6 +1,6 @@
 """Top-level package for CoralNet-Toolbox."""
 
-__version__ = "0.0.69"
+__version__ = "0.0.70"
 __author__ = "Jordan Pierce"
 __email__ = "jordan.pierce@noaa.gov"
 __credits__ = "National Center for Coastal and Ocean Sciences (NCCOS)"

{coralnet_toolbox-0.0.69 → coralnet_toolbox-0.0.70}/coralnet_toolbox.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: coralnet-toolbox
-Version: 0.0.69
+Version: 0.0.70
 Summary: Tools for annotating and developing ML models for benthic imagery
 Author-email: Jordan Pierce <jordan.pierce@noaa.gov>
 License: MIT License
@@ -94,10 +94,12 @@ coralnet-toolbox
 
 ## 📚 Guides
 
-For further instructions please see the following guides:
+For further information and instructions, please see the following guides:
+- [Overview](https://jordan-pierce.github.io/CoralNet-Toolbox/overview)
 - [Installation](https://jordan-pierce.github.io/CoralNet-Toolbox/installation)
 - [Usage](https://jordan-pierce.github.io/CoralNet-Toolbox/usage)
-- [Patch-based Image Classifier](https://jordan-pierce.github.io/CoralNet-Toolbox/classify)
+- Community Provided:
+  - [Patch-based Image Classifier](https://jordan-pierce.github.io/CoralNet-Toolbox/classify)
 
 <details open>
   <summary><h2><b>🎥 Watch the Video Demos</b></h2></summary>

{coralnet_toolbox-0.0.69 → coralnet_toolbox-0.0.70}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "coralnet-toolbox"
-version = "0.0.69"
+version = "0.0.70"
 
 dynamic = [
     "dependencies",
@@ -43,7 +43,7 @@ universal = true
 
 
 [tool.bumpversion]
-current_version = "0.0.69"
+current_version = "0.0.70"
 commit = true
 tag = true