lazylabel-gui 1.3.3__tar.gz → 1.3.4__tar.gz

{lazylabel_gui-1.3.3 → lazylabel_gui-1.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lazylabel-gui
-Version: 1.3.3
+Version: 1.3.4
 Summary: An image segmentation GUI for generating ML ready mask tensors and annotations.
 Author-email: "Deniz N. Cakan" <deniz.n.cakan@gmail.com>
 License: MIT License

{lazylabel_gui-1.3.3 → lazylabel_gui-1.3.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "lazylabel-gui"
-version = "1.3.3"
+version = "1.3.4"
 authors = [
   { name="Deniz N. Cakan", email="deniz.n.cakan@gmail.com" },
 ]

{lazylabel_gui-1.3.3 → lazylabel_gui-1.3.4}/src/lazylabel/core/file_manager.py

@@ -65,7 +65,7 @@ class FileManager:
         if not os.path.exists(npz_path):
             raise OSError(f"NPZ file was not created: {npz_path}")
 
-        logger.info(f"Successfully saved NPZ: {os.path.basename(npz_path)}")
+        logger.debug(f"Successfully saved NPZ: {os.path.basename(npz_path)}")
         return npz_path
 
     def save_yolo_txt(

{lazylabel_gui-1.3.3 → lazylabel_gui-1.3.4}/src/lazylabel/ui/control_panel.py

@@ -612,10 +612,10 @@ class ControlPanel(QWidget):
         layout.addWidget(crop_collapsible)
 
         # Channel Threshold - collapsible
-        threshold_collapsible = SimpleCollapsible(
+        self.channel_threshold_collapsible = SimpleCollapsible(
             "Channel Threshold", self.channel_threshold_widget
         )
-        layout.addWidget(threshold_collapsible)
+        layout.addWidget(self.channel_threshold_collapsible)
 
         # FFT Threshold - collapsible (default collapsed)
         self.fft_threshold_collapsible = SimpleCollapsible(
@@ -880,6 +880,11 @@ class ControlPanel(QWidget):
         """Update channel threshold widget for new image."""
         self.channel_threshold_widget.update_for_image(image_array)
 
+        # Auto-expand channel threshold panel when any image is loaded
+        if image_array is not None and hasattr(self, "channel_threshold_collapsible"):
+            # Find and expand the Channel Threshold panel
+            self.channel_threshold_collapsible.set_collapsed(False)
+
     def get_channel_threshold_widget(self):
         """Get the channel threshold widget."""
         return self.channel_threshold_widget

{lazylabel_gui-1.3.3 → lazylabel_gui-1.3.4}/src/lazylabel/ui/main_window.py

@@ -19,12 +19,14 @@ from PyQt6.QtGui import (
     QShortcut,
 )
 from PyQt6.QtWidgets import (
+    QApplication,
     QDialog,
     QFileDialog,
     QGraphicsEllipseItem,
     QGraphicsLineItem,
     QGraphicsPolygonItem,
     QGraphicsRectItem,
+    QGridLayout,
     QHBoxLayout,
     QLabel,
     QMainWindow,
@@ -772,6 +774,7 @@ class MainWindow(QMainWindow):
         logger.info("Step 5/8: Discovering available models...")
         self._setup_model_manager()  # Just setup manager, don't load model
         self._setup_connections()
+        self._fix_fft_connection()  # Workaround for FFT signal connection issue
         self._setup_shortcuts()
         self._load_settings()
 
@@ -877,12 +880,7 @@ class MainWindow(QMainWindow):
         grid_widget = QWidget()
 
         # Use grid layout for 4-view, horizontal layout for 2-view
-        if use_grid:
-            from PyQt6.QtWidgets import QGridLayout
-
-            grid_layout = QGridLayout(grid_widget)
-        else:
-            grid_layout = QHBoxLayout(grid_widget)
+        grid_layout = QGridLayout(grid_widget) if use_grid else QHBoxLayout(grid_widget)
         grid_layout.setSpacing(5)
 
         self.multi_view_viewers = []
@@ -951,29 +949,30 @@ class MainWindow(QMainWindow):
         grid_mode_label = QLabel("View Mode:")
         controls_layout.addWidget(grid_mode_label)
 
-        from PyQt6.QtWidgets import QComboBox
+        from lazylabel.ui.widgets.model_selection_widget import CustomDropdown
 
-        self.grid_mode_combo = QComboBox()
+        self.grid_mode_combo = CustomDropdown()
+        self.grid_mode_combo.setText("View Mode")  # Default text
         self.grid_mode_combo.addItem("2 Views (1x2)", "2_view")
         self.grid_mode_combo.addItem("4 Views (2x2)", "4_view")
 
         # Set current selection based on settings
         current_mode = self.settings.multi_view_grid_mode
-        for i in range(self.grid_mode_combo.count()):
+        for i in range(len(self.grid_mode_combo.items)):
             if self.grid_mode_combo.itemData(i) == current_mode:
                 self.grid_mode_combo.setCurrentIndex(i)
                 break
 
-        self.grid_mode_combo.currentTextChanged.connect(self._on_grid_mode_changed)
+        self.grid_mode_combo.activated.connect(self._on_grid_mode_changed)
         controls_layout.addWidget(self.grid_mode_combo)
 
         controls_layout.addStretch()
 
         layout.addWidget(controls_widget)
 
-    def _on_grid_mode_changed(self):
+    def _on_grid_mode_changed(self, index):
         """Handle grid mode change from combo box."""
-        current_data = self.grid_mode_combo.currentData()
+        current_data = self.grid_mode_combo.itemData(index)
         if current_data and current_data != self.settings.multi_view_grid_mode:
             # Update settings
             self.settings.multi_view_grid_mode = current_data
@@ -1062,8 +1061,7 @@ class MainWindow(QMainWindow):
                 layout.deleteLater()
             except Exception as e:
                 # If layout clearing fails, just reset the viewer lists
-                print(f"Layout clearing failed: {e}")
-                pass
+                logger.error(f"Layout clearing failed: {e}")
 
     def _clear_multi_view_layout(self):
         """Clear the existing multi-view layout."""
@@ -1121,6 +1119,48 @@ class MainWindow(QMainWindow):
             # Switch to polygon mode if SAM is disabled and we're in SAM/AI mode
             self.set_polygon_mode()
 
+    def _fix_fft_connection(self):
+        """Fix FFT signal connection issue - workaround for connection timing problem."""
+        try:
+            # Get the FFT widget directly and connect to its signal
+            fft_widget = self.control_panel.get_fft_threshold_widget()
+            if fft_widget:
+                # Direct connection bypass - connect FFT widget directly to main window handler
+                # This bypasses the control panel signal forwarding which has timing issues
+                # Use a wrapper to ensure the connection works reliably
+                def fft_signal_wrapper():
+                    self._handle_fft_threshold_changed()
+
+                fft_widget.fft_threshold_changed.connect(fft_signal_wrapper)
+
+                logger.info("FFT signal connection bypass established successfully")
+            else:
+                logger.warning("FFT widget not found during connection fix")
+        except Exception as e:
+            logger.warning(f"Failed to establish FFT connection bypass: {e}")
+
+        # Also fix channel threshold connection for RGB images
+        try:
+            channel_widget = self.control_panel.get_channel_threshold_widget()
+            if channel_widget:
+                # Direct connection bypass for channel threshold widget too
+                def channel_signal_wrapper():
+                    self._handle_channel_threshold_changed()
+
+                channel_widget.thresholdChanged.connect(channel_signal_wrapper)
+
+                logger.info(
+                    "Channel threshold signal connection bypass established successfully"
+                )
+            else:
+                logger.warning(
+                    "Channel threshold widget not found during connection fix"
+                )
+        except Exception as e:
+            logger.warning(
+                f"Failed to establish channel threshold connection bypass: {e}"
+            )
+
     def _setup_connections(self):
         """Setup signal connections."""
         # Control panel connections
@@ -1169,9 +1209,13 @@ class MainWindow(QMainWindow):
         )
 
         # FFT threshold connections
-        self.control_panel.fft_threshold_changed.connect(
-            self._handle_fft_threshold_changed
-        )
+        try:
+            self.control_panel.fft_threshold_changed.connect(
+                self._handle_fft_threshold_changed
+            )
+            logger.debug("FFT threshold connection established in _setup_connections")
+        except Exception as e:
+            logger.error(f"Failed to establish FFT threshold connection: {e}")
 
         # Right panel connections
         self.right_panel.open_folder_requested.connect(self._open_folder_dialog)
@@ -1774,6 +1818,9 @@ class MainWindow(QMainWindow):
         # Update file selection in the file manager
         self.right_panel.select_file(Path(path))
 
+        # Update threshold widgets for new image (this was missing!)
+        self._update_channel_threshold_for_image(pixmap)
+
     def _load_multi_view_from_path(self, path: str):
         """Load multi-view starting from a specific path using FastFileManager."""
         config = self._get_multi_view_config()
@@ -1948,6 +1995,9 @@ class MainWindow(QMainWindow):
         if changed_indices:
             self._fast_update_multi_view_images(changed_indices)
 
+        # Update threshold widgets for the loaded images
+        self._update_multi_view_channel_threshold_for_images()
+
         # Load existing segments for all loaded images
         valid_image_paths = [path for path in image_paths if path is not None]
         if valid_image_paths:
@@ -2005,7 +2055,9 @@ class MainWindow(QMainWindow):
                         all_segments.extend(viewer_segments)
                         self.segment_manager.segments.clear()
                     except Exception as e:
-                        print(f"Error loading segments for viewer {viewer_index}: {e}")
+                        logger.error(
+                            f"Error loading segments for viewer {viewer_index}: {e}"
+                        )
 
             # Set all segments at once
             self.segment_manager.segments = all_segments
@@ -2025,7 +2077,7 @@ class MainWindow(QMainWindow):
                 self._update_all_lists()
 
         except Exception as e:
-            print(f"Error in _load_multi_view_segments: {e}")
+            logger.error(f"Error in _load_multi_view_segments: {e}")
             self.segment_manager.segments.clear()
 
     def _cancel_multi_view_sam_loading(self):
@@ -3353,6 +3405,8 @@ class MainWindow(QMainWindow):
                 valid_paths = [Path(img) for img in self.multi_view_images if img]
                 if valid_paths:
                     self.right_panel.file_manager.batchUpdateFileStatus(valid_paths)
+                    # Force immediate GUI update
+                    QApplication.processEvents()
             # Clear the tracking list for next save
             self._saved_file_paths = []
 
@@ -3401,6 +3455,8 @@ class MainWindow(QMainWindow):
                 )
                 # Update UI immediately when files are deleted
                 self._update_all_lists()
+                # Force immediate GUI update
+                QApplication.processEvents()
             else:
                 self._show_warning_notification("No segments to save.")
             return
@@ -3478,15 +3534,16 @@ class MainWindow(QMainWindow):
                     )
 
             # Update FastFileManager to show NPZ/TXT checkmarks
-            if (
-                (npz_path or txt_path)
-                and hasattr(self, "right_panel")
-                and hasattr(self.right_panel, "file_manager")
+            # Always update file status after save attempt (regardless of what was saved)
+            if hasattr(self, "right_panel") and hasattr(
+                self.right_panel, "file_manager"
             ):
                 # Update the file status in the FastFileManager
                 self.right_panel.file_manager.updateFileStatus(
                     Path(self.current_image_path)
                 )
+                # Force immediate GUI update
+                QApplication.processEvents()
         except Exception as e:
             logger.error(f"Error saving file: {str(e)}", exc_info=True)
             self._show_error_notification(f"Error saving: {str(e)}")
@@ -5714,27 +5771,50 @@ class MainWindow(QMainWindow):
 
     def _update_channel_threshold_for_image(self, pixmap):
         """Update channel threshold widget for the given image pixmap."""
-        if pixmap.isNull():
+        if pixmap.isNull() or not self.current_image_path:
             self.control_panel.update_channel_threshold_for_image(None)
             return
 
-        # Convert pixmap to numpy array
-        qimage = pixmap.toImage()
-        ptr = qimage.constBits()
-        ptr.setsize(qimage.bytesPerLine() * qimage.height())
-        image_np = np.array(ptr).reshape(qimage.height(), qimage.width(), 4)
-        # Convert from BGRA to RGB, ignore alpha
-        image_rgb = image_np[:, :, [2, 1, 0]]
+        # Use cv2.imread for more robust loading instead of QPixmap conversion
+        try:
+            import cv2
 
-        # Check if image is grayscale (all channels are the same)
-        if np.array_equal(image_rgb[:, :, 0], image_rgb[:, :, 1]) and np.array_equal(
-            image_rgb[:, :, 1], image_rgb[:, :, 2]
-        ):
-            # Convert to single channel grayscale
-            image_array = image_rgb[:, :, 0]
-        else:
-            # Keep as RGB
-            image_array = image_rgb
+            image_array = cv2.imread(self.current_image_path)
+            if image_array is None:
+                self.control_panel.update_channel_threshold_for_image(None)
+                return
+
+            # Convert from BGR to RGB
+            if len(image_array.shape) == 3 and image_array.shape[2] == 3:
+                image_array = cv2.cvtColor(image_array, cv2.COLOR_BGR2RGB)
+
+            # Check if image is grayscale (all channels are the same)
+            if (
+                len(image_array.shape) == 3
+                and np.array_equal(image_array[:, :, 0], image_array[:, :, 1])
+                and np.array_equal(image_array[:, :, 1], image_array[:, :, 2])
+            ):
+                # Convert to single channel grayscale
+                image_array = image_array[:, :, 0]
+
+        except Exception:
+            # Fallback to QPixmap conversion if cv2 fails
+            qimage = pixmap.toImage()
+            ptr = qimage.constBits()
+            ptr.setsize(qimage.bytesPerLine() * qimage.height())
+            image_np = np.array(ptr).reshape(qimage.height(), qimage.width(), 4)
+            # Convert from BGRA to RGB, ignore alpha
+            image_rgb = image_np[:, :, [2, 1, 0]]
+
+            # Check if image is grayscale (all channels are the same)
+            if np.array_equal(
+                image_rgb[:, :, 0], image_rgb[:, :, 1]
+            ) and np.array_equal(image_rgb[:, :, 1], image_rgb[:, :, 2]):
+                # Convert to single channel grayscale
+                image_array = image_rgb[:, :, 0]
+            else:
+                # Keep as RGB
+                image_array = image_rgb
 
         # Update the channel threshold widget
         self.control_panel.update_channel_threshold_for_image(image_array)
@@ -5762,29 +5842,51 @@ class MainWindow(QMainWindow):
             self.control_panel.update_channel_threshold_for_image(None)
             return
 
-        # Load and convert the first image to update the widget
-        pixmap = QPixmap(first_image_path)
-        if pixmap.isNull():
-            self.control_panel.update_channel_threshold_for_image(None)
-            return
+        # Use cv2.imread for more robust loading instead of QPixmap conversion
+        try:
+            import cv2
 
-        # Convert pixmap to numpy array
-        qimage = pixmap.toImage()
-        ptr = qimage.constBits()
-        ptr.setsize(qimage.bytesPerLine() * qimage.height())
-        image_np = np.array(ptr).reshape(qimage.height(), qimage.width(), 4)
-        # Convert from BGRA to RGB, ignore alpha
-        image_rgb = image_np[:, :, [2, 1, 0]]
+            image_array = cv2.imread(first_image_path)
+            if image_array is None:
+                self.control_panel.update_channel_threshold_for_image(None)
+                return
 
-        # Check if image is grayscale (all channels are the same)
-        if np.array_equal(image_rgb[:, :, 0], image_rgb[:, :, 1]) and np.array_equal(
-            image_rgb[:, :, 1], image_rgb[:, :, 2]
-        ):
-            # Convert to single channel grayscale
-            image_array = image_rgb[:, :, 0]
-        else:
-            # Keep as RGB
-            image_array = image_rgb
+            # Convert from BGR to RGB
+            if len(image_array.shape) == 3 and image_array.shape[2] == 3:
+                image_array = cv2.cvtColor(image_array, cv2.COLOR_BGR2RGB)
+
+            # Check if image is grayscale (all channels are the same)
+            if (
+                len(image_array.shape) == 3
+                and np.array_equal(image_array[:, :, 0], image_array[:, :, 1])
+                and np.array_equal(image_array[:, :, 1], image_array[:, :, 2])
+            ):
+                # Convert to single channel grayscale
+                image_array = image_array[:, :, 0]
+
+        except Exception:
+            # Fallback to QPixmap conversion if cv2 fails
+            pixmap = QPixmap(first_image_path)
+            if pixmap.isNull():
+                self.control_panel.update_channel_threshold_for_image(None)
+                return
+
+            qimage = pixmap.toImage()
+            ptr = qimage.constBits()
+            ptr.setsize(qimage.bytesPerLine() * qimage.height())
+            image_np = np.array(ptr).reshape(qimage.height(), qimage.width(), 4)
+            # Convert from BGRA to RGB, ignore alpha
+            image_rgb = image_np[:, :, [2, 1, 0]]
+
+            # Check if image is grayscale (all channels are the same)
+            if np.array_equal(
+                image_rgb[:, :, 0], image_rgb[:, :, 1]
+            ) and np.array_equal(image_rgb[:, :, 1], image_rgb[:, :, 2]):
+                # Convert to single channel grayscale
+                image_array = image_rgb[:, :, 0]
+            else:
+                # Keep as RGB
+                image_array = image_rgb
 
         # Update the channel threshold widget
         self.control_panel.update_channel_threshold_for_image(image_array)
@@ -7097,7 +7199,6 @@ class MainWindow(QMainWindow):
                 )
 
                 # Load existing segments for the current image
-                print(f"Loading segments for single-view: {self.current_image_path}")
                 try:
                     # Clear any leftover multi-view segments first
                     self.segment_manager.clear()
@@ -7114,7 +7215,7 @@ class MainWindow(QMainWindow):
                     self._update_all_lists()
 
                 except Exception as e:
-                    print(f"Error loading segments for single-view: {e}")
+                    logger.error(f"Error loading segments for single-view: {e}")
 
                 # Redisplay segments for single view
                 if hasattr(self, "single_view_mode_handler"):

{lazylabel_gui-1.3.3 → lazylabel_gui-1.3.4}/src/lazylabel/ui/widgets/channel_threshold_widget.py

@@ -270,10 +270,6 @@ class MultiIndicatorSlider(QWidget):
         """Handle right-click to remove indicator."""
         slider_rect = self.get_slider_rect()
 
-        # Only allow removal if more than 1 indicator
-        if len(self.indicators) <= 1:
-            return
-
         # Check if right-clicking on an indicator
         for i, value in enumerate(self.indicators):
             x = self.value_to_x(value)
@@ -473,7 +469,7 @@ class ChannelThresholdWidget(QWidget):
 
         if self.current_image_channels == 1:
             # Grayscale image
-            if "Gray" in self.sliders:
+            if "Gray" in self.sliders and self.sliders["Gray"].is_enabled():
                 result = self._apply_channel_thresholding(
                     result, self.sliders["Gray"].get_indicators()
                 )
@@ -481,7 +477,10 @@ class ChannelThresholdWidget(QWidget):
             # RGB image
             channel_names = ["Red", "Green", "Blue"]
             for i, channel_name in enumerate(channel_names):
-                if channel_name in self.sliders:
+                if (
+                    channel_name in self.sliders
+                    and self.sliders[channel_name].is_enabled()
+                ):
                     result[:, :, i] = self._apply_channel_thresholding(
                         result[:, :, i], self.sliders[channel_name].get_indicators()
                     )
@@ -494,7 +493,7 @@ class ChannelThresholdWidget(QWidget):
         if not indicators:
             return channel_data
 
-            # Sort indicators
+        # Sort indicators
         sorted_indicators = sorted(indicators)
 
         # Create output array
@@ -527,9 +526,9 @@ class ChannelThresholdWidget(QWidget):
         return result
 
     def has_active_thresholding(self):
-        """Check if any channel has active thresholding (indicators present)."""
+        """Check if any channel has active thresholding (enabled and indicators present)."""
         for slider_widget in self.sliders.values():
-            if slider_widget.get_indicators():
+            if slider_widget.is_enabled() and slider_widget.get_indicators():
                 return True
         return False
 

{lazylabel_gui-1.3.3 → lazylabel_gui-1.3.4}/src/lazylabel/ui/widgets/fft_threshold_widget.py

@@ -308,6 +308,8 @@ class FFTThresholdWidget(QWidget):
                 self.status_label.setStyleSheet(
                     "color: #F44336; font-size: 9px; font-style: italic;"
                 )
+                # Disable FFT processing for color images
+                self.enable_checkbox.setChecked(False)
         else:
             # Unknown format
             self.current_image_channels = 0
@@ -315,6 +317,8 @@ class FFTThresholdWidget(QWidget):
             self.status_label.setStyleSheet(
                 "color: #F44336; font-size: 9px; font-style: italic;"
             )
+            # Disable FFT processing for unsupported formats
+            self.enable_checkbox.setChecked(False)
 
     def is_active(self):
         """Check if FFT processing is active (checkbox enabled and image is grayscale)."""

{lazylabel_gui-1.3.3 → lazylabel_gui-1.3.4}/src/lazylabel/ui/widgets/model_selection_widget.py

@@ -111,6 +111,15 @@ class CustomDropdown(QToolButton):
             text, _ = self.items[index]
             self.setText(text)
 
+    def count(self):
+        """Get number of items."""
+        return len(self.items)
+
+    def currentData(self):
+        """Get data of currently selected item."""
+        current_idx = self.currentIndex()
+        return self.itemData(current_idx)
+
     def blockSignals(self, block):
         """Block/unblock signals."""
         super().blockSignals(block)