labelimgplusplus 3.2.0__tar.gz → 3.3.0__tar.gz

{labelimgplusplus-3.2.0 → labelimgplusplus-3.3.0}/HISTORY.rst

@@ -1,6 +1,56 @@
 History
 =======
 
+3.3.0 (2026-08-12)
+------------------
+
+Faster-annotation release adding non-modal class confirmation and selectable
+Smart Select geometry while preserving the 3.2 workspace, annotation formats,
+filenames, command-line entry points, plugin APIs, shortcut identifiers, and
+Python 3.8 through 3.13 support.
+
+Inline Class Confirmation
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* Keep completed Box, Polygon, Smart Select, and video geometry in a transient
+  provisional layer until its class is confirmed. Provisional geometry is
+  excluded from canonical canvas shapes, the Objects inspector, dirty state,
+  saves, plugin snapshots, and undo history.
+* Open a non-modal, screen-clamped class picker beside new geometry with
+  filtering, arrow-key navigation, valid new-class entry, Enter confirmation,
+  and Escape cancellation. Confirmation preserves the active tool and canvas
+  focus so repeated annotation remains uninterrupted.
+* Commit confirmed image or video geometry through one ``CreateShapeCommand``.
+  Video confirmation creates an accepted manual anchor; cancellation leaves
+  both the in-memory model and durable project unchanged.
+* Retain session-only last-class memory. Default-label mode bypasses the picker,
+  while single-class mode bypasses it only after the first class is confirmed
+  in the current session.
+
+Smart Select Output Modes
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* Add the frozen plain-data ``SamResult(polygon, bounds)`` contract. SAM workers
+  return a simplified polygon and tight, non-zero, half-open bounds for the
+  same largest mask component without mutating Qt or document state.
+* Add a contextual Box/Polygon selector that appears only while Smart Select is
+  active. Its validated ``sam/outputMode`` setting defaults to ``polygon`` and
+  persists independently of model settings.
+* Route both output types through the provisional picker and the same image and
+  video undo path. Existing stale-generation and cancellation guards remain in
+  place, and ONNX Runtime, NumPy, OpenCV, and model loading stay lazy.
+
+Qualification
+~~~~~~~~~~~~~
+
+* Cover image and video confirmation, cancellation, focus, filtering, repeated
+  annotation, bypass modes, output bounds, simplification, persistence, stale
+  SAM results, manual video anchors, and one-step undo.
+* Qualify the picker and Smart Select selector in light and dark themes at 1x
+  and true 2x DPI using 1366x768 and 1440x900 logical approval sizes.
+* Make queued Gallery and annotation-catalog refreshes inert after window
+  shutdown so late Qt callbacks cannot submit work to a stopped coordinator.
+
 3.2.0 (2026-08-11)
 ------------------
 

