Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions PPOCRLabel.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,11 @@
import signal
import subprocess
import sys
import torch

from functools import partial
from PyQt5.QtWidgets import QShortcut
from PyQt5.QtGui import QKeySequence

import openpyxl
import cv2
Expand Down Expand Up @@ -1178,6 +1182,10 @@ def get_str(str_id):
)
self.displayIndexOption.setChecked(settings.get(SETTING_PAINT_INDEX, False))
self.autoSaveUnsavedChangesOption.triggered.connect(self.autoSaveFunc)

QShortcut(QKeySequence(Qt.Key_Tab), self, activated=lambda: self._navigateLabel(+1))
QShortcut(QKeySequence("Shift+Tab"), self, activated=lambda: self._navigateLabel(-1))
QShortcut(QKeySequence(Qt.Key_F2), self, activated=lambda: self.labelList.activate_edit() if self.currentItem() else None)

addActions(
self.menus.file,
Expand Down Expand Up @@ -1331,6 +1339,31 @@ def keyPressEvent(self, event):
if event.key() == Qt.Key_Control:
# Draw rectangle if Ctrl is pressed
self.canvas.setDrawingShapeToSquare(True)
elif event.key() == Qt.Key_Tab and not event.modifiers() & Qt.ShiftModifier:
self._navigateLabel(+1)
event.accept()
elif event.key() == Qt.Key_Tab and event.modifiers() & Qt.ShiftModifier:
self._navigateLabel(-1)
event.accept()
elif event.key() in (Qt.Key_F2, Qt.Key_Return, Qt.Key_Enter):
if self.currentItem() is not None:
self.labelList.activate_edit()
event.accept()

def _navigateLabel(self, direction):
count = self.labelList.count()
if count == 0:
return
current = self.labelList.currentRow()
if current < 0:
next_row = 0 if direction > 0 else count - 1
else:
next_row = (current + direction) % count
self.labelList.setCurrentRow(next_row)
self.labelList.scrollToItem(self.labelList.item(next_row))
self.labelSelectionChanged()
self.focusAndZoom() # ← Ctrl+G'nin yaptığı
self.labelList.activate_edit() # ← F2'nin yaptığı

def noShapes(self):
return not self.itemsToShapes
Expand Down
22 changes: 21 additions & 1 deletion libs/editinlist.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,28 @@ def mouseDoubleClickEvent(self, event):
def leaveEvent(self, event):
pass

def activate_edit(self):
"""Open persistent editor for the currently selected item (called by F2)."""
item = self.currentItem()
if item is None:
return
if self.edited_item is not None:
try:
self.closePersistentEditor(self.edited_item)
except Exception:
pass
self.edited_item = item
self.openPersistentEditor(item)
self.editItem(item)

def keyPressEvent(self, event) -> None:
# close edit
if event.key() in [16777220, 16777221]:
if event.key() in [16777220, 16777221]: # Enter / Return
for i in range(self.count()):
self.closePersistentEditor(self.item(i))
# bir sonraki satıra geç ve editörü aç
next_row = self.currentRow() + 1
if next_row < self.count():
self.setCurrentRow(next_row)
self.scrollToItem(self.item(next_row))
self.activate_edit()
Loading