lazylabel-gui 1.3.3__py3-none-any.whl → 1.3.5__py3-none-any.whl

lazylabel/utils/fast_file_manager.py

@@ -17,21 +17,159 @@ from PyQt6.QtCore import (
 )
 from PyQt6.QtGui import QPixmap
 from PyQt6.QtWidgets import (
-    QComboBox,
     QHBoxLayout,
     QHeaderView,
     QLabel,
     QLineEdit,
+    QMenu,
     QPushButton,
     QTableView,
+    QToolButton,
     QVBoxLayout,
     QWidget,
 )
 
+from ..utils.logger import logger
+
 # Image extensions supported
 IMAGE_EXTENSIONS = {".png", ".jpg", ".jpeg", ".tiff", ".tif"}
 
 
+class CustomDropdown(QToolButton):
+    """Custom dropdown using QToolButton + QMenu for reliable closing behavior."""
+
+    activated = pyqtSignal(int)
+
+    def __init__(self, parent=None):
+        super().__init__(parent)
+        self.setText("⚏")  # Grid/settings icon
+        self.setPopupMode(QToolButton.ToolButtonPopupMode.InstantPopup)
+        self.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonTextOnly)
+
+        # Create the menu
+        self.menu = QMenu(self)
+        self.setMenu(self.menu)
+
+        # Store items for access
+        self.items = []
+
+        # Style to match app theme (dark theme with consistent colors)
+        self.setStyleSheet("""
+            QToolButton {
+                background-color: rgba(40, 40, 40, 0.8);
+                border: 1px solid rgba(80, 80, 80, 0.6);
+                border-radius: 6px;
+                color: #E0E0E0;
+                font-size: 10px;
+                padding: 5px 8px;
+                text-align: left;
+                min-width: 30px;
+                max-width: 30px;
+            }
+            QToolButton:hover {
+                background-color: rgba(60, 60, 60, 0.8);
+                border-color: rgba(90, 120, 150, 0.8);
+            }
+            QToolButton:pressed {
+                background-color: rgba(70, 100, 130, 0.8);
+            }
+            QToolButton::menu-indicator {
+                subcontrol-origin: padding;
+                subcontrol-position: top right;
+                width: 16px;
+                border-left: 1px solid rgba(80, 80, 80, 0.6);
+            }
+            QMenu {
+                background-color: rgba(50, 50, 50, 0.9);
+                border: 1px solid rgba(80, 80, 80, 0.4);
+                color: #E0E0E0;
+            }
+            QMenu::item {
+                padding: 4px 8px;
+            }
+            QMenu::item:selected {
+                background-color: rgba(100, 100, 200, 0.5);
+            }
+        """)
+
+    def addCheckableItem(self, text, checked=True, data=None):
+        """Add a checkable item to the dropdown."""
+        action = self.menu.addAction(text)
+        action.setCheckable(True)
+        action.setChecked(checked)
+        action.setData(data)
+        self.items.append((text, data, action))
+
+        # Connect to selection handler
+        action.triggered.connect(
+            lambda checked_state, idx=len(self.items) - 1: self._on_item_toggled(
+                idx, checked_state
+            )
+        )
+
+    def clear(self):
+        """Clear all items."""
+        self.menu.clear()
+        self.items.clear()
+
+    def _on_item_toggled(self, index, checked):
+        """Handle item toggle."""
+        if 0 <= index < len(self.items):
+            self.activated.emit(index)
+
+    def isItemChecked(self, index):
+        """Check if item at index is checked."""
+        if 0 <= index < len(self.items):
+            return self.items[index][2].isChecked()
+        return False
+
+    def setItemChecked(self, index, checked):
+        """Set checked state of item at index."""
+        if 0 <= index < len(self.items):
+            self.items[index][2].setChecked(checked)
+
+    def addItem(self, text, data=None):
+        """Add a non-checkable item to the dropdown (QComboBox compatibility)."""
+        action = self.menu.addAction(text)
+        action.setCheckable(False)
+        action.setData(data)
+        self.items.append((text, data, action))
+
+        # Connect to selection handler
+        action.triggered.connect(lambda: self._on_item_selected(len(self.items) - 1))
+
+    def _on_item_selected(self, index):
+        """Handle item selection (for non-checkable items)."""
+        if 0 <= index < len(self.items):
+            text, data, action = self.items[index]
+            self.setText(text)
+            self.activated.emit(index)
+
+    def count(self):
+        """Return number of items (QComboBox compatibility)."""
+        return len(self.items)
+
+    def itemData(self, index):
+        """Get data for item at index (QComboBox compatibility)."""
+        if 0 <= index < len(self.items):
+            return self.items[index][1]
+        return None
+
+    def setCurrentIndex(self, index):
+        """Set current selection index (QComboBox compatibility)."""
+        if 0 <= index < len(self.items):
+            text, data, action = self.items[index]
+            self.setText(text)
+
+    def currentIndex(self):
+        """Get current selection index (QComboBox compatibility)."""
+        current_text = self.text()
+        for i, (text, _data, _action) in enumerate(self.items):
+            if text == current_text:
+                return i
+        return -1
+
+
 @dataclass
 class FileInfo:
     """Information about a file"""
