coralnet-toolbox 0.0.71__py2.py3-none-any.whl → 0.0.72__py2.py3-none-any.whl

coralnet_toolbox/Explorer/QtFeatureStore.py

@@ -149,6 +149,21 @@ class FeatureStore:
             index_path = f"{self.index_path_base}_{model_key}.faiss"
             print(f"Saving FAISS index for '{model_key}' to {index_path}")
             faiss.write_index(index_to_save, index_path)
+            
+    def remove_features_for_annotation(self, annotation_id):
+        """
+        Removes an annotation's feature metadata from the SQLite database.
+        This effectively orphans the vector in the FAISS index, invalidating it.
+        """
+        try:
+            self.cursor.execute(
+                "DELETE FROM features WHERE annotation_id = ?",
+                (annotation_id,)
+            )
+            self.conn.commit()
+            print(f"Invalidated features for annotation_id: {annotation_id}")
+        except sqlite3.Error as e:
+            print(f"Error removing feature for annotation {annotation_id}: {e}")
 
     def close(self):
         """Closes the database connection."""

coralnet_toolbox/Explorer/QtSettingsWidgets.py

@@ -670,8 +670,8 @@ class EmbeddingSettingsWidget(QGroupBox):
 
     def apply_embedding(self):
         if self.explorer_window and hasattr(self.explorer_window, 'run_embedding_pipeline'):
-            # Clear all selections before running embedding pipeline
-            if hasattr(self.explorer_window, 'handle_selection_change'):
-                self.explorer_window.handle_selection_change([])
+            # Clear all selections before running a new embedding pipeline.
+            if hasattr(self.explorer_window, '_clear_selections'):
+                self.explorer_window._clear_selections()
 
             self.explorer_window.run_embedding_pipeline()

coralnet_toolbox/QtAnnotationWindow.py

@@ -48,6 +48,7 @@ class AnnotationWindow(QGraphicsView):
     annotationSelected = pyqtSignal(int)  # Signal to emit when annotation is selected
     annotationDeleted = pyqtSignal(str)  # Signal to emit when annotation is deleted
     annotationCreated = pyqtSignal(str)  # Signal to emit when annotation is created
+    annotationModified = pyqtSignal(str)  # Signal to emit when annotation is modified
 
     def __init__(self, main_window, parent=None):
         """Initialize the annotation window with the main window and parent widget."""
@@ -374,6 +375,9 @@ class AnnotationWindow(QGraphicsView):
 
     def set_image(self, image_path):
         """Set and display an image at the given path."""
+        # Calculate GDIs for Windows if needed
+        self.main_window.check_windows_gdi_count()
+        
         # Clean up
         self.clear_scene()
 
@@ -543,7 +547,7 @@ class AnnotationWindow(QGraphicsView):
             return type(self.selected_annotations[0])
         return None
 
-    def select_annotation(self, annotation, multi_select=False):
+    def select_annotation(self, annotation, multi_select=False, quiet_mode=False):
         """Select an annotation and update the UI accordingly."""
         # If the annotation is already selected and Ctrl is pressed, unselect it
         if annotation in self.selected_annotations and multi_select:
@@ -569,7 +573,11 @@ class AnnotationWindow(QGraphicsView):
             
             # If this is the only selected annotation, update label window and confidence window
             if len(self.selected_annotations) == 1:
-                self.labelSelected.emit(annotation.label.id)
+                
+                if not quiet_mode:
+                    # Emit the label selected signal, unless in quiet mode.
+                    # This is in Explorer to avoid overwriting preview label.
+                    self.labelSelected.emit(annotation.label.id)
                 
                 # Make sure we have a cropped image
                 if not annotation.cropped_image:

coralnet_toolbox/QtMainWindow.py

@@ -4,6 +4,7 @@ warnings.filterwarnings("ignore", category=DeprecationWarning)
 
 import os
 import re
+import ctypes
 import requests
 
 from packaging import version
@@ -130,6 +131,9 @@ class MainWindow(QMainWindow):
 
     def __init__(self, __version__):
         super().__init__()
+        
+        # Get the process ID
+        self.pid = os.getpid()
 
         # Define icons
         self.coral_icon = get_icon("coral.png")
@@ -2329,6 +2333,62 @@ class MainWindow(QMainWindow):
             msg.exec_()
         except Exception as e:
             QMessageBox.critical(self, "Critical Error", f"{e}")
+            
+    def check_windows_gdi_count(self):
+        """Calculate and print the number of GDI objects for the current process on Windows."""        
+        # 1. Check if the OS is Windows. If not, return early.
+        if os.name != 'nt':
+            return
+        
+        # Load necessary libraries
+        kernel32 = ctypes.WinDLL('kernel32', use_last_error=True)
+        user32 = ctypes.WinDLL('user32', use_last_error=True)
+
+        # Define constants
+        PROCESS_QUERY_INFORMATION = 0x0400
+        GR_GDIOBJECTS = 0
+
+        process_handle = None
+        try:
+            # 2. Get a handle to the process from its PID
+            process_handle = kernel32.OpenProcess(PROCESS_QUERY_INFORMATION, False, self.pid)
+            
+            if not process_handle:
+                error_code = ctypes.get_last_error()
+                raise RuntimeError(f"Failed to open PID {self.pid}. Error code: {error_code}")
+
+            # 3. Use the handle to get the GDI object count
+            gdi_count = user32.GetGuiResources(process_handle, GR_GDIOBJECTS)
+            
+            if gdi_count >= 9500:  # GDI limit
+                self.show_gdi_limit_warning()
+
+        except Exception as e:
+            pass
+
+        finally:
+            # 4. CRITICAL: Always close the handle when you're done
+            if process_handle:
+                kernel32.CloseHandle(process_handle)
+                
+        return
+            
+    def show_gdi_limit_warning(self):
+        """
+        Show a warning dialog if the GDI limit is reached.
+        """
+        try:
+            self.untoggle_all_tools()
+            msg = QMessageBox()
+            msg.setWindowIcon(self.coral_icon)
+            msg.setWindowTitle("GDI Limit Reached")
+            msg.setText(
+                "The GDI limit has been reached! Please immediately save your work, close, and reopen the application!"
+            )
+            msg.setStandardButtons(QMessageBox.Ok)
+            msg.exec_()
+        except Exception as e:
+            QMessageBox.critical(self, "Critical Error", f"{e}")
 
     def open_snake_game_dialog(self):
         """

coralnet_toolbox/Tools/QtResizeSubTool.py

@@ -59,9 +59,14 @@ class ResizeSubTool(SubTool):
     def mouseReleaseEvent(self, event):
         """Finalize the resize, update related windows, and deactivate."""
         if self.target_annotation:
+            # Normalize the coordinates after resize is complete
+            if hasattr(self.target_annotation, 'normalize_coordinates'):
+                self.target_annotation.normalize_coordinates()
+                
             self.target_annotation.create_cropped_image(self.annotation_window.rasterio_image)
             self.parent_tool.main_window.confidence_window.display_cropped_image(self.target_annotation)
-
+            self.annotation_window.annotationModified.emit(self.target_annotation.id)  # Emit modified signal
+            
         self.parent_tool.deactivate_subtool()
 
     # --- Handle Management Logic (moved from original class) ---

coralnet_toolbox/Tools/QtSelectTool.py

@@ -49,6 +49,7 @@ class SelectTool(Tool):
 
         # --- State for transient UI (like resize handles) ---
         self.resize_handles_visible = False
+        self.selection_locked = False
 
         self._connect_signals()
 
@@ -81,16 +82,36 @@ class SelectTool(Tool):
         self.deactivate_subtool()
         self._hide_resize_handles()
         self.annotation_window.viewport().setCursor(self.cursor)
+        self.selection_locked = False
 
     def deactivate(self):
         self.deactivate_subtool()
         self._hide_resize_handles()
         self.annotation_window.viewport().setCursor(self.default_cursor)
+        self.selection_locked = False
         super().deactivate()
 
     # --- Event Handlers (Dispatcher Logic) ---
 
     def mousePressEvent(self, event: QMouseEvent):
+        if self.selection_locked:
+            # If selection is locked, only allow interaction with resize handles.
+            # Check if a handle was clicked to start a resize operation.
+            position = self.annotation_window.mapToScene(event.pos())
+            items = self.annotation_window.scene.items(position)
+            if self.resize_handles_visible:
+                for item in items:
+                    if item in self.resize_subtool.resize_handles_items:
+                        handle_name = item.data(1)
+                        if handle_name and len(self.selected_annotations) == 1:
+                            self.set_active_subtool(
+                                self.resize_subtool, event,
+                                annotation=self.selected_annotations[0],
+                                handle_name=handle_name
+                            )
+                            return  # Exit after starting resize
+            return  # Otherwise, ignore the click entirely
+        
         # Ignore right mouse button events (used for panning)
         if event.button() == Qt.RightButton:
             return
@@ -215,14 +236,35 @@ class SelectTool(Tool):
         return self.annotation_window.annotations_dict.get(annotation_id) if annotation_id else None
 
     def _get_annotation_from_items(self, items, position):
-        """Finds the first valid annotation at a position from a list of items."""
-        for item in items:
-            # We don't want to select by clicking a resize handle
-            if item in self.resize_subtool.resize_handles_items:
-                continue
+        """
+        Finds the first valid annotation at a position from a list of items.
+        First prioritizes annotations where the center graphic contains the point,
+        then falls back to any annotation that contains the point.
+        """
+        # Filter out resize handles
+        valid_items = [item for item in items if item not in self.resize_subtool.resize_handles_items]
+        
+        center_threshold = 10.0  # Distance threshold in pixels to consider a click "on center"
+        center_candidates = []
+        general_candidates = []
+        
+        # Gather all potential candidates
+        for item in valid_items:
             annotation = self._get_annotation_from_item(item)
             if annotation and annotation.contains_point(position):
-                return annotation
+                # Calculate distance to center
+                center_distance = (position - annotation.center_xy).manhattanLength()
+                if center_distance <= center_threshold:
+                    center_candidates.append(annotation)
+                else:
+                    general_candidates.append(annotation)
+        
+        # Return priority: center candidates first, then general candidates
+        if center_candidates:
+            return center_candidates[0]
+        elif general_candidates:
+            return general_candidates[0]
+                
         return None
 
     def _handle_annotation_selection(self, position, items, modifiers):

coralnet_toolbox/__init__.py

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

{coralnet_toolbox-0.0.71.dist-info → coralnet_toolbox-0.0.72.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: coralnet-toolbox
-Version: 0.0.71
+Version: 0.0.72
 Summary: Tools for annotating and developing ML models for benthic imagery
 Author-email: Jordan Pierce <jordan.pierce@noaa.gov>
 License: MIT License

{coralnet_toolbox-0.0.71.dist-info → coralnet_toolbox-0.0.72.dist-info}/RECORD

@@ -1,20 +1,20 @@
-coralnet_toolbox/QtAnnotationWindow.py,sha256=3pGy_81qaOYOrD_356DSiyXzmuoQnHl5GCp3o-9ay48,39096
+coralnet_toolbox/QtAnnotationWindow.py,sha256=ZlaYYAMNqu95SJhduQxH1K0YP7mOkMv3BzGQwemfByg,39518
 coralnet_toolbox/QtConfidenceWindow.py,sha256=L5hR23uW91GpqnsNS9R1XF3zCTe2aU7w0iDoQMV0oyE,16190
 coralnet_toolbox/QtEventFilter.py,sha256=KKC9de3e66PvGVgiML8P7MZ9-r7vvHidPJJYpcbTwyM,6696
 coralnet_toolbox/QtImageWindow.py,sha256=vLziMSEWFfVRSBN0nUNkosgk3LiNxZDqPwbinz9ZivQ,49356
 coralnet_toolbox/QtLabelWindow.py,sha256=-4GCk4pTY9g4ADH1iE__4xwqT-7UR_7VCT8v-bJzerk,50869
-coralnet_toolbox/QtMainWindow.py,sha256=W86kc-ZFmZHcSKcNTWN5RFCvt7sysvTCYZrPWZPWd6E,112220
+coralnet_toolbox/QtMainWindow.py,sha256=z_Erak0fJC4x962rsFgK3IwjLQYVUe6rayzQzfJtkhw,114372
 coralnet_toolbox/QtPatchSampling.py,sha256=Ehj06auBGfQwIruLNYQjF8eFOCpl8G72p42UXXb2mUo,29013
 coralnet_toolbox/QtProgressBar.py,sha256=pnozUOcVjfO_yTS9z8wOMPcrrrOtG_FeCknTcdI6eyk,6250
 coralnet_toolbox/QtWorkArea.py,sha256=YXRvHQKpWUtWyv_o9lZ8rmxfm28dUOG9pmMUeimDhQ4,13578
-coralnet_toolbox/__init__.py,sha256=K-BGYPTYU1ySXgZWS4vmpHfRksFJb3SAyX73veK1hdE,207
+coralnet_toolbox/__init__.py,sha256=-OIPFY1gy8COaSsB29_2bWyVd3ro4BAdKgI2eIvHhPY,207
 coralnet_toolbox/main.py,sha256=6j2B_1reC_KDmqvq1C0fB-UeSEm8eeJOozp2f4XXMLQ,1573
 coralnet_toolbox/utilities.py,sha256=eUkxXuWaNFH83LSW-KniwujkXKJ2rK04czx3k3OPiAY,27115
 coralnet_toolbox/Annotations/QtAnnotation.py,sha256=-3ASbjl1dXw9U731vyCgwyiyZT9zOD5Mvp1jt-7bCnA,29242
 coralnet_toolbox/Annotations/QtMultiPolygonAnnotation.py,sha256=ErAT31gw-zhEVNxkPRpyB9uw-NSpPh-ShCBxpscXdRw,15579
 coralnet_toolbox/Annotations/QtPatchAnnotation.py,sha256=67fNnK_-muyhGZdGB0kBDx-JGuflv1TM6q5ikfW_zOk,20076
 coralnet_toolbox/Annotations/QtPolygonAnnotation.py,sha256=1EkZEJlO4VZ4so01Sat2T8LeO1LNs7HbGJLO-G2_73Q,26886
-coralnet_toolbox/Annotations/QtRectangleAnnotation.py,sha256=nLL_HIkcnuB6CeqE-v8LMAoFgTEhZGHwt5yeEnLaVWQ,20090
+coralnet_toolbox/Annotations/QtRectangleAnnotation.py,sha256=TgeawekA3jNBlCmZBRqXYRHoZqch7pWM-NSBBPG6S60,21404
 coralnet_toolbox/Annotations/__init__.py,sha256=bpMldC70tT_lzMrOdBNDkEhG9dCX3tXEBd48IrcUg3E,419
 coralnet_toolbox/AutoDistill/QtBatchInference.py,sha256=k871aW3XRX8kc4BDaS1aipbPh9WOZxgmilF2c4KOdVA,5646
 coralnet_toolbox/AutoDistill/QtDeployModel.py,sha256=6alhzvA3KYEeLaQj-Qhs9GicjNQyVoQbnvgZ3lxGnCU,25162
@@ -35,10 +35,10 @@ coralnet_toolbox/Common/QtUpdateImagePaths.py,sha256=_hJYx6hXdAOfH_m77f75AQduQ0W
 coralnet_toolbox/CoralNet/QtAuthenticate.py,sha256=Y__iY0Kcosz6AOV7dlJBwiB6Hte40wHahHe-OmRngZA,13267
 coralnet_toolbox/CoralNet/QtDownload.py,sha256=HBb8TpZRIEFirGIaIAV1v8qg3fL4cP6Bf-hUiqXoiLE,48516
 coralnet_toolbox/CoralNet/__init__.py,sha256=ILkAZh6mlAK1UaCCZjCB9JZxd-oY4cIgfnIC8UgjjIU,188
-coralnet_toolbox/Explorer/QtDataItem.py,sha256=-O2Tneh9wYbAZarqwb_Cvy5cP1F_zQH2IAw9c-rHy1Y,13572
-coralnet_toolbox/Explorer/QtExplorer.py,sha256=IATLlZi57m5XU1KIG-oGNGqhcZEpjxQeilmKGrKMIFo,122968
-coralnet_toolbox/Explorer/QtFeatureStore.py,sha256=kMn--vuBed6wZS-BQhHt_KBA5z-tL1ydFgFkkIoGiB4,6742
-coralnet_toolbox/Explorer/QtSettingsWidgets.py,sha256=hIMj2lzqGKBoFWKYolH7bEPm5ePAIzYcGjYRQv2uWFE,27656
+coralnet_toolbox/Explorer/QtDataItem.py,sha256=fNpCHJSxMzHL2XpBXtPwKchSbmY7H0HWzL1Kbs4W1Ts,14920
+coralnet_toolbox/Explorer/QtExplorer.py,sha256=vAtGTNsEUcy14-_XJuOocH7xdAlesHm5faN9AINaEvg,131591
+coralnet_toolbox/Explorer/QtFeatureStore.py,sha256=3VwGezs1stmu65Z4ZQpvY27rGEIJq_prERWkFwMATBo,7378
+coralnet_toolbox/Explorer/QtSettingsWidgets.py,sha256=unm23yP329cVL84aOvy20DBt3YBHVLU85rnfN9VUF8A,27649
 coralnet_toolbox/Explorer/__init__.py,sha256=wZPhf2oaUUyIQ2WK48Aj-4q1ENIZG2dGl1HF_mjhI6w,116
 coralnet_toolbox/IO/QtExportAnnotations.py,sha256=xeaS0BukC3cpkBIGT9DXRqHmvHhp-vOU47h6EoANpNg,4474
 coralnet_toolbox/IO/QtExportCoralNetAnnotations.py,sha256=4royhF63EmeOlSIBX389EUjjvE-SF44_maW6qm52mdA,2778
@@ -206,19 +206,19 @@ coralnet_toolbox/Tools/QtPanTool.py,sha256=q0g5Ryse6mIZ_Ss4qJw5NNwgoLuQQBIyQTXNF
 coralnet_toolbox/Tools/QtPatchTool.py,sha256=57vFeR2jQ_VQRlMEIC_mH8NigUqOlVvmhaVkXDvd_Gw,5574
 coralnet_toolbox/Tools/QtPolygonTool.py,sha256=yxnkwK3rb52pWCq7a3iAABhHUSS_a3vkL7G7Ev0uLDA,9174
 coralnet_toolbox/Tools/QtRectangleTool.py,sha256=gYOOsn1WRHLG0YzkKmmM7OzLpuLNh8GWIZ4MloXoLDc,7218
-coralnet_toolbox/Tools/QtResizeSubTool.py,sha256=-knQTmwURVYItfmDUCMjITsdRFAOhvDVCGP-2l9AkTE,5496
+coralnet_toolbox/Tools/QtResizeSubTool.py,sha256=derPy4adRj758-xYtjL-_35yGBOjoSe_DRE48HpdQpA,5836
 coralnet_toolbox/Tools/QtSAMTool.py,sha256=TQ--xcR76lymFS0YVo5Gi4ay_tIsIEecYpLDMRBPLWQ,26174
 coralnet_toolbox/Tools/QtSeeAnythingTool.py,sha256=2uxyX_chOIXcmW6oBlb6XlgbRmSwSaQXmkmgOtFrqI4,30606
 coralnet_toolbox/Tools/QtSelectSubTool.py,sha256=xKtXYCwezLq3YZQLsSTG3mxs_ZRjLiPrYl-0ebgq-GA,3125
-coralnet_toolbox/Tools/QtSelectTool.py,sha256=Es4h-YdUyrebPoeI4cGaM4rOEiJtIzK2PObFkBisHp8,17917
+coralnet_toolbox/Tools/QtSelectTool.py,sha256=rSzM9s7pMxrLqvcWgIcEnpEQhYHU6TbGUna8ZaamakA,19957
 coralnet_toolbox/Tools/QtSubTool.py,sha256=H25FoFqywdi6Bl35MfpEXGrr48ZTgdRRvHMxUy1tqN4,1601
 coralnet_toolbox/Tools/QtTool.py,sha256=2MCjT151gYBN8KbsK0GX4WOrEg1uw3oeSkp7Elw1AUA,2531
 coralnet_toolbox/Tools/QtWorkAreaTool.py,sha256=-CDrEPenOdSI3sf5wn19Cip4alE1ef7WsRDxQFDkHlc,22162
 coralnet_toolbox/Tools/QtZoomTool.py,sha256=F9CAoABv1jxcUS7dyIh1FYjgjOXYRI1xtBPNIR1g62o,4041
 coralnet_toolbox/Tools/__init__.py,sha256=218iQ8IFXIkKXiUDVYtXk9e08UY9-LhHjcryaJAanQ0,797
-coralnet_toolbox-0.0.71.dist-info/licenses/LICENSE.txt,sha256=AURacZ_G_PZKqqPQ9VB9Sqegblk67RNgWSGAYKwXXMY,521
-coralnet_toolbox-0.0.71.dist-info/METADATA,sha256=LltT45S41MrUplIQGHLJ_1rjuFT8PccNnbRCUw2ODRQ,18152
-coralnet_toolbox-0.0.71.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
-coralnet_toolbox-0.0.71.dist-info/entry_points.txt,sha256=oEeMoDlJ_2lq95quOeDHIx9hZpubUlSo80OLtgbcrbM,63
-coralnet_toolbox-0.0.71.dist-info/top_level.txt,sha256=SMWPh4_9JfB8zVpPOOvjucV2_B_hvWW7bNWmMjG0LsY,17
-coralnet_toolbox-0.0.71.dist-info/RECORD,,
+coralnet_toolbox-0.0.72.dist-info/licenses/LICENSE.txt,sha256=AURacZ_G_PZKqqPQ9VB9Sqegblk67RNgWSGAYKwXXMY,521
+coralnet_toolbox-0.0.72.dist-info/METADATA,sha256=cOB6wtxUBZcPWkW0L9v3LCWIsI_NOaaiKo9RyQJl15M,18152
+coralnet_toolbox-0.0.72.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
+coralnet_toolbox-0.0.72.dist-info/entry_points.txt,sha256=oEeMoDlJ_2lq95quOeDHIx9hZpubUlSo80OLtgbcrbM,63
+coralnet_toolbox-0.0.72.dist-info/top_level.txt,sha256=SMWPh4_9JfB8zVpPOOvjucV2_B_hvWW7bNWmMjG0LsY,17
+coralnet_toolbox-0.0.72.dist-info/RECORD,,