{labelimgplusplus-3.2.0 → labelimgplusplus-3.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: labelimgplusplus
-Version: 3.2.0
+Version: 3.3.0
 Summary: labelImg++ is an enhanced graphical image annotation tool with Gallery Mode for browsing and labeling images
 Author-email: Abhik Sarkar <abhiksark@gmail.com>
 License: Copyright (c) <2015-Present> Tzutalin
@@ -78,7 +78,7 @@ polygons, and keypoints, designed for machine learning and computer vision
 projects. It is forked from the original LabelImg with significant
 enhancements.
 
-    **Version 3.2.0 (stable).** Install with
+    **Version 3.3.0 (stable).** Install with
     ``pip install labelimgplusplus``.
 
 .. image:: https://raw.githubusercontent.com/abhiksark/labelImg-plus-plus/c7fbd5fc08a561206b210706143a50023c82a782/resources/demo/demo.gif
@@ -132,6 +132,18 @@ Workflow and Interface
     annotation-status filter close at hand, and the inspector can be collapsed
     when maximum canvas space is needed.
 
+**Faster Class Confirmation**
+    New boxes, polygons, Smart Select results, and video geometry remain
+    provisional while a non-modal class picker opens beside the annotation.
+    Filter or enter a class, press **Enter** to commit one undoable annotation,
+    or press **Escape** to discard it without changing the document. Default
+    labels and established single-class sessions bypass the picker.
+
+**Smart Select Output Modes**
+    While Smart Select is active, choose **Box** or **Polygon** from the compact
+    canvas control. The choice persists between sessions, and either result
+    follows the same provisional class-confirmation and undo workflow.
+
 **Direct Ultralytics Dataset Export**
     Choose **Tools → Export Ultralytics Dataset…** to create a ready-to-train
     YOLO detection dataset with ``images/{train,val,test}``, matching
@@ -401,7 +413,7 @@ Or use **Menu > File > Reset All**
 Release History
 ---------------
 
-This source tree identifies itself as **3.2.0**, the stable 3.2 release. See
+This source tree identifies itself as **3.3.0**, the stable 3.3 release. See
 the `release history
 <https://github.com/abhiksark/labelImg-plus-plus/blob/master/HISTORY.rst>`__ for
 version-by-version changes and `GitHub Releases

{labelimgplusplus-3.2.0 → labelimgplusplus-3.3.0}/README.rst

@@ -26,7 +26,7 @@ polygons, and keypoints, designed for machine learning and computer vision
 projects. It is forked from the original LabelImg with significant
 enhancements.
 
-    **Version 3.2.0 (stable).** Install with
+    **Version 3.3.0 (stable).** Install with
     ``pip install labelimgplusplus``.
 
 .. image:: https://raw.githubusercontent.com/abhiksark/labelImg-plus-plus/c7fbd5fc08a561206b210706143a50023c82a782/resources/demo/demo.gif
@@ -80,6 +80,18 @@ Workflow and Interface
     annotation-status filter close at hand, and the inspector can be collapsed
     when maximum canvas space is needed.
 
+**Faster Class Confirmation**
+    New boxes, polygons, Smart Select results, and video geometry remain
+    provisional while a non-modal class picker opens beside the annotation.
+    Filter or enter a class, press **Enter** to commit one undoable annotation,
+    or press **Escape** to discard it without changing the document. Default
+    labels and established single-class sessions bypass the picker.
+
+**Smart Select Output Modes**
+    While Smart Select is active, choose **Box** or **Polygon** from the compact
+    canvas control. The choice persists between sessions, and either result
+    follows the same provisional class-confirmation and undo workflow.
+
 **Direct Ultralytics Dataset Export**
     Choose **Tools → Export Ultralytics Dataset…** to create a ready-to-train
     YOLO detection dataset with ``images/{train,val,test}``, matching
@@ -349,7 +361,7 @@ Or use **Menu > File > Reset All**
 Release History
 ---------------
 
-This source tree identifies itself as **3.2.0**, the stable 3.2 release. See
+This source tree identifies itself as **3.3.0**, the stable 3.3 release. See
 the `release history
 <https://github.com/abhiksark/labelImg-plus-plus/blob/master/HISTORY.rst>`__ for
 version-by-version changes and `GitHub Releases

{labelimgplusplus-3.2.0 → labelimgplusplus-3.3.0}/labelImgPlusPlus.py

@@ -71,6 +71,7 @@ from libs.widgets.annotationInspector import (
     UnifiedAnnotationView,
 )
 from libs.widgets.workspacePages import WorkspacePages
+from libs.widgets.inlineClassPicker import InlineClassPicker
 
 # Core
 from libs.core.shape import Shape, ShapeType, DEFAULT_LINE_COLOR, DEFAULT_FILL_COLOR
@@ -85,6 +86,7 @@ from libs.core.workspace_settings import (
     clamp_inspector_width, load_workspace_settings,
 )
 from libs.core.sam_controller import SamController
+from libs.core.sam_types import normalize_sam_output_mode
 from libs.core.annotation_catalog import AnnotationCatalog
 from libs.core.dataset import DatasetSnapshot
 from libs.core.image_pipeline import FrameCache, load_image_result
@@ -144,7 +146,7 @@ from libs.utils.constants import (
     SETTING_WIN_POSE, SETTING_WIN_SIZE,
     FORMAT_PASCALVOC, FORMAT_YOLO, FORMAT_CREATEML,
     FORMAT_COCO, FORMAT_YOLO_SEG,
-    SETTING_SAM_ENCODER, SETTING_SAM_DECODER,
+    SETTING_SAM_ENCODER, SETTING_SAM_DECODER, SETTING_SAM_OUTPUT_MODE,
 )
 from libs.utils.utils import (
     new_icon, themed_icon, new_action, add_actions, format_shortcut, Struct,
@@ -203,6 +205,8 @@ class MainWindow(QMainWindow, WindowMixin):
         self.settings.load()
         settings = self.settings
         self.workspace_settings = load_workspace_settings(settings)
+        self.sam_output_mode = normalize_sam_output_mode(
+            settings.get(SETTING_SAM_OUTPUT_MODE, 'polygon'))
 
         self.shortcut_config = ShortcutConfig()
         if settings.get(SETTING_SHORTCUTS):
@@ -317,6 +321,8 @@ class MainWindow(QMainWindow, WindowMixin):
         self.label_dialog = LabelDialog(parent=self, list_item=self.label_hist)
 
         self.prev_label_text = ''
+        self._session_last_class = None
+        self._pending_provisional_shape = None
 
         list_layout = QVBoxLayout()
         list_layout.setContentsMargins(0, 0, 0, 0)
@@ -445,6 +451,9 @@ class MainWindow(QMainWindow, WindowMixin):
         self.canvas.scrollRequest.connect(self.scroll_request)
 
         self.canvas.newShape.connect(self.new_shape)
+        self.class_picker = InlineClassPicker(self)
+        self.class_picker.accepted.connect(self._commit_provisional_shape)
+        self.class_picker.cancelled.connect(self._cancel_provisional_shape)
         self.sam_controller = SamController(self)
         self.canvas.samClicked.connect(self.sam_controller.segment_at)
         self._sam_available = segmentation.sam_available()
@@ -624,7 +633,7 @@ class MainWindow(QMainWindow, WindowMixin):
             self.toggle_sam_mode,
             self.shortcut_config.get('sam_mode'),
             'tool-smart-select',
-            'Click an object to auto-generate a polygon '
+            'Click an object to auto-generate the selected geometry '
             '(requires: pip install labelimgplusplus[sam])',
             enabled=False)
         sam_settings_action = action(
@@ -1124,6 +1133,9 @@ class MainWindow(QMainWindow, WindowMixin):
              self.label_zoom, self.label_coordinates),
             self.actions, self.zoom_widget, self)
         self.workspace_pages = canvas_column
+        self.workspace_pages.sam_output_toggle.set_mode(self.sam_output_mode)
+        self.workspace_pages.sam_output_toggle.modeChanged.connect(
+            self._set_sam_output_mode)
         self.workspace_pages.empty_page.recentActivated.connect(
             self._open_workspace_recent)
         for tool_action in (
@@ -1640,6 +1652,7 @@ class MainWindow(QMainWindow, WindowMixin):
         self._update_save_status_style(saved)
 
     def reset_state(self):
+        self._dismiss_class_picker()
         self._plugin_document_ready = False
         self._restart_workers_if_needed()
         self._close_video_decoder()
@@ -2040,8 +2053,19 @@ class MainWindow(QMainWindow, WindowMixin):
         }
         active = mapping.get(self.canvas.mode, self.actions.editMode)
         active.setChecked(True)
+        if hasattr(self, 'workspace_pages'):
+            self.workspace_pages.sam_output_toggle.setVisible(
+                self.canvas.mode == self.canvas.CREATE_SAM)
         self._update_active_tool_status()
 
+    def _set_sam_output_mode(self, mode):
+        """Persist the contextual Smart Select geometry choice."""
+        self.sam_output_mode = normalize_sam_output_mode(mode)
+        self.workspace_pages.sam_output_toggle.set_mode(self.sam_output_mode)
+        self.settings[SETTING_SAM_OUTPUT_MODE] = self.sam_output_mode
+        self.settings.save()
+        self._restore_canvas_focus()
+
     def _update_active_tool_status(self):
         if not hasattr(self, 'label_active_tool'):
             return
@@ -2163,14 +2187,11 @@ class MainWindow(QMainWindow, WindowMixin):
             self.pause_video()
         editable = self._video_editable()
         self.actions.editMode.setEnabled(not drawing and editable)
+        self.actions.create.setEnabled(not drawing and editable)
         self.actions.create_polygon.setEnabled(not drawing and editable)
-        if not drawing and self.beginner():
-            # Cancel creation.
-            print('Cancel creation.')
-            self.canvas.set_editing(True)
+        if not drawing:
             self.canvas.restore_cursor()
-            self.actions.create.setEnabled(editable)
-            self.actions.create_polygon.setEnabled(editable)
+            self._sync_tool_actions()
 
     def toggle_draw_mode(self, edit=True):
         if (self.document_kind == DocumentKind.VIDEO
@@ -2352,13 +2373,17 @@ class MainWindow(QMainWindow, WindowMixin):
         return None
 
     def _ensure_annotation_catalog(self):
+        coordinator = getattr(self, 'task_coordinator', None)
+        if coordinator is None or coordinator.is_shutting_down:
+            return False
         snapshot = getattr(self, 'dataset_snapshot', None)
         if snapshot is None or not snapshot.image_paths:
-            return
+            return False
         if (self.annotation_catalog.snapshot is not snapshot
                 or (not self.annotation_catalog.entries
                     and self.annotation_catalog._handle is None)):
             self.annotation_catalog.start(snapshot)
+        return True
 
     def _on_catalog_batch(self, statuses):
         converted = {
@@ -2873,69 +2898,105 @@ class MainWindow(QMainWindow, WindowMixin):
 
     # Callback functions:
     def new_shape(self):
-        """Pop-up and give focus to the label editor.
-
-        position MUST be in global coordinates.
-        """
+        """Stage completed geometry until its class is confirmed."""
         if (self.document_kind == DocumentKind.VIDEO
                 and not self._ensure_video_editable()):
-            self.canvas.reset_all_lines()
-            return
-        if not self.use_default_label_checkbox.isChecked():
-            if len(self.label_hist) > 0:
-                self.label_dialog = LabelDialog(
-                    parent=self, list_item=self.label_hist)
-                if hasattr(self, '_current_theme'):
-                    self.label_dialog.apply_theme(self._current_theme)
-
-            # Sync single class mode from PR#106
-            if self.single_class_mode.isChecked() and self.lastLabel:
-                text = self.lastLabel
+            self._cancel_provisional_shape()
+            return
+        shape = self.canvas.provisional_shape
+        if shape is None:
+            return
+        if (self._pending_provisional_shape is not None
+                and self._pending_provisional_shape is not shape):
+            self._dismiss_class_picker(discard=False)
+        self._pending_provisional_shape = shape
+
+        if self.use_default_label_checkbox.isChecked():
+            text = getattr(self, 'default_label', '')
+            if text:
+                self._commit_provisional_shape(text)
             else:
-                text = self.label_dialog.pop_up(text=self.prev_label_text)
-                self.lastLabel = text
+                self._cancel_provisional_shape()
+            return
+        if self.single_class_mode.isChecked() and self._session_last_class:
+            self._commit_provisional_shape(self._session_last_class)
+            return
+
+        self.class_picker.open_at(
+            self.label_hist,
+            self._session_last_class or self.prev_label_text,
+            self._provisional_picker_anchor(shape))
+
+    def _provisional_picker_anchor(self, shape):
+        """Return a global logical-pixel anchor beside provisional geometry."""
+        xs = [point.x() for point in shape.points]
+        ys = [point.y() for point in shape.points]
+        offset = self.canvas.offset_to_center()
+        point = QPoint(
+            int(round((max(xs) + offset.x()) * self.canvas.scale)),
+            int(round((min(ys) + offset.y()) * self.canvas.scale)))
+        return self.canvas.mapToGlobal(point)
+
+    def _commit_provisional_shape(self, text):
+        text = str(text).strip()
+        pending = self._pending_provisional_shape
+        if (not text or pending is None
+                or self.canvas.provisional_shape is not pending):
+            self._cancel_provisional_shape()
+            return
+
+        video_before = (self.video_model.snapshot_state()
+                        if self.document_kind == DocumentKind.VIDEO else None)
+        shape = self.canvas.commit_provisional_shape(
+            text, generate_color_by_text(text))
+        self._pending_provisional_shape = None
+        if shape is None:
+            return
+        self.add_label(shape)
+
+        if self.document_kind == DocumentKind.VIDEO:
+            track_id = self._store_video_shape_as_manual(shape)
+            self._selected_video_track_id = track_id
+            video_after = self.video_model.snapshot_state()
+            self.undo_stack.push(CreateShapeCommand(
+                self, shape, video_before=video_before,
+                video_after=video_after))
+            self._on_video_model_mutation()
+            self._materialize_video_frame(self.current_video_frame_ref.pts)
         else:
-            text = self.default_label
+            self.undo_stack.push(CreateShapeCommand(self, shape))
+            self.set_dirty()
 
-        # Add Chris
-        self.diffc_button.setChecked(False)
-        if text is not None:
-            self.prev_label_text = text
-            generate_color = generate_color_by_text(text)
-            shape = self.canvas.set_last_label(text, generate_color)
-            self.add_label(shape)
+        self.prev_label_text = text
+        self.lastLabel = text
+        self._session_last_class = text
+        if text not in self.label_hist:
+            self.label_hist.append(text)
+        self._update_current_image_stats()
+        self._sync_tool_actions()
+        self._restore_canvas_focus()
 
-            if self.document_kind == DocumentKind.VIDEO:
-                before = self.video_model.snapshot_state()
-                track_id = self._store_video_shape_as_manual(shape)
-                self._selected_video_track_id = track_id
-                after = self.video_model.snapshot_state()
-                self.undo_stack.push(VideoModelCommand(
-                    self, before, after, 'Create video track'))
-                self._on_video_model_mutation()
-                self._materialize_video_frame(
-                    self.current_video_frame_ref.pts)
-            else:
-                # Shape already exists, so record without re-executing it.
-                cmd = CreateShapeCommand(self, shape)
-                self.undo_stack.push(cmd)
+    def _cancel_provisional_shape(self):
+        self._pending_provisional_shape = None
+        self.canvas.discard_provisional_shape()
+        self._sync_tool_actions()
+        self._restore_canvas_focus()
 
-            if self.beginner():  # Switch to edit mode.
-                self.canvas.set_editing(True)
-                self.actions.create.setEnabled(True)
-                self.actions.create_polygon.setEnabled(True)
-            else:
-                self.actions.editMode.setEnabled(True)
-                self.actions.create_polygon.setEnabled(True)
-            if self.document_kind != DocumentKind.VIDEO:
-                self.set_dirty()
-            self._update_current_image_stats()
+    def _restore_canvas_focus(self):
+        QApplication.setActiveWindow(self)
+        self.activateWindow()
+        self.setFocusProxy(self.canvas)
+        self.canvas.setFocus(Qt.OtherFocusReason)
 
-            if text not in self.label_hist:
-                self.label_hist.append(text)
-        else:
-            # self.canvas.undoLastLine()
-            self.canvas.reset_all_lines()
+    def _dismiss_class_picker(self, discard=True):
+        picker = getattr(self, 'class_picker', None)
+        if picker is not None:
+            blocked = picker.blockSignals(True)
+            picker.hide()
+            picker.blockSignals(blocked)
+        self._pending_provisional_shape = None
+        if discard and hasattr(self, 'canvas'):
+            self.canvas.discard_provisional_shape()
 
     def scroll_request(self, delta, orientation):
         units = - delta / (8 * 15)
@@ -4886,6 +4947,7 @@ class MainWindow(QMainWindow, WindowMixin):
         settings[SETTING_GRID_SIZE] = self.canvas._grid_size if self.canvas else 32
         settings[SETTING_EDGE_ALIGNMENT] = self.edge_alignment_option.isChecked()
         settings[SETTING_SHORTCUTS] = self.shortcut_config.to_dict()
+        settings[SETTING_SAM_OUTPUT_MODE] = self.sam_output_mode
         settings.save()
         self._shutdown_workers()
 
@@ -4896,6 +4958,7 @@ class MainWindow(QMainWindow, WindowMixin):
         QTimer.singleShot(0, self.close)
 
     def _shutdown_workers(self):
+        self._dismiss_class_picker()
         self._plugin_document_ready = False
         self._publish_plugin_document(new_generation=True, force=True)
         if hasattr(self, 'plugin_manager'):
@@ -6527,7 +6590,11 @@ class MainWindow(QMainWindow, WindowMixin):
     # Statistics methods (Issue #19) - Stats shown in gallery mode
     def _refresh_all_statistics(self):
         """Complete label data in the shared catalog, then aggregate it."""
-        self._ensure_annotation_catalog()
+        # A refresh may already be queued when closeEvent shuts the worker
+        # lanes down. Submitting from that late Qt callback raises inside a
+        # slot and aborts the process, so closed windows must be inert.
+        if not self._ensure_annotation_catalog():
+            return
         self.annotation_catalog.request_statistics()
 
     def _update_current_image_stats(self):

{labelimgplusplus-3.2.0 → labelimgplusplus-3.3.0}/labelimgplusplus.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: labelimgplusplus
-Version: 3.2.0
+Version: 3.3.0
 Summary: labelImg++ is an enhanced graphical image annotation tool with Gallery Mode for browsing and labeling images
 Author-email: Abhik Sarkar <abhiksark@gmail.com>
 License: Copyright (c) <2015-Present> Tzutalin
@@ -78,7 +78,7 @@ polygons, and keypoints, designed for machine learning and computer vision
 projects. It is forked from the original LabelImg with significant
 enhancements.
 
-    **Version 3.2.0 (stable).** Install with
+    **Version 3.3.0 (stable).** Install with
     ``pip install labelimgplusplus``.
 
 .. image:: https://raw.githubusercontent.com/abhiksark/labelImg-plus-plus/c7fbd5fc08a561206b210706143a50023c82a782/resources/demo/demo.gif
@@ -132,6 +132,18 @@ Workflow and Interface
     annotation-status filter close at hand, and the inspector can be collapsed
     when maximum canvas space is needed.
 
+**Faster Class Confirmation**
+    New boxes, polygons, Smart Select results, and video geometry remain
+    provisional while a non-modal class picker opens beside the annotation.
+    Filter or enter a class, press **Enter** to commit one undoable annotation,
+    or press **Escape** to discard it without changing the document. Default
+    labels and established single-class sessions bypass the picker.
+
+**Smart Select Output Modes**
+    While Smart Select is active, choose **Box** or **Polygon** from the compact
+    canvas control. The choice persists between sessions, and either result
+    follows the same provisional class-confirmation and undo workflow.
+
 **Direct Ultralytics Dataset Export**
     Choose **Tools → Export Ultralytics Dataset…** to create a ready-to-train
     YOLO detection dataset with ``images/{train,val,test}``, matching
@@ -401,7 +413,7 @@ Or use **Menu > File > Reset All**
 Release History
 ---------------
 
-This source tree identifies itself as **3.2.0**, the stable 3.2 release. See
+This source tree identifies itself as **3.3.0**, the stable 3.3 release. See
 the `release history
 <https://github.com/abhiksark/labelImg-plus-plus/blob/master/HISTORY.rst>`__ for
 version-by-version changes and `GitHub Releases

{labelimgplusplus-3.2.0 → labelimgplusplus-3.3.0}/labelimgplusplus.egg-info/SOURCES.txt

@@ -29,6 +29,7 @@ libs/core/plugin_manager.py
 libs/core/plugin_registry.py
 libs/core/profiling.py
 libs/core/sam_controller.py
+libs/core/sam_types.py
 libs/core/save_pipeline.py
 libs/core/settings.py
 libs/core/shape.py
@@ -82,6 +83,7 @@ libs/widgets/commandBar.py
 libs/widgets/default_label_combobox.py
 libs/widgets/galleryWidget.py
 libs/widgets/gallery_status_controller.py
+libs/widgets/inlineClassPicker.py
 libs/widgets/keypointPanel.py
 libs/widgets/labelCheckerDialog.py
 libs/widgets/labelDialog.py

{labelimgplusplus-3.2.0 → labelimgplusplus-3.3.0}/libs/__init__.py

@@ -1,7 +1,7 @@
 # libs/__init__.py
 """LabelImg++ library package."""
 
-__version__ = '3.2.0'
+__version__ = '3.3.0'
 __version_info__ = tuple(__version__.split('.'))
 
 # Re-export subpackages for convenient access

{labelimgplusplus-3.2.0 → labelimgplusplus-3.3.0}/libs/core/commands.py

@@ -75,7 +75,8 @@ class CreateShapeCommand(Command):
     Undo removes the shape from canvas and label list.
     """
 
-    def __init__(self, main_window, shape):
+    def __init__(self, main_window, shape, video_before=None,
+                 video_after=None):
         """Initialize with reference to main window and the created shape.
 
         Args:
@@ -84,9 +85,21 @@ class CreateShapeCommand(Command):
         """
         self.main_window = main_window
         self.shape = shape
+        self.video_before = video_before
+        self.video_after = video_after
+
+    def _restore_video(self, state):
+        self.main_window.video_model.restore_state(state)
+        self.main_window._on_video_model_mutation()
+        frame_ref = self.main_window.current_video_frame_ref
+        if frame_ref is not None:
+            self.main_window._materialize_video_frame(frame_ref.pts)
 
     def execute(self):
         """Add the shape to canvas and label list."""
+        if self.video_after is not None:
+            self._restore_video(self.video_after)
+            return
         self.main_window.canvas.shapes.append(self.shape)
         _rebuild_spatial(self.main_window.canvas)
         self.main_window.add_label(self.shape)
@@ -94,6 +107,9 @@ class CreateShapeCommand(Command):
 
     def undo(self):
         """Remove the shape from canvas and label list."""
+        if self.video_before is not None:
+            self._restore_video(self.video_before)
+            return
         if self.shape in self.main_window.canvas.shapes:
             self.main_window.canvas.shapes.remove(self.shape)
             _rebuild_spatial(self.main_window.canvas)
@@ -104,6 +120,8 @@ class CreateShapeCommand(Command):
 
     @property
     def description(self):
+        if self.video_after is not None:
+            return f"Create video track '{self.shape.label}'"
         return f"Create shape '{self.shape.label}'"
 
 

{labelimgplusplus-3.2.0 → labelimgplusplus-3.3.0}/libs/core/sam_controller.py

@@ -1,5 +1,5 @@
 # libs/core/sam_controller.py
-"""Orchestrates SAM-assisted polygon creation.
+"""Orchestrates SAM-assisted polygon or rectangle creation.
 
 Bridges canvas clicks to worker-thread inference and routes results back to the
 canvas on the main thread. Top-level imports are Qt + stdlib only; numpy and the
@@ -19,7 +19,7 @@ from libs.core.profiling import recorder as trace_recorder
 
 
 class _SamSignals(QObject):
-    # (generation, points or None, backend created this run or None)
+    # (generation, SamResult or None, backend created this run or None)
     finished = pyqtSignal(int, object, object)
     failed = pyqtSignal(int, str)         # (generation, message)
 
@@ -41,15 +41,15 @@ class _SamTask(QRunnable):
 
     def run(self):
         try:
-            generation, points, created = self.execute()
+            generation, result, created = self.execute()
             if self._signals is not None:
-                self._signals.finished.emit(generation, points, created)
+                self._signals.finished.emit(generation, result, created)
         except Exception as exc:
             if self._signals is not None:
                 self._signals.failed.emit(self._generation, str(exc))
 
     def execute(self):
-        from libs.integrations.mask_to_polygon import mask_to_polygon
+        from libs.integrations.mask_to_polygon import mask_to_sam_result
         backend = self._backend
         created = None
         if backend is None:
@@ -72,16 +72,16 @@ class _SamTask(QRunnable):
             if trace_recorder is not None:
                 trace_recorder.complete('sam.image.embed', started)
         if self._point is None:
-            return self._generation, [], created
+            return self._generation, None, created
         if trace_recorder is not None:
             import time
             started = time.perf_counter_ns()
         mask = backend.predict(
             [(self._point.x(), self._point.y())], [1])
-        points = mask_to_polygon(mask)
+        result = mask_to_sam_result(mask)
         if trace_recorder is not None:
             trace_recorder.complete('sam.inference', started)
-        return self._generation, points, created
+        return self._generation, result, created
 
 
 class SamController:
@@ -197,7 +197,7 @@ class SamController:
             self._embedded_key = None
             self._start_pending()
 
-    def _on_finished(self, generation, points, created):
+    def _on_finished(self, generation, result, created):
         # Only one task is ever in flight (segment_at's _busy guard, and neither
         # cancel nor on_image_changed releases _busy), so the task completing here
         # is always the sole in-flight one: clearing _busy is unconditional/safe.
@@ -209,12 +209,16 @@ class SamController:
         if generation != self._gen:
             self._start_pending()
             return
-        if not points:
+        if result is None:
             if self._active_point is not None:
                 self.mw.status("No object found, try another point")
             self._start_pending()
             return
-        self.mw.canvas.commit_polygon(points)
+        output_mode = getattr(self.mw, 'sam_output_mode', 'polygon')
+        if output_mode == 'box':
+            self.mw.canvas.commit_rectangle(result.bounds)
+        else:
+            self.mw.canvas.commit_polygon(result.polygon)
         self._start_pending()
 
     def _on_failed(self, generation, message):