@@ -121,7 +259,7 @@ class FileScanner(QThread):
             self.scanComplete.emit(total_files)
 
         except Exception as e:
-            print(f"Error scanning directory: {e}")
+            logger.error(f"Error scanning directory: {e}")
 
     def stop(self):
         """Stop the scanning thread"""
@@ -139,31 +277,94 @@ class FastFileModel(QAbstractTableModel):
         self._path_to_index: dict[str, int] = {}  # For O(1) lookups
         self._scanner: FileScanner | None = None
 
+        # Column management - New order: Name, NPZ, TXT, Modified, Size
+        self._all_columns = ["Name", "NPZ", "TXT", "Modified", "Size"]
+        self._column_map = {0: 0, 1: 1, 2: 2, 3: 3, 4: 4}  # logical to physical mapping
+        self._visible_columns = [True, True, True, True, True]  # Default all visible
+
     def rowCount(self, parent=QModelIndex()):
         return len(self._files)
 
     def columnCount(self, parent=QModelIndex()):
-        return 5  # Name, Size, Modified, NPZ, TXT
+        return sum(self._visible_columns)  # Count visible columns
+
+    def getVisibleColumnIndex(self, logical_column):
+        """Convert logical column index to visible column index"""
+        if (
+            logical_column >= len(self._visible_columns)
+            or not self._visible_columns[logical_column]
+        ):
+            return -1
+
+        visible_index = 0
+        for i in range(logical_column):
+            if self._visible_columns[i]:
+                visible_index += 1
+        return visible_index
+
+    def getLogicalColumnIndex(self, visible_column):
+        """Convert visible column index to logical column index"""
+        visible_count = 0
+        for i, visible in enumerate(self._visible_columns):
+            if visible:
+                if visible_count == visible_column:
+                    return i
+                visible_count += 1
+        return -1
+
+    def setColumnVisible(self, column, visible):
+        """Set column visibility"""
+        if (
+            0 <= column < len(self._visible_columns)
+            and self._visible_columns[column] != visible
+        ):
+            self.beginResetModel()
+            self._visible_columns[column] = visible
+            self.endResetModel()
+
+    def isColumnVisible(self, column):
+        """Check if column is visible"""
+        if 0 <= column < len(self._visible_columns):
+            return self._visible_columns[column]
+        return False
+
+    def moveColumn(self, from_column, to_column):
+        """Move column to new position"""
+        if (
+            0 <= from_column < len(self._all_columns)
+            and 0 <= to_column < len(self._all_columns)
+            and from_column != to_column
+        ):
+            self.beginResetModel()
+            # Move in all arrays
+            self._all_columns.insert(to_column, self._all_columns.pop(from_column))
+            self._visible_columns.insert(
+                to_column, self._visible_columns.pop(from_column)
+            )
+            self.endResetModel()
 
     def data(self, index: QModelIndex, role=Qt.ItemDataRole.DisplayRole):
         if not index.isValid():
             return None
 
         file_info = self._files[index.row()]
-        col = index.column()
+        visible_col = index.column()
+
+        # Convert visible column to logical column
+        logical_col = self.getLogicalColumnIndex(visible_col)
+        if logical_col == -1:
+            return None
+
+        column_name = self._all_columns[logical_col]
 
         if role == Qt.ItemDataRole.DisplayRole:
-            if col == 0:  # Name
+            if column_name == "Name":
                 return file_info.name
-            elif col == 1:  # Size
-                # Lazy load size only when displayed
-                if file_info.size == 0:
-                    try:
-                        file_info.size = file_info.path.stat().st_size
-                    except OSError:
-                        file_info.size = -1  # Mark as error
-                return self._format_size(file_info.size) if file_info.size >= 0 else "-"
-            elif col == 2:  # Modified
+            elif column_name == "NPZ":
+                return "✓" if file_info.has_npz else ""
+            elif column_name == "TXT":
+                return "✓" if file_info.has_txt else ""
+            elif column_name == "Modified":
                 # Lazy load modified time only when displayed
                 if file_info.modified == 0.0:
                     try:
@@ -177,16 +378,20 @@ class FastFileModel(QAbstractTableModel):
                     if file_info.modified > 0
                     else "-"
                 )
-            elif col == 3:  # NPZ
-                return "✓" if file_info.has_npz else ""
-            elif col == 4:  # TXT
-                return "✓" if file_info.has_txt else ""
+            elif column_name == "Size":
+                # Lazy load size only when displayed
+                if file_info.size == 0:
+                    try:
+                        file_info.size = file_info.path.stat().st_size
+                    except OSError:
+                        file_info.size = -1  # Mark as error
+                return self._format_size(file_info.size) if file_info.size >= 0 else "-"
         elif role == Qt.ItemDataRole.UserRole:
             # Return the FileInfo object for custom access
             return file_info
-        elif role == Qt.ItemDataRole.TextAlignmentRole and col in [
-            3,
-            4,
+        elif role == Qt.ItemDataRole.TextAlignmentRole and column_name in [
+            "NPZ",
+            "TXT",
         ]:  # Center checkmarks
             return Qt.AlignmentFlag.AlignCenter
 
@@ -197,8 +402,9 @@ class FastFileModel(QAbstractTableModel):
             orientation == Qt.Orientation.Horizontal
             and role == Qt.ItemDataRole.DisplayRole
         ):
-            headers = ["Name", "Size", "Modified", "NPZ", "TXT"]
-            return headers[section]
+            logical_col = self.getLogicalColumnIndex(section)
+            if logical_col >= 0 and logical_col < len(self._all_columns):
+                return self._all_columns[logical_col]
         return None
 
     def _format_size(self, size: int) -> str:
@@ -244,7 +450,14 @@ class FastFileModel(QAbstractTableModel):
 
     def _on_scan_complete(self, total: int):
         """Handle scan completion"""
-        print(f"Scan complete: {total} files found")
+        pass  # Scan completion is handled by the UI status update
+
+    def getFileCounts(self):
+        """Get counts of total files, NPZ files, and TXT files"""
+        total_files = len(self._files)
+        npz_count = sum(1 for file_info in self._files if file_info.has_npz)
+        txt_count = sum(1 for file_info in self._files if file_info.has_txt)
+        return total_files, npz_count, txt_count
 
     def getFileInfo(self, index: int) -> FileInfo | None:
         """Get file info at index"""
@@ -358,12 +571,19 @@ class FileSortProxyModel(QSortFilterProxyModel):
         if not left_info or not right_info:
             return False
 
-        col = left.column()
+        visible_col = left.column()
+
+        # Convert visible column to logical column
+        logical_col = self.sourceModel().getLogicalColumnIndex(visible_col)
+        if logical_col == -1:
+            return False
+
+        column_name = self.sourceModel()._all_columns[logical_col]
 
-        # Sort based on column
-        if col == 0:  # Name
+        # Sort based on column type
+        if column_name == "Name":
             return left_info.name.lower() < right_info.name.lower()
-        elif col == 1:  # Size
+        elif column_name == "Size":
             # Lazy load size if needed for sorting
             if left_info.size == 0:
                 try:
@@ -376,7 +596,7 @@ class FileSortProxyModel(QSortFilterProxyModel):
                 except OSError:
                     right_info.size = -1
             return left_info.size < right_info.size
-        elif col == 2:  # Modified
+        elif column_name == "Modified":
             # Lazy load modified time if needed for sorting
             if left_info.modified == 0.0:
                 try:
@@ -389,9 +609,9 @@ class FileSortProxyModel(QSortFilterProxyModel):
                 except OSError:
                     right_info.modified = -1
             return left_info.modified < right_info.modified
-        elif col == 3:  # NPZ
+        elif column_name == "NPZ":
             return left_info.has_npz < right_info.has_npz
-        elif col == 4:  # TXT
+        elif column_name == "TXT":
             return left_info.has_txt < right_info.has_txt
 
         return False
@@ -437,19 +657,13 @@ class FastFileManager(QWidget):
         self._table_view.setSortingEnabled(True)
         self._table_view.sortByColumn(0, Qt.SortOrder.AscendingOrder)
 
-        # Configure headers
+        # Configure headers with drag-and-drop reordering
         header = self._table_view.horizontalHeader()
-        header.setSectionResizeMode(
-            0, QHeaderView.ResizeMode.Stretch
-        )  # Name column stretches
-        header.setSectionResizeMode(1, QHeaderView.ResizeMode.ResizeToContents)  # Size
-        header.setSectionResizeMode(
-            2, QHeaderView.ResizeMode.ResizeToContents
-        )  # Modified
-        header.setSectionResizeMode(3, QHeaderView.ResizeMode.Fixed)  # NPZ
-        header.setSectionResizeMode(4, QHeaderView.ResizeMode.Fixed)  # TXT
-        header.resizeSection(3, 50)
-        header.resizeSection(4, 50)
+        header.setSectionsMovable(True)  # Enable drag-and-drop reordering
+        header.sectionMoved.connect(self._on_column_moved)
+
+        # Initial header sizing (will be updated by _update_header_sizing)
+        self._update_header_sizing()
 
         # Style the table to match the existing UI
         self._table_view.setStyleSheet("""
@@ -515,42 +729,95 @@ class FastFileManager(QWidget):
         sort_label.setStyleSheet("color: #E0E0E0;")
         layout.addWidget(sort_label)
 
-        self._sort_combo = QComboBox()
-        self._sort_combo.addItems(
-            [
-                "Name (A-Z)",
-                "Name (Z-A)",
-                "Date (Oldest)",
-                "Date (Newest)",
-                "Size (Smallest)",
-                "Size (Largest)",
-            ]
-        )
-        self._sort_combo.currentIndexChanged.connect(self._on_sort_changed)
-        self._sort_combo.setStyleSheet("""
-            QComboBox {
-                background-color: rgba(50, 50, 50, 0.5);
-                border: 1px solid rgba(80, 80, 80, 0.4);
-                color: #E0E0E0;
-                padding: 4px;
-                border-radius: 3px;
-            }
-            QComboBox::drop-down {
-                border: none;
-            }
-            QComboBox::down-arrow {
-                width: 12px;
-                height: 12px;
-            }
-            QComboBox QAbstractItemView {
-                background-color: rgba(50, 50, 50, 0.9);
-                border: 1px solid rgba(80, 80, 80, 0.4);
-                color: #E0E0E0;
-                selection-background-color: rgba(100, 100, 200, 0.5);
-            }
-        """)
+        # Create custom sort dropdown
+        class SortDropdown(QToolButton):
+            activated = pyqtSignal(int)
+
+            def __init__(self, parent=None):
+                super().__init__(parent)
+                self.setText("Name (A-Z)")
+                self.setPopupMode(QToolButton.ToolButtonPopupMode.InstantPopup)
+                self.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonTextOnly)
+
+                self.menu = QMenu(self)
+                self.setMenu(self.menu)
+                self.items = []
+
+                # Same style as CustomDropdown
+                self.setStyleSheet("""
+                    QToolButton {
+                        background-color: rgba(40, 40, 40, 0.8);
+                        border: 1px solid rgba(80, 80, 80, 0.6);
+                        border-radius: 6px;
+                        color: #E0E0E0;
+                        font-size: 10px;
+                        padding: 5px 8px;
+                        text-align: left;
+                        min-width: 70px;
+                        max-width: 70px;
+                    }
+                    QToolButton:hover {
+                        background-color: rgba(60, 60, 60, 0.8);
+                        border-color: rgba(90, 120, 150, 0.8);
+                    }
+                    QToolButton:pressed {
+                        background-color: rgba(70, 100, 130, 0.8);
+                    }
+                    QToolButton::menu-indicator {
+                        subcontrol-origin: padding;
+                        subcontrol-position: top right;
+                        width: 16px;
+                        border-left: 1px solid rgba(80, 80, 80, 0.6);
+                    }
+                    QMenu {
+                        background-color: rgba(50, 50, 50, 0.9);
+                        border: 1px solid rgba(80, 80, 80, 0.4);
+                        color: #E0E0E0;
+                    }
+                    QMenu::item {
+                        padding: 4px 8px;
+                    }
+                    QMenu::item:selected {
+                        background-color: rgba(100, 100, 200, 0.5);
+                    }
+                """)
+
+            def addItem(self, text, data=None):
+                action = self.menu.addAction(text)
+                action.setData(data)
+                self.items.append((text, data))
+                action.triggered.connect(
+                    lambda checked, idx=len(self.items) - 1: self._on_item_selected(idx)
+                )
+                if len(self.items) == 1:
+                    self.setText(text)
+
+            def _on_item_selected(self, index):
+                if 0 <= index < len(self.items):
+                    text, data = self.items[index]
+                    self.setText(text)
+                    self.activated.emit(index)
+
+        self._sort_combo = SortDropdown()
+        self._sort_combo.addItem("Name (A-Z)", 0)
+        self._sort_combo.addItem("Name (Z-A)", 1)
+        self._sort_combo.addItem("Date (Oldest)", 2)
+        self._sort_combo.addItem("Date (Newest)", 3)
+        self._sort_combo.addItem("Size (Smallest)", 4)
+        self._sort_combo.addItem("Size (Largest)", 5)
+        self._sort_combo.activated.connect(self._on_sort_changed)
         layout.addWidget(self._sort_combo)
 
+        # Column visibility dropdown
+        self._column_dropdown = CustomDropdown()
+        self._column_dropdown.addCheckableItem("Name", True, 0)
+        self._column_dropdown.addCheckableItem("NPZ", True, 1)
+        self._column_dropdown.addCheckableItem("TXT", True, 2)
+        self._column_dropdown.addCheckableItem("Modified", True, 3)
+        self._column_dropdown.addCheckableItem("Size", True, 4)
+        self._column_dropdown.activated.connect(self._on_column_visibility_changed)
+        layout.addWidget(self._column_dropdown)
+
         # Refresh button
         refresh_btn = QPushButton("Refresh")
         refresh_btn.clicked.connect(self._refresh)
@@ -584,7 +851,7 @@ class FastFileManager(QWidget):
         # Connect to scan complete signal
         if self._model._scanner:
             self._model._scanner.scanComplete.connect(
-                lambda count: self._update_status(f"{count} files in {directory.name}")
+                lambda count: self._update_detailed_status(directory.name)
             )
 
     def _on_search_changed(self, text: str):
@@ -623,6 +890,50 @@ class FastFileManager(QWidget):
         if self._current_directory:
             self.setDirectory(self._current_directory)
 
+    def _on_column_visibility_changed(self, column_index):
+        """Handle column visibility toggle"""
+        is_checked = self._column_dropdown.isItemChecked(column_index)
+        self._model.setColumnVisible(column_index, is_checked)
+
+        # Update header sizing for visible columns
+        self._update_header_sizing()
+
+    def _update_header_sizing(self):
+        """Update header column sizing for visible columns"""
+        header = self._table_view.horizontalHeader()
+        visible_columns = sum(self._model._visible_columns)
+
+        if visible_columns == 0:
+            return
+
+        # Set all columns to Interactive mode for manual resizing
+        for i in range(visible_columns):
+            # Find logical column for this visible index
+            logical_col = self._model.getLogicalColumnIndex(i)
+            if logical_col >= 0:
+                column_name = self._model._all_columns[logical_col]
+                # All columns are interactive (manually resizable)
+                header.setSectionResizeMode(i, QHeaderView.ResizeMode.Interactive)
+
+                # Set appropriate default sizes
+                if column_name == "Name":
+                    header.resizeSection(i, 200)  # Default name column width
+                elif column_name in ["NPZ", "TXT"]:
+                    header.resizeSection(i, 50)  # Compact for checkmarks
+                elif column_name == "Modified":
+                    header.resizeSection(i, 120)  # Date needs more space
+                elif column_name == "Size":
+                    header.resizeSection(i, 80)  # Size needs moderate space
+
+        # Disable stretch last section to allow all columns to be manually resized
+        header.setStretchLastSection(False)
+
+    def _on_column_moved(self, logical_index, old_visual_index, new_visual_index):
+        """Handle column reordering via drag-and-drop"""
+        # For now, just update the header sizing to maintain proper resize modes
+        # The QHeaderView handles the visual reordering automatically
+        self._update_header_sizing()
+
     def updateNpzStatus(self, image_path: Path):
         """Update NPZ status for a specific image file"""
         self._model.updateNpzStatus(image_path)
@@ -630,6 +941,12 @@ class FastFileManager(QWidget):
     def updateFileStatus(self, image_path: Path):
         """Update both NPZ and TXT status for a specific image file"""
         self._model.updateFileStatus(image_path)
+        # Update status counts when file status changes
+        if self._current_directory:
+            self._update_detailed_status(self._current_directory.name)
+        # Force table view to repaint immediately
+        self._table_view.viewport().update()
+        self._table_view.repaint()
 
     def refreshFile(self, image_path: Path):
         """Refresh status for a specific file"""
@@ -638,6 +955,12 @@ class FastFileManager(QWidget):
     def batchUpdateFileStatus(self, image_paths: list[Path]):
         """Batch update file status for multiple files"""
         self._model.batchUpdateFileStatus(image_paths)
+        # Update status counts after batch update
+        if self._current_directory:
+            self._update_detailed_status(self._current_directory.name)
+        # Force table view to repaint immediately
+        self._table_view.viewport().update()
+        self._table_view.repaint()
 
     def getSurroundingFiles(self, current_path: Path, count: int) -> list[Path]:
         """Get files in current sorted/filtered order surrounding the given path"""
@@ -730,6 +1053,27 @@ class FastFileManager(QWidget):
         """Update status label"""
         self._status_label.setText(text)
 
+    def _update_detailed_status(self, directory_name: str):
+        """Update status label with detailed file counts"""
+        total_files, npz_count, txt_count = self._model.getFileCounts()
+
+        if total_files == 0:
+            status_text = f"No files in {directory_name}"
+        else:
+            # Build the status message parts
+            parts = []
+            parts.append(f"{total_files} image{'s' if total_files != 1 else ''}")
+
+            if npz_count > 0:
+                parts.append(f"{npz_count} npz")
+
+            if txt_count > 0:
+                parts.append(f"{txt_count} txt")
+
+            status_text = f"{', '.join(parts)} in {directory_name}"
+
+        self._status_label.setText(status_text)
+
     def selectFile(self, path: Path):
         """Select a specific file in the view"""
         index = self._model.getFileIndex(path)

{lazylabel_gui-1.3.3.dist-info → lazylabel_gui-1.3.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lazylabel-gui
-Version: 1.3.3
+Version: 1.3.5
 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