pop up a key list dialog when finish a new shape
HinGwenWoong
parent
89c9abf669
commit
a85a009e13
|
|
@ -53,6 +53,8 @@ from libs.colorDialog import ColorDialog
|
|||
from libs.ustr import ustr
|
||||
from libs.hashableQListWidgetItem import HashableQListWidgetItem
|
||||
from libs.editinlist import EditInList
|
||||
from libs.unique_label_qlist_widget import UniqueLabelQListWidget
|
||||
from libs.keyDialog import KeyDialog
|
||||
|
||||
__appname__ = 'PPOCRLabel'
|
||||
|
||||
|
|
@ -63,7 +65,7 @@ class MainWindow(QMainWindow):
|
|||
def __init__(self,
|
||||
lang="ch",
|
||||
gpu=False,
|
||||
kei_mode=False,
|
||||
kie_mode=False,
|
||||
default_filename=None,
|
||||
default_predefined_class_file=None,
|
||||
default_save_dir=None):
|
||||
|
|
@ -77,7 +79,7 @@ class MainWindow(QMainWindow):
|
|||
self.settings.load()
|
||||
settings = self.settings
|
||||
self.lang = lang
|
||||
self.kie_mode = kei_mode
|
||||
self.kie_mode = kie_mode
|
||||
# Load string bundle for i18n
|
||||
if lang not in ['ch', 'en']:
|
||||
lang = 'en'
|
||||
|
|
@ -164,7 +166,7 @@ class MainWindow(QMainWindow):
|
|||
|
||||
# ================== Key List ==================
|
||||
if self.kie_mode:
|
||||
self.keyList = QListWidget()
|
||||
self.keyList = UniqueLabelQListWidget()
|
||||
|
||||
# self.keyList.itemActivated.connect(self.boxSelectionChanged)
|
||||
self.keyList.itemSelectionChanged.connect(self.keyListSelectionChanged)
|
||||
|
|
@ -422,6 +424,21 @@ class MainWindow(QMainWindow):
|
|||
self.MANUAL_ZOOM: lambda: 1,
|
||||
}
|
||||
|
||||
# ================== New Actions ==================
|
||||
# key list dialog
|
||||
if kie_mode:
|
||||
self.keyDialog = KeyDialog(
|
||||
parent=self,
|
||||
labels=None,
|
||||
sort_labels=True,
|
||||
show_text_field=True,
|
||||
completion="startswith",
|
||||
fit_to_content={'column': True, 'row': False},
|
||||
flags=None
|
||||
)
|
||||
else:
|
||||
self.keyDialog = None
|
||||
|
||||
edit = action(getStr('editLabel'), self.editLabel,
|
||||
'Ctrl+E', 'edit', getStr('editLabelDetail'),
|
||||
enabled=False)
|
||||
|
|
@ -1174,8 +1191,7 @@ class MainWindow(QMainWindow):
|
|||
position MUST be in global coordinates.
|
||||
"""
|
||||
if len(self.labelHist) > 0:
|
||||
self.labelDialog = LabelDialog(
|
||||
parent=self, listItem=self.labelHist)
|
||||
self.labelDialog = LabelDialog(parent=self, listItem=self.labelHist)
|
||||
|
||||
if value:
|
||||
text = self.labelDialog.popUp(text=self.prevLabelText)
|
||||
|
|
@ -1201,6 +1217,12 @@ class MainWindow(QMainWindow):
|
|||
# self.canvas.undoLastLine()
|
||||
self.canvas.resetAllLines()
|
||||
|
||||
if self.kie_mode:
|
||||
previous_text = self.keyDialog.edit.text()
|
||||
text, flags, group_id = self.keyDialog.popUp(text)
|
||||
if not text:
|
||||
self.keyDialog.edit.setText(previous_text)
|
||||
|
||||
def scrollRequest(self, delta, orientation):
|
||||
units = - delta / (8 * 15)
|
||||
bar = self.scrollBars[orientation]
|
||||
|
|
@ -1370,7 +1392,7 @@ class MainWindow(QMainWindow):
|
|||
select_indexes = self.fileListWidget.selectedIndexes()
|
||||
if len(select_indexes) > 0:
|
||||
self.fileDock.setWindowTitle(self.fileListName + f" ({select_indexes[0].row() + 1}"
|
||||
f"/{self.fileListWidget.count()})")
|
||||
f"/{self.fileListWidget.count()})")
|
||||
# update show counting
|
||||
self.BoxListDock.setWindowTitle(self.BoxListDockName + f" ({self.BoxList.count()})")
|
||||
self.labelListDock.setWindowTitle(self.labelListDockName + f" ({self.labelList.count()})")
|
||||
|
|
@ -2213,7 +2235,7 @@ def get_main_app(argv=[]):
|
|||
|
||||
win = MainWindow(lang=args.lang,
|
||||
gpu=args.gpu,
|
||||
kei_mode=args.kie,
|
||||
kie_mode=args.kie,
|
||||
default_predefined_class_file=args.predefined_classes_file)
|
||||
win.show()
|
||||
return app, win
|
||||
|
|
|
|||
|
|
@ -0,0 +1,232 @@
|
|||
import re
|
||||
import sys
|
||||
|
||||
from PyQt5 import QtCore
|
||||
from PyQt5 import QtGui
|
||||
from PyQt5 import QtWidgets
|
||||
|
||||
from libs.utils import newIcon, labelValidator
|
||||
|
||||
|
||||
QT5 = True
|
||||
|
||||
|
||||
# TODO(unknown):
|
||||
# - Calculate optimal position so as not to go out of screen area.
|
||||
|
||||
|
||||
class KeyQLineEdit(QtWidgets.QLineEdit):
|
||||
def setListWidget(self, list_widget):
|
||||
self.list_widget = list_widget
|
||||
|
||||
def keyPressEvent(self, e):
|
||||
if e.key() in [QtCore.Qt.Key_Up, QtCore.Qt.Key_Down]:
|
||||
self.list_widget.keyPressEvent(e)
|
||||
else:
|
||||
super(KeyQLineEdit, self).keyPressEvent(e)
|
||||
|
||||
|
||||
class KeyDialog(QtWidgets.QDialog):
|
||||
def __init__(
|
||||
self,
|
||||
text="Enter object label",
|
||||
parent=None,
|
||||
labels=None,
|
||||
sort_labels=True,
|
||||
show_text_field=True,
|
||||
completion="startswith",
|
||||
fit_to_content=None,
|
||||
flags=None,
|
||||
):
|
||||
if fit_to_content is None:
|
||||
fit_to_content = {"row": False, "column": True}
|
||||
self._fit_to_content = fit_to_content
|
||||
|
||||
super(KeyDialog, self).__init__(parent)
|
||||
self.edit = KeyQLineEdit()
|
||||
self.edit.setPlaceholderText(text)
|
||||
self.edit.setValidator(labelValidator())
|
||||
self.edit.editingFinished.connect(self.postProcess)
|
||||
if flags:
|
||||
self.edit.textChanged.connect(self.updateFlags)
|
||||
self.edit_group_id = QtWidgets.QLineEdit()
|
||||
self.edit_group_id.setPlaceholderText("Group ID")
|
||||
self.edit_group_id.setValidator(
|
||||
QtGui.QRegExpValidator(QtCore.QRegExp(r"\d*"), None)
|
||||
)
|
||||
layout = QtWidgets.QVBoxLayout()
|
||||
if show_text_field:
|
||||
layout_edit = QtWidgets.QHBoxLayout()
|
||||
layout_edit.addWidget(self.edit, 6)
|
||||
layout_edit.addWidget(self.edit_group_id, 2)
|
||||
layout.addLayout(layout_edit)
|
||||
# buttons
|
||||
self.buttonBox = bb = QtWidgets.QDialogButtonBox(
|
||||
QtWidgets.QDialogButtonBox.Ok | QtWidgets.QDialogButtonBox.Cancel,
|
||||
QtCore.Qt.Horizontal,
|
||||
self,
|
||||
)
|
||||
bb.button(bb.Ok).setIcon(newIcon("done"))
|
||||
bb.button(bb.Cancel).setIcon(newIcon("undo"))
|
||||
bb.accepted.connect(self.validate)
|
||||
bb.rejected.connect(self.reject)
|
||||
layout.addWidget(bb)
|
||||
# label_list
|
||||
self.labelList = QtWidgets.QListWidget()
|
||||
if self._fit_to_content["row"]:
|
||||
self.labelList.setHorizontalScrollBarPolicy(
|
||||
QtCore.Qt.ScrollBarAlwaysOff
|
||||
)
|
||||
if self._fit_to_content["column"]:
|
||||
self.labelList.setVerticalScrollBarPolicy(
|
||||
QtCore.Qt.ScrollBarAlwaysOff
|
||||
)
|
||||
self._sort_labels = sort_labels
|
||||
if labels:
|
||||
self.labelList.addItems(labels)
|
||||
if self._sort_labels:
|
||||
self.labelList.sortItems()
|
||||
else:
|
||||
self.labelList.setDragDropMode(
|
||||
QtWidgets.QAbstractItemView.InternalMove
|
||||
)
|
||||
self.labelList.currentItemChanged.connect(self.labelSelected)
|
||||
self.labelList.itemDoubleClicked.connect(self.labelDoubleClicked)
|
||||
self.edit.setListWidget(self.labelList)
|
||||
layout.addWidget(self.labelList)
|
||||
# label_flags
|
||||
if flags is None:
|
||||
flags = {}
|
||||
self._flags = flags
|
||||
self.flagsLayout = QtWidgets.QVBoxLayout()
|
||||
self.resetFlags()
|
||||
layout.addItem(self.flagsLayout)
|
||||
self.edit.textChanged.connect(self.updateFlags)
|
||||
self.setLayout(layout)
|
||||
# completion
|
||||
completer = QtWidgets.QCompleter()
|
||||
if not QT5 and completion != "startswith":
|
||||
completion = "startswith"
|
||||
if completion == "startswith":
|
||||
completer.setCompletionMode(QtWidgets.QCompleter.InlineCompletion)
|
||||
# Default settings.
|
||||
# completer.setFilterMode(QtCore.Qt.MatchStartsWith)
|
||||
elif completion == "contains":
|
||||
completer.setCompletionMode(QtWidgets.QCompleter.PopupCompletion)
|
||||
completer.setFilterMode(QtCore.Qt.MatchContains)
|
||||
else:
|
||||
raise ValueError("Unsupported completion: {}".format(completion))
|
||||
completer.setModel(self.labelList.model())
|
||||
self.edit.setCompleter(completer)
|
||||
|
||||
def addLabelHistory(self, label):
|
||||
if self.labelList.findItems(label, QtCore.Qt.MatchExactly):
|
||||
return
|
||||
self.labelList.addItem(label)
|
||||
if self._sort_labels:
|
||||
self.labelList.sortItems()
|
||||
|
||||
def labelSelected(self, item):
|
||||
self.edit.setText(item.text())
|
||||
|
||||
def validate(self):
|
||||
text = self.edit.text()
|
||||
if hasattr(text, "strip"):
|
||||
text = text.strip()
|
||||
else:
|
||||
text = text.trimmed()
|
||||
if text:
|
||||
self.accept()
|
||||
|
||||
def labelDoubleClicked(self, item):
|
||||
self.validate()
|
||||
|
||||
def postProcess(self):
|
||||
text = self.edit.text()
|
||||
if hasattr(text, "strip"):
|
||||
text = text.strip()
|
||||
else:
|
||||
text = text.trimmed()
|
||||
self.edit.setText(text)
|
||||
|
||||
def updateFlags(self, label_new):
|
||||
# keep state of shared flags
|
||||
flags_old = self.getFlags()
|
||||
|
||||
flags_new = {}
|
||||
for pattern, keys in self._flags.items():
|
||||
if re.match(pattern, label_new):
|
||||
for key in keys:
|
||||
flags_new[key] = flags_old.get(key, False)
|
||||
self.setFlags(flags_new)
|
||||
|
||||
def deleteFlags(self):
|
||||
for i in reversed(range(self.flagsLayout.count())):
|
||||
item = self.flagsLayout.itemAt(i).widget()
|
||||
self.flagsLayout.removeWidget(item)
|
||||
item.setParent(None)
|
||||
|
||||
def resetFlags(self, label=""):
|
||||
flags = {}
|
||||
for pattern, keys in self._flags.items():
|
||||
if re.match(pattern, label):
|
||||
for key in keys:
|
||||
flags[key] = False
|
||||
self.setFlags(flags)
|
||||
|
||||
def setFlags(self, flags):
|
||||
self.deleteFlags()
|
||||
for key in flags:
|
||||
item = QtWidgets.QCheckBox(key, self)
|
||||
item.setChecked(flags[key])
|
||||
self.flagsLayout.addWidget(item)
|
||||
item.show()
|
||||
|
||||
def getFlags(self):
|
||||
flags = {}
|
||||
for i in range(self.flagsLayout.count()):
|
||||
item = self.flagsLayout.itemAt(i).widget()
|
||||
flags[item.text()] = item.isChecked()
|
||||
return flags
|
||||
|
||||
def getGroupId(self):
|
||||
group_id = self.edit_group_id.text()
|
||||
if group_id:
|
||||
return int(group_id)
|
||||
return None
|
||||
|
||||
def popUp(self, text=None, move=True, flags=None, group_id=None):
|
||||
if self._fit_to_content["row"]:
|
||||
self.labelList.setMinimumHeight(
|
||||
self.labelList.sizeHintForRow(0) * self.labelList.count() + 2
|
||||
)
|
||||
if self._fit_to_content["column"]:
|
||||
self.labelList.setMinimumWidth(
|
||||
self.labelList.sizeHintForColumn(0) + 2
|
||||
)
|
||||
# if text is None, the previous label in self.edit is kept
|
||||
if text is None:
|
||||
text = self.edit.text()
|
||||
if flags:
|
||||
self.setFlags(flags)
|
||||
else:
|
||||
self.resetFlags(text)
|
||||
self.edit.setText(text)
|
||||
self.edit.setSelection(0, len(text))
|
||||
if group_id is None:
|
||||
self.edit_group_id.clear()
|
||||
else:
|
||||
self.edit_group_id.setText(str(group_id))
|
||||
items = self.labelList.findItems(text, QtCore.Qt.MatchFixedString)
|
||||
if items:
|
||||
if len(items) != 1:
|
||||
self.labelList.setCurrentItem(items[0])
|
||||
row = self.labelList.row(items[0])
|
||||
self.edit.completer().setCurrentRow(row)
|
||||
self.edit.setFocus(QtCore.Qt.PopupFocusReason)
|
||||
if move:
|
||||
self.move(QtGui.QCursor.pos())
|
||||
if self.exec_():
|
||||
return self.edit.text(), self.getFlags(), self.getGroupId()
|
||||
else:
|
||||
return None, None, None
|
||||
|
|
@ -0,0 +1,47 @@
|
|||
# -*- encoding: utf-8 -*-
|
||||
|
||||
from PyQt5.QtCore import Qt
|
||||
from PyQt5 import QtWidgets
|
||||
|
||||
|
||||
class EscapableQListWidget(QtWidgets.QListWidget):
|
||||
def keyPressEvent(self, event):
|
||||
super(EscapableQListWidget, self).keyPressEvent(event)
|
||||
if event.key() == Qt.Key_Escape:
|
||||
self.clearSelection()
|
||||
|
||||
|
||||
class UniqueLabelQListWidget(EscapableQListWidget):
|
||||
def mousePressEvent(self, event):
|
||||
super(UniqueLabelQListWidget, self).mousePressEvent(event)
|
||||
if not self.indexAt(event.pos()).isValid():
|
||||
self.clearSelection()
|
||||
|
||||
def findItemsByLabel(self, label):
|
||||
items = []
|
||||
for row in range(self.count()):
|
||||
item = self.item(row)
|
||||
if item.data(Qt.UserRole) == label:
|
||||
items.append(item)
|
||||
return items
|
||||
|
||||
def createItemFromLabel(self, label):
|
||||
item = QtWidgets.QListWidgetItem()
|
||||
item.setData(Qt.UserRole, label)
|
||||
return item
|
||||
|
||||
def setItemLabel(self, item, label, color=None):
|
||||
qlabel = QtWidgets.QLabel()
|
||||
if color is None:
|
||||
qlabel.setText("{}".format(label))
|
||||
else:
|
||||
qlabel.setText(
|
||||
'{} <font color="#{:02x}{:02x}{:02x}">●</font>'.format(
|
||||
label, *color
|
||||
)
|
||||
)
|
||||
qlabel.setAlignment(Qt.AlignBottom)
|
||||
|
||||
item.setSizeHint(qlabel.sizeHint())
|
||||
|
||||
self.setItemWidget(item, qlabel)
|
||||
Loading…
Reference in New Issue