coralnet-toolbox 0.0.75__py2.py3-none-any.whl → 0.0.77__py2.py3-none-any.whl

coralnet_toolbox/Annotations/QtPolygonAnnotation.py

@@ -306,20 +306,30 @@ class PolygonAnnotation(Annotation):
         self.set_cropped_bbox()
         # Get the bounding box of the polygon
         min_x, min_y, max_x, max_y = self.cropped_bbox
-
+        
+        # Ensure min/max values are correctly ordered
+        min_x, max_x = min(min_x, max_x), max(min_x, max_x)
+        min_y, max_y = min(min_y, max_y), max(min_y, max_y)
+        
+        # Clamp values to image bounds
+        min_x = max(0, min(rasterio_src.width - 1, min_x))
+        min_y = max(0, min(rasterio_src.height - 1, min_y))
+        max_x = max(min_x + 1, min(rasterio_src.width, max_x))
+        max_y = max(min_y + 1, min(rasterio_src.height, max_y))
+    
         # Calculate the window for rasterio
         window = Window(
-            col_off=max(0, int(min_x)),
-            row_off=max(0, int(min_y)),
-            width=min(rasterio_src.width - int(min_x), int(max_x - min_x)),
-            height=min(rasterio_src.height - int(min_y), int(max_y - min_y))
+            col_off=int(min_x),
+            row_off=int(min_y),
+            width=int(max_x - min_x),
+            height=int(max_y - min_y)
         )
-
+    
         # Convert rasterio to QImage
         q_image = rasterio_to_cropped_image(self.rasterio_src, window)
         # Convert QImage to QPixmap
         self.cropped_image = QPixmap.fromImage(q_image)
-
+    
         self.annotationUpdated.emit(self)  # Notify update
 
     def create_graphics_item(self, scene: QGraphicsScene):
@@ -423,7 +433,7 @@ class PolygonAnnotation(Annotation):
         self.update_graphics_item()
         self.annotationUpdated.emit(self)  # Notify update
 
-    def update_annotation_size(self, delta: float):
+    def update_annotation_size(self, scale_factor: float):
         """
         Grow/shrink the polygon and its holes by scaling vertices radially from the centroid.
         """
@@ -433,18 +443,53 @@ class PolygonAnnotation(Annotation):
             return
 
         # 1. Use the true geometric centroid as the pivot for scaling.
-        # This is correctly calculated by the new set_centroid() method.
         centroid_x = self.center_xy.x()
         centroid_y = self.center_xy.y()
 
-        # 2. Determine the scale factor (this logic remains the same).
+        # 2. Determine the scale factor.
         step = 0.01  # Adjust for finer or coarser changes
-        if delta > 1.0:
+        if scale_factor > 1.0:
             scale = 1.0 + step
-        elif delta < 1.0:
+        elif scale_factor < 1.0:
             scale = 1.0 - step
         else:
             scale = 1.0
+        
+        # Check for image boundaries before scaling
+        if hasattr(self, 'rasterio_src'):
+            # Before scaling, check if any point would go beyond image boundaries
+            img_width = self.rasterio_src.width
+            img_height = self.rasterio_src.height
+            padding = 10  # pixels of padding
+            
+            # Check outer boundary points
+            for p in self.points:
+                dx = p.x() - centroid_x
+                dy = p.y() - centroid_y
+                new_x = centroid_x + dx * scale
+                new_y = centroid_y + dy * scale
+                
+                if new_x < -padding or \
+                   new_y < -padding or \
+                   new_x > img_width + padding or \
+                   new_y > img_height + padding:
+                    # Point would be out of bounds, don't scale
+                    return
+            
+            # Check holes points too
+            for hole in self.holes:
+                for p in hole:
+                    dx = p.x() - centroid_x
+                    dy = p.y() - centroid_y
+                    new_x = centroid_x + dx * scale
+                    new_y = centroid_y + dy * scale
+                    
+                    if new_x < -padding or \
+                       new_y < -padding or \
+                       new_x > img_width + padding or \
+                       new_y > img_height + padding:
+                        # Point would be out of bounds, don't scale
+                        return
 
         # 3. Scale the outer boundary points.
         new_points = []

coralnet_toolbox/Annotations/QtRectangleAnnotation.py

@@ -213,23 +213,29 @@ class RectangleAnnotation(Annotation):
         # Get the bounding box of the rectangle
         min_x, min_y, max_x, max_y = self.cropped_bbox
         
-        # Ensure min/max values are correctly ordered to avoid negative width/height
+        # Ensure min/max values are correctly ordered
         min_x, max_x = min(min_x, max_x), max(min_x, max_x)
         min_y, max_y = min(min_y, max_y), max(min_y, max_y)
-
+        
+        # Clamp values to image bounds
+        min_x = max(0, min(rasterio_src.width - 1, min_x))
+        min_y = max(0, min(rasterio_src.height - 1, min_y))
+        max_x = max(min_x + 1, min(rasterio_src.width, max_x))
+        max_y = max(min_y + 1, min(rasterio_src.height, max_y))
+        
         # Calculate the window for rasterio
         window = Window(
-            col_off=max(0, int(min_x)),
-            row_off=max(0, int(min_y)),
-            width=min(rasterio_src.width - int(min_x), int(max_x - min_x)),
-            height=min(rasterio_src.height - int(min_y), int(max_y - min_y))
+            col_off=int(min_x),
+            row_off=int(min_y),
+            width=int(max_x - min_x),
+            height=int(max_y - min_y)
         )
-
+        
         # Convert rasterio to QImage
         q_image = rasterio_to_cropped_image(self.rasterio_src, window)
         # Convert QImage to QPixmap
         self.cropped_image = QPixmap.fromImage(q_image)
-
+        
         self.annotationUpdated.emit(self)  # Notify update
 
     def create_graphics_item(self, scene: QGraphicsScene):
@@ -282,13 +288,37 @@ class RectangleAnnotation(Annotation):
         # Clear the machine confidence
         self.update_user_confidence(self.label)
 
-        # Update the size, graphic
-        width = (self.bottom_right.x() - self.top_left.x()) * scale_factor
-        height = (self.bottom_right.y() - self.top_left.y()) * scale_factor
-        self.top_left = QPointF(self.center_xy.x() - width / 2, self.center_xy.y() - height / 2)
-        self.bottom_right = QPointF(self.center_xy.x() + width / 2, self.center_xy.y() + height / 2)
+        # Calculate new dimensions
+        current_width = self.bottom_right.x() - self.top_left.x()
+        current_height = self.bottom_right.y() - self.top_left.y()
+        new_width = current_width * scale_factor
+        new_height = current_height * scale_factor
+        
+        # Calculate tentative new corners
+        new_left = self.center_xy.x() - new_width / 2
+        new_top = self.center_xy.y() - new_height / 2
+        new_right = self.center_xy.x() + new_width / 2
+        new_bottom = self.center_xy.y() + new_height / 2
+        
+        # Check if we're within valid image bounds (or use a reasonable padding)
+        # Assuming we have access to the image dimensions
+        if hasattr(self, 'rasterio_src'):
+            img_width = self.rasterio_src.width
+            img_height = self.rasterio_src.height
+            
+            # Apply reasonable bounds with some margin
+            padding = 10  # pixels
+            if new_left < -padding or new_top < -padding or new_right > img_width + padding or new_bottom > img_height + padding:
+                # Don't resize beyond these limits
+                return
+        
+        # Update the rectangle coordinates
+        self.top_left = QPointF(new_left, new_top)
+        self.bottom_right = QPointF(new_right, new_bottom)
+        
+        # Update graphics and notify
         self.update_graphics_item()
-        self.annotationUpdated.emit(self)  # Notify update
+        self.annotationUpdated.emit(self)
 
     def resize(self, handle: str, new_pos: QPointF):
         """Resize the annotation based on the handle and new position."""

coralnet_toolbox/Common/QtGraphicsUtility.py

@@ -1,18 +1,17 @@
 import warnings
 
-warnings.filterwarnings("ignore", category=DeprecationWarning)
-warnings.filterwarnings("ignore", category=UserWarning)
-
-import os 
 
+from PyQt5.QtCore import Qt                
+from PyQt5.QtGui import QPen, QColor
 from PyQt5.QtWidgets import (QVBoxLayout, QLabel, QGroupBox, QFormLayout,
                              QDoubleSpinBox, QComboBox, QSpinBox, QHBoxLayout,
                              QWidget, QStackedWidget, QGridLayout, QMessageBox,
                              QDialog, QListWidget, QPushButton, QFileDialog,
-                             QGraphicsView)
-from PyQt5.QtCore import Qt                           
+                             QGraphicsView, QGraphicsLineItem)
+
 
-from coralnet_toolbox.Icons import get_icon
+warnings.filterwarnings("ignore", category=DeprecationWarning)
+warnings.filterwarnings("ignore", category=UserWarning)
 
 
 # ----------------------------------------------------------------------------------------------------------------------
@@ -161,4 +160,15 @@ class GraphicsUtility:
             
         view_width = round(extent.width())
         view_height = round(extent.height())
-        return max(2, min(5, max(view_width, view_height) // 1000))
+        return max(2, min(5, max(view_width, view_height) // 1000))
+    
+    @staticmethod
+    def create_guide_line(start_point, end_point):
+        """Create a semi-transparent guide line for crosshairs."""
+        line = QGraphicsLineItem(start_point.x(), start_point.y(), end_point.x(), end_point.y())
+        pen = QPen(QColor(255, 255, 255, 180))  # Semi-transparent white
+        pen.setWidth(1)
+        pen.setStyle(Qt.DashLine)
+        line.setPen(pen)
+        line.setZValue(1000)  # Ensure it's drawn on top of other elements
+        return line

coralnet_toolbox/Explorer/transformer_models.py

@@ -7,12 +7,23 @@ Qt dependencies.
 """
 
 TRANSFORMER_MODELS = {
+    'ResNet-50': 'microsoft/resnet-50',
+    'ResNet-101': 'microsoft/resnet-101',
     'DINOv2 (Small)': 'facebook/dinov2-small',
     'DINOv2 (Base)': 'facebook/dinov2-base',
     'DINOv2 (Large)': 'facebook/dinov2-large',
+    'DINOv2 (Giant)': 'facebook/dinov2-giant',
+    'DINOv2 (Giant ImageNet1k)': 'facebook/dinov2-giant-imagenet1k-1-layer',
     'DINOv3 ConvNext (Tiny)': 'facebook/dinov3-convnext-tiny-pretrain-lvd1689m',
-    'ResNet-50': 'microsoft/resnet-50',
-    'ResNet-101': 'microsoft/resnet-101',
+    'DINOv3 ConvNext (Small)': 'facebook/dinov3-convnext-small-pretrain-lvd1689m',
+    'DINOv3 ConvNext (Base)': 'facebook/dinov3-convnext-base-pretrain-lvd1689m',
+    'DINOv3 ConvNext (Large)': 'facebook/dinov3-convnext-large-pretrain-lvd1689m',
+    'DINOv3 ViT (Small/16)': 'facebook/dinov3-vits16-pretrain-lvd1689m',
+    'DINOv3 ViT (Small/16+)': 'facebook/dinov3-vits16plus-pretrain-lvd1689m',
+    'DINOv3 ViT (Base/16)': 'facebook/dinov3-vitb16-pretrain-lvd1689m',
+    'DINOv3 ViT (Large/16)': 'facebook/dinov3-vitl16-pretrain-lvd1689m',
+    'DINOv3 ViT (Huge/16+)': 'facebook/dinov3-vith16plus-pretrain-lvd1689m',
+    'DINOv3 ViT (7B/16)': 'facebook/dinov3-vit7b16-pretrain-lvd1689m',
     'Swin Transformer (Tiny)': 'microsoft/swin-tiny-patch4-window7-224',
     'Swin Transformer (Base)': 'microsoft/swin-base-patch4-window7-224',
     'ViT (Base)': 'google/vit-base-patch16-224',