diff --git a/PPOCRLabel/PPOCRLabel.py b/PPOCRLabel/PPOCRLabel.py index 3ee5eb60450be0c806316f70dea9b8d4c5f31503..517714104d1cb62f3b0c03c34843595d85502417 100644 --- a/PPOCRLabel/PPOCRLabel.py +++ b/PPOCRLabel/PPOCRLabel.py @@ -11,64 +11,45 @@ # CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -#!/usr/bin/env python +# !/usr/bin/env python # -*- coding: utf-8 -*- # pyrcc5 -o libs/resources.py resources.qrc import argparse import ast import codecs +import json import os.path import platform import subprocess import sys from functools import partial -from collections import defaultdict -import json -import cv2 - +try: + from PyQt5 import QtCore, QtGui, QtWidgets + from PyQt5.QtGui import * + from PyQt5.QtCore import * + from PyQt5.QtWidgets import * +except ImportError: + print("Please install pyqt5...") __dir__ = os.path.dirname(os.path.abspath(__file__)) -import numpy as np - - sys.path.append(__dir__) sys.path.append(os.path.abspath(os.path.join(__dir__, '../..'))) sys.path.append(os.path.abspath(os.path.join(__dir__, '../PaddleOCR'))) sys.path.append("..") from paddleocr import PaddleOCR - -try: - from PyQt5 import QtCore, QtGui, QtWidgets - from PyQt5.QtGui import * - from PyQt5.QtCore import * - from PyQt5.QtWidgets import * -except ImportError: - # needed for py3+qt4 - # Ref: - # http://pyqt.sourceforge.net/Docs/PyQt4/incompatible_apis.html - # http://stackoverflow.com/questions/21217399/pyqt4-qtcore-qvariant-object-instead-of-a-string - if sys.version_info.major >= 3: - import sip - - sip.setapi('QVariant', 2) - from PyQt4.QtGui import * - from PyQt4.QtCore import * - -from combobox import ComboBox from libs.constants import * from libs.utils import * from libs.settings import Settings -from libs.shape import Shape, DEFAULT_LINE_COLOR, DEFAULT_FILL_COLOR,DEFAULT_LOCK_COLOR +from libs.shape import Shape, DEFAULT_LINE_COLOR, DEFAULT_FILL_COLOR, DEFAULT_LOCK_COLOR from libs.stringBundle import StringBundle from libs.canvas import Canvas from libs.zoomWidget import ZoomWidget from libs.autoDialog import AutoDialog from libs.labelDialog import LabelDialog from libs.colorDialog import ColorDialog -from libs.toolBar import ToolBar from libs.ustr import ustr from libs.hashableQListWidgetItem import HashableQListWidgetItem from libs.editinlist import EditInList @@ -76,29 +57,15 @@ from libs.editinlist import EditInList __appname__ = 'PPOCRLabel' -class WindowMixin(object): - - def menu(self, title, actions=None): - menu = self.menuBar().addMenu(title) - if actions: - addActions(menu, actions) - return menu - - def toolbar(self, title, actions=None): - toolbar = ToolBar(title) - toolbar.setObjectName(u'%sToolBar' % title) - # toolbar.setOrientation(Qt.Vertical) - toolbar.setToolButtonStyle(Qt.ToolButtonTextUnderIcon) - if actions: - addActions(toolbar, actions) - self.addToolBar(Qt.LeftToolBarArea, toolbar) - return toolbar - - -class MainWindow(QMainWindow, WindowMixin): +class MainWindow(QMainWindow): FIT_WINDOW, FIT_WIDTH, MANUAL_ZOOM = list(range(3)) - def __init__(self, lang="ch", gpu=False, defaultFilename=None, defaultPrefdefClassFile=None, defaultSaveDir=None): + def __init__(self, + lang="ch", + gpu=False, + default_filename=None, + default_predefined_class_file=None, + default_save_dir=None): super(MainWindow, self).__init__() self.setWindowTitle(__appname__) self.setWindowState(Qt.WindowMaximized) # set window max @@ -112,11 +79,17 @@ class MainWindow(QMainWindow, WindowMixin): # Load string bundle for i18n if lang not in ['ch', 'en']: lang = 'en' - self.stringBundle = StringBundle.getBundle(localeStr='zh-CN' if lang=='ch' else 'en') # 'en' + self.stringBundle = StringBundle.getBundle(localeStr='zh-CN' if lang == 'ch' else 'en') # 'en' getStr = lambda strId: self.stringBundle.getString(strId) - self.defaultSaveDir = defaultSaveDir - self.ocr = PaddleOCR(use_pdserving=False, use_angle_cls=True, det=True, cls=True, use_gpu=gpu, lang=lang, show_log=False) + self.defaultSaveDir = default_save_dir + self.ocr = PaddleOCR(use_pdserving=False, + use_angle_cls=True, + det=True, + cls=True, + use_gpu=gpu, + lang=lang, + show_log=False) if os.path.exists('./data/paddle.png'): result = self.ocr.ocr('./data/paddle.png', cls=True, det=True) @@ -134,7 +107,6 @@ class MainWindow(QMainWindow, WindowMixin): self.labelFile = None self.currIndex = 0 - # Whether we need to save or not. self.dirty = False @@ -144,7 +116,7 @@ class MainWindow(QMainWindow, WindowMixin): self.screencast = "https://github.com/PaddlePaddle/PaddleOCR" # Load predefined classes to the list - self.loadPredefinedClasses(defaultPrefdefClassFile) + self.loadPredefinedClasses(default_predefined_class_file) # Main widgets and related state. self.labelDialog = LabelDialog(parent=self, listItem=self.labelHist) @@ -160,7 +132,7 @@ class MainWindow(QMainWindow, WindowMixin): self.PPreader = None self.autoSaveNum = 5 - ################# file list ############### + # ================== File List ================== self.fileListWidget = QListWidget() self.fileListWidget.itemClicked.connect(self.fileitemDoubleClicked) self.fileListWidget.setIconSize(QSize(25, 25)) @@ -181,12 +153,12 @@ class MainWindow(QMainWindow, WindowMixin): fileListContainer = QWidget() fileListContainer.setLayout(filelistLayout) self.fileListName = getStr('fileList') - self.filedock = QDockWidget(self.fileListName, self) - self.filedock.setObjectName(getStr('files')) - self.filedock.setWidget(fileListContainer) - self.addDockWidget(Qt.LeftDockWidgetArea, self.filedock) + self.fileDock = QDockWidget(self.fileListName, self) + self.fileDock.setObjectName(getStr('files')) + self.fileDock.setWidget(fileListContainer) + self.addDockWidget(Qt.LeftDockWidgetArea, self.fileDock) - ######## Right area ########## + # ================== Right Area ================== listLayout = QVBoxLayout() listLayout.setContentsMargins(0, 0, 0, 0) @@ -202,7 +174,6 @@ class MainWindow(QMainWindow, WindowMixin): self.DelButton = QToolButton() self.DelButton.setToolButtonStyle(Qt.ToolButtonTextBesideIcon) - lefttoptoolbox = QHBoxLayout() lefttoptoolbox.addWidget(self.newButton) lefttoptoolbox.addWidget(self.reRecogButton) @@ -210,36 +181,37 @@ class MainWindow(QMainWindow, WindowMixin): lefttoptoolboxcontainer.setLayout(lefttoptoolbox) listLayout.addWidget(lefttoptoolboxcontainer) - - ################## label list #################### + # ================== Label List ================== # Create and add a widget for showing current label items self.labelList = EditInList() labelListContainer = QWidget() labelListContainer.setLayout(listLayout) - #self.labelList.itemActivated.connect(self.labelSelectionChanged) self.labelList.itemSelectionChanged.connect(self.labelSelectionChanged) self.labelList.clicked.connect(self.labelList.item_clicked) + # Connect to itemChanged to detect checkbox changes. self.labelList.itemChanged.connect(self.labelItemChanged) - self.labelListDock = QDockWidget(getStr('recognitionResult'),self) + self.labelListDockName = getStr('recognitionResult') + self.labelListDock = QDockWidget(self.labelListDockName, self) self.labelListDock.setWidget(self.labelList) self.labelListDock.setFeatures(QDockWidget.NoDockWidgetFeatures) listLayout.addWidget(self.labelListDock) - ################## detection box #################### + # ================== Detection Box ================== self.BoxList = QListWidget() - #self.BoxList.itemActivated.connect(self.boxSelectionChanged) + # self.BoxList.itemActivated.connect(self.boxSelectionChanged) self.BoxList.itemSelectionChanged.connect(self.boxSelectionChanged) self.BoxList.itemDoubleClicked.connect(self.editBox) # Connect to itemChanged to detect checkbox changes. self.BoxList.itemChanged.connect(self.boxItemChanged) - self.BoxListDock = QDockWidget(getStr('detectionBoxposition'), self) + self.BoxListDockName = getStr('detectionBoxposition') + self.BoxListDock = QDockWidget(self.BoxListDockName, self) self.BoxListDock.setWidget(self.BoxList) self.BoxListDock.setFeatures(QDockWidget.NoDockWidgetFeatures) listLayout.addWidget(self.BoxListDock) - ############ lower right area ############ + # ================== Lower Right Area ================== leftbtmtoolbox = QHBoxLayout() leftbtmtoolbox.addWidget(self.SaveButton) leftbtmtoolbox.addWidget(self.DelButton) @@ -251,26 +223,26 @@ class MainWindow(QMainWindow, WindowMixin): self.dock.setObjectName(getStr('labels')) self.dock.setWidget(labelListContainer) + # ================== Zoom Bar ================== + self.imageSlider = QSlider(Qt.Horizontal) + self.imageSlider.valueChanged.connect(self.CanvasSizeChange) + self.imageSlider.setMinimum(-9) + self.imageSlider.setMaximum(510) + self.imageSlider.setSingleStep(1) + self.imageSlider.setTickPosition(QSlider.TicksBelow) + self.imageSlider.setTickInterval(1) - ########## zoom bar ######### - self.imgsplider = QSlider(Qt.Horizontal) - self.imgsplider.valueChanged.connect(self.CanvasSizeChange) - self.imgsplider.setMinimum(-150) - self.imgsplider.setMaximum(150) - self.imgsplider.setSingleStep(1) - self.imgsplider.setTickPosition(QSlider.TicksBelow) - self.imgsplider.setTickInterval(1) op = QGraphicsOpacityEffect() op.setOpacity(0.2) - self.imgsplider.setGraphicsEffect(op) - # self.imgsplider.setAttribute(Qt.WA_TranslucentBackground) - self.imgsplider.setStyleSheet("background-color:transparent") - self.imgsliderDock = QDockWidget(getStr('ImageResize'), self) - self.imgsliderDock.setObjectName(getStr('IR')) - self.imgsliderDock.setWidget(self.imgsplider) - self.imgsliderDock.setFeatures(QDockWidget.DockWidgetFloatable) - self.imgsliderDock.setAttribute(Qt.WA_TranslucentBackground) - self.addDockWidget(Qt.RightDockWidgetArea, self.imgsliderDock) + self.imageSlider.setGraphicsEffect(op) + + self.imageSlider.setStyleSheet("background-color:transparent") + self.imageSliderDock = QDockWidget(getStr('ImageResize'), self) + self.imageSliderDock.setObjectName(getStr('IR')) + self.imageSliderDock.setWidget(self.imageSlider) + self.imageSliderDock.setFeatures(QDockWidget.DockWidgetFloatable) + self.imageSliderDock.setAttribute(Qt.WA_TranslucentBackground) + self.addDockWidget(Qt.RightDockWidgetArea, self.imageSliderDock) self.zoomWidget = ZoomWidget() self.colorDialog = ColorDialog(parent=self) @@ -278,13 +250,13 @@ class MainWindow(QMainWindow, WindowMixin): self.msgBox = QMessageBox() - ########## thumbnail ######### + # ================== Thumbnail ================== hlayout = QHBoxLayout() m = (0, 0, 0, 0) hlayout.setSpacing(0) hlayout.setContentsMargins(*m) self.preButton = QToolButton() - self.preButton.setIcon(newIcon("prev",40)) + self.preButton.setIcon(newIcon("prev", 40)) self.preButton.setIconSize(QSize(40, 100)) self.preButton.clicked.connect(self.openPrevImg) self.preButton.setStyleSheet('border: none;') @@ -294,10 +266,10 @@ class MainWindow(QMainWindow, WindowMixin): self.iconlist.setFlow(QListView.TopToBottom) self.iconlist.setSpacing(10) self.iconlist.setIconSize(QSize(50, 50)) - self.iconlist.setMovement(False) + self.iconlist.setMovement(QListView.Static) self.iconlist.setResizeMode(QListView.Adjust) self.iconlist.itemClicked.connect(self.iconitemDoubleClicked) - self.iconlist.setStyleSheet("background-color:transparent; border: none;") + self.iconlist.setStyleSheet("QListWidget{ background-color:transparent; border: none;}") self.iconlist.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff) self.nextButton = QToolButton() self.nextButton.setIcon(newIcon("next", 40)) @@ -310,12 +282,11 @@ class MainWindow(QMainWindow, WindowMixin): hlayout.addWidget(self.iconlist) hlayout.addWidget(self.nextButton) - iconListContainer = QWidget() iconListContainer.setLayout(hlayout) iconListContainer.setFixedHeight(100) - ########### Canvas ########### + # ================== Canvas ================== self.canvas = Canvas(parent=self) self.canvas.zoomRequest.connect(self.zoomRequest) self.canvas.setDrawingShapeToSquare(settings.get(SETTING_DRAW_SQUARE, False)) @@ -338,32 +309,17 @@ class MainWindow(QMainWindow, WindowMixin): centerLayout = QVBoxLayout() centerLayout.setContentsMargins(0, 0, 0, 0) centerLayout.addWidget(scroll) - #centerLayout.addWidget(self.icondock) - centerLayout.addWidget(iconListContainer,0,Qt.AlignCenter) - centercontainer = QWidget() - centercontainer.setLayout(centerLayout) - - # self.scrolldock = QDockWidget('WorkSpace',self) - # self.scrolldock.setObjectName('WorkSpace') - # self.scrolldock.setWidget(centercontainer) - # self.scrolldock.setFeatures(QDockWidget.NoDockWidgetFeatures) - # orititle = self.scrolldock.titleBarWidget() - # tmpwidget = QWidget() - # self.scrolldock.setTitleBarWidget(tmpwidget) - # del orititle - self.setCentralWidget(centercontainer) #self.scrolldock - self.addDockWidget(Qt.RightDockWidgetArea, self.dock) - - - # self.filedock.setFeatures(QDockWidget.DockWidgetFloatable) - self.filedock.setFeatures(self.filedock.features() ^ QDockWidget.DockWidgetFloatable) + centerLayout.addWidget(iconListContainer, 0, Qt.AlignCenter) + centerContainer = QWidget() + centerContainer.setLayout(centerLayout) - self.dockFeatures = QDockWidget.DockWidgetClosable | QDockWidget.DockWidgetFloatable - self.dock.setFeatures(self.dock.features() ^ self.dockFeatures) + self.setCentralWidget(centerContainer) + self.addDockWidget(Qt.RightDockWidgetArea, self.dock) - self.filedock.setFeatures(QDockWidget.NoDockWidgetFeatures) + self.dock.setFeatures(QDockWidget.DockWidgetClosable | QDockWidget.DockWidgetFloatable) + self.fileDock.setFeatures(QDockWidget.NoDockWidgetFeatures) - ###### Actions ####### + # ================== Actions ================== action = partial(newAction, self) quit = action(getStr('quit'), self.close, 'Ctrl+Q', 'quit', getStr('quitApp')) @@ -372,13 +328,13 @@ class MainWindow(QMainWindow, WindowMixin): 'Ctrl+u', 'open', getStr('openDir')) open_dataset_dir = action(getStr('openDatasetDir'), self.openDatasetDirDialog, - 'Ctrl+p', 'open', getStr('openDatasetDir'), enabled=False) + 'Ctrl+p', 'open', getStr('openDatasetDir'), enabled=False) save = action(getStr('save'), self.saveFile, 'Ctrl+V', 'verify', getStr('saveDetail'), enabled=False) alcm = action(getStr('choosemodel'), self.autolcm, - 'Ctrl+M', 'next', getStr('tipchoosemodel')) + 'Ctrl+M', 'next', getStr('tipchoosemodel')) deleteImg = action(getStr('deleteImg'), self.deleteImg, 'Ctrl+Shift+D', 'close', getStr('deleteImgDetail'), enabled=True) @@ -398,7 +354,7 @@ class MainWindow(QMainWindow, WindowMixin): delete = action(getStr('delBox'), self.deleteSelectedShape, 'Alt+X', 'delete', getStr('delBoxDetail'), enabled=False) - + copy = action(getStr('dupBox'), self.copySelectedShape, 'Ctrl+C', 'copy', getStr('dupBoxDetail'), enabled=False) @@ -409,7 +365,6 @@ class MainWindow(QMainWindow, WindowMixin): showAll = action(getStr('showBox'), partial(self.togglePolygons, True), 'Ctrl+A', 'hide', getStr('showAllBoxDetail'), enabled=False) - help = action(getStr('tutorial'), self.showTutorialDialog, None, 'help', getStr('tutorialDetail')) showInfo = action(getStr('info'), self.showInfoDialog, None, 'help', getStr('info')) @@ -451,12 +406,12 @@ class MainWindow(QMainWindow, WindowMixin): 'Ctrl+E', 'edit', getStr('editLabelDetail'), enabled=False) - ######## New actions ####### + # ================== New Actions ================== AutoRec = action(getStr('autoRecognition'), self.autoRecognition, - '', 'Auto', getStr('autoRecognition'), enabled=False) + '', 'Auto', getStr('autoRecognition'), enabled=False) reRec = action(getStr('reRecognition'), self.reRecognition, - 'Ctrl+Shift+R', 'reRec', getStr('reRecognition'), enabled=False) + 'Ctrl+Shift+R', 'reRec', getStr('reRecognition'), enabled=False) singleRere = action(getStr('singleRe'), self.singleRerecognition, 'Ctrl+R', 'reRec', getStr('singleRe'), enabled=False) @@ -465,23 +420,23 @@ class MainWindow(QMainWindow, WindowMixin): 'q', 'new', getStr('creatPolygon'), enabled=True) saveRec = action(getStr('saveRec'), self.saveRecResult, - '', 'save', getStr('saveRec'), enabled=False) + '', 'save', getStr('saveRec'), enabled=False) - saveLabel = action(getStr('saveLabel'), self.saveLabelFile, # - 'Ctrl+S', 'save', getStr('saveLabel'), enabled=False) + saveLabel = action(getStr('saveLabel'), self.saveLabelFile, # + 'Ctrl+S', 'save', getStr('saveLabel'), enabled=False) undoLastPoint = action(getStr("undoLastPoint"), self.canvas.undoLastPoint, 'Ctrl+Z', "undo", getStr("undoLastPoint"), enabled=False) - rotateLeft = action(getStr("rotateLeft"), partial(self.rotateImgAction,1), - 'Ctrl+Alt+L', "rotateLeft", getStr("rotateLeft"), enabled=False) + rotateLeft = action(getStr("rotateLeft"), partial(self.rotateImgAction, 1), + 'Ctrl+Alt+L', "rotateLeft", getStr("rotateLeft"), enabled=False) - rotateRight = action(getStr("rotateRight"), partial(self.rotateImgAction,-1), - 'Ctrl+Alt+R', "rotateRight", getStr("rotateRight"), enabled=False) + rotateRight = action(getStr("rotateRight"), partial(self.rotateImgAction, -1), + 'Ctrl+Alt+R', "rotateRight", getStr("rotateRight"), enabled=False) undo = action(getStr("undo"), self.undoShapeEdit, 'Ctrl+Z', "undo", getStr("undo"), enabled=False) - + lock = action(getStr("lockBox"), self.lockSelectedShape, None, "lock", getStr("lockBoxDetail"), enabled=False) @@ -495,7 +450,7 @@ class MainWindow(QMainWindow, WindowMixin): # self.preButton.setDefaultAction(openPrevImg) # self.nextButton.setDefaultAction(openNextImg) - ############# Zoom layout ############## + # ================== Zoom layout ================== zoomLayout = QHBoxLayout() zoomLayout.addStretch() self.zoominButton = QToolButton() @@ -522,7 +477,6 @@ class MainWindow(QMainWindow, WindowMixin): icon='color', tip=getStr('shapeFillColorDetail'), enabled=False) - # Label list context menu. labelMenu = QMenu() addActions(labelMenu, (edit, delete)) @@ -538,39 +492,36 @@ class MainWindow(QMainWindow, WindowMixin): self.drawSquaresOption.triggered.connect(self.toogleDrawSquare) # Store actions for further handling. - self.actions = struct(save=save, resetAll=resetAll, deleteImg=deleteImg, + self.actions = struct(save=save, resetAll=resetAll, deleteImg=deleteImg, lineColor=color1, create=create, delete=delete, edit=edit, copy=copy, - saveRec=saveRec, singleRere=singleRere,AutoRec=AutoRec,reRec=reRec, + saveRec=saveRec, singleRere=singleRere, AutoRec=AutoRec, reRec=reRec, createMode=createMode, editMode=editMode, shapeLineColor=shapeLineColor, shapeFillColor=shapeFillColor, zoom=zoom, zoomIn=zoomIn, zoomOut=zoomOut, zoomOrg=zoomOrg, fitWindow=fitWindow, fitWidth=fitWidth, zoomActions=zoomActions, saveLabel=saveLabel, - undo=undo, undoLastPoint=undoLastPoint,open_dataset_dir=open_dataset_dir, - rotateLeft=rotateLeft,rotateRight=rotateRight,lock=lock, - fileMenuActions=( - opendir, open_dataset_dir, saveLabel, resetAll, quit), + undo=undo, undoLastPoint=undoLastPoint, open_dataset_dir=open_dataset_dir, + rotateLeft=rotateLeft, rotateRight=rotateRight, lock=lock, + fileMenuActions=(opendir, open_dataset_dir, saveLabel, resetAll, quit), beginner=(), advanced=(), - editMenu=(createpoly, edit, copy, delete,singleRere,None, undo, undoLastPoint, - None, rotateLeft, rotateRight, None, color1, self.drawSquaresOption,lock), - beginnerContext=(create, edit, copy, delete, singleRere, rotateLeft, rotateRight,lock), + editMenu=(createpoly, edit, copy, delete, singleRere, None, undo, undoLastPoint, + None, rotateLeft, rotateRight, None, color1, self.drawSquaresOption, lock), + beginnerContext=(create, edit, copy, delete, singleRere, rotateLeft, rotateRight, lock), advancedContext=(createMode, editMode, edit, copy, delete, shapeLineColor, shapeFillColor), - onLoadActive=( - create, createMode, editMode), + onLoadActive=(create, createMode, editMode), onShapesPresent=(hideAll, showAll)) # menus self.menus = struct( - file=self.menu('&'+getStr('mfile')), - edit=self.menu('&'+getStr('medit')), - view=self.menu('&'+getStr('mview')), + file=self.menu('&' + getStr('mfile')), + edit=self.menu('&' + getStr('medit')), + view=self.menu('&' + getStr('mview')), autolabel=self.menu('&PaddleOCR'), - help=self.menu('&'+getStr('mhelp')), + help=self.menu('&' + getStr('mhelp')), recentFiles=QMenu('Open &Recent'), labelList=labelMenu) - self.lastLabel = None # Add option to enable/disable labels being displayed at the top of bounding boxes self.displayLabelOption = QAction(getStr('displayLabel'), self) @@ -591,33 +542,30 @@ class MainWindow(QMainWindow, WindowMixin): self.autoSaveOption.triggered.connect(self.autoSaveFunc) addActions(self.menus.file, - (opendir, open_dataset_dir, None, saveLabel, saveRec, self.autoSaveOption, None, resetAll, deleteImg, quit)) + (opendir, open_dataset_dir, None, saveLabel, saveRec, self.autoSaveOption, None, resetAll, deleteImg, + quit)) - addActions(self.menus.help, (showKeys,showSteps, showInfo)) + addActions(self.menus.help, (showKeys, showSteps, showInfo)) addActions(self.menus.view, ( self.displayLabelOption, self.labelDialogOption, - None, + None, hideAll, showAll, None, zoomIn, zoomOut, zoomOrg, None, fitWindow, fitWidth)) - addActions(self.menus.autolabel, (AutoRec, reRec, alcm, None, help)) # + addActions(self.menus.autolabel, (AutoRec, reRec, alcm, None, help)) self.menus.file.aboutToShow.connect(self.updateFileMenu) # Custom context menu for the canvas widget: addActions(self.canvas.menus[0], self.actions.beginnerContext) - #addActions(self.canvas.menus[1], ( - # action('&Copy here', self.copyShape), - # action('&Move here', self.moveShape))) - self.statusBar().showMessage('%s started.' % __appname__) self.statusBar().show() # Application state. self.image = QImage() - self.filePath = ustr(defaultFilename) + self.filePath = ustr(default_filename) self.lastOpenDir = None self.recentFiles = [] self.maxRecent = 7 @@ -628,7 +576,7 @@ class MainWindow(QMainWindow, WindowMixin): # Add Chris self.difficult = False - ## Fix the compatible issue for qt4 and qt5. Convert the QStringList to python list + # Fix the compatible issue for qt4 and qt5. Convert the QStringList to python list if settings.get(SETTING_RECENT_FILES): if have_qstring(): recentFileQStringList = settings.get(SETTING_RECENT_FILES) @@ -657,7 +605,6 @@ class MainWindow(QMainWindow, WindowMixin): # Add chris Shape.difficult = self.difficult - # ADD: # Populate the File menu dynamically. self.updateFileMenu() @@ -681,6 +628,12 @@ class MainWindow(QMainWindow, WindowMixin): if self.filePath and os.path.isdir(self.filePath): self.openDirDialog(dirpath=self.filePath, silent=True) + def menu(self, title, actions=None): + menu = self.menuBar().addMenu(title) + if actions: + addActions(menu, actions) + return menu + def keyReleaseEvent(self, event): if event.key() == Qt.Key_Control: self.canvas.setDrawingShapeToSquare(False) @@ -690,11 +643,9 @@ class MainWindow(QMainWindow, WindowMixin): # Draw rectangle if Ctrl is pressed self.canvas.setDrawingShapeToSquare(True) - def noShapes(self): return not self.itemsToShapes - def populateModeActions(self): self.canvas.menus[0].clear() addActions(self.canvas.menus[0], self.actions.beginnerContext) @@ -702,7 +653,6 @@ class MainWindow(QMainWindow, WindowMixin): actions = (self.actions.create,) # if self.beginner() else (self.actions.createMode, self.actions.editMode) addActions(self.menus.edit, actions + self.actions.editMenu) - def setDirty(self): self.dirty = True self.actions.save.setEnabled(True) @@ -816,10 +766,11 @@ class MainWindow(QMainWindow, WindowMixin): def rotateImgWarn(self): if self.lang == 'ch': - self.msgBox.warning (self, "提示", "\n 该图片已经有标注框,旋转操作会打乱标注,建议清除标注框后旋转。") + self.msgBox.warning(self, "提示", "\n 该图片已经有标注框,旋转操作会打乱标注,建议清除标注框后旋转。") else: - self.msgBox.warning (self, "Warn", "\n The picture already has a label box, and rotation will disrupt the label.\ - It is recommended to clear the label box and rotate it.") + self.msgBox.warning(self, "Warn", "\n The picture already has a label box, " + "and rotation will disrupt the label. " + "It is recommended to clear the label box and rotate it.") def rotateImgAction(self, k=1, _value=False): @@ -894,14 +845,13 @@ class MainWindow(QMainWindow, WindowMixin): self.setDirty() self.updateComboBox() - ######## detection box related functions ####### - + # =================== detection box related functions =================== def boxItemChanged(self, item): shape = self.itemsToShapesbox[item] box = ast.literal_eval(item.text()) # print('shape in labelItemChanged is',shape.points) - if box != [(p.x(), p.y()) for p in shape.points]: + if box != [(int(p.x()), int(p.y())) for p in shape.points]: # shape.points = box shape.points = [QPointF(p[0], p[1]) for p in box] @@ -909,7 +859,7 @@ class MainWindow(QMainWindow, WindowMixin): # shape.line_color = generateColorByText(shape.label) self.setDirty() else: # User probably changed item visibility - self.canvas.setShapeVisible(shape, True)#item.checkState() == Qt.Checked + self.canvas.setShapeVisible(shape, True) # item.checkState() == Qt.Checked def editBox(self): # ADD if not self.canvas.editing(): @@ -959,11 +909,10 @@ class MainWindow(QMainWindow, WindowMixin): def indexTo5Files(self, currIndex): if currIndex < 2: return self.mImgList[:5] - elif currIndex > len(self.mImgList)-3: + elif currIndex > len(self.mImgList) - 3: return self.mImgList[-5:] else: - return self.mImgList[currIndex - 2 : currIndex + 3] - + return self.mImgList[currIndex - 2: currIndex + 3] # Tzutalin 20160906 : Add file list and dock to move faster def fileitemDoubleClicked(self, item=None): @@ -983,9 +932,8 @@ class MainWindow(QMainWindow, WindowMixin): self.loadFile(filename) def CanvasSizeChange(self): - if len(self.mImgList) > 0: - self.zoomWidget.setValue(self.zoomWidgetValue + self.imgsplider.value()) - + if len(self.mImgList) > 0 and self.imageSlider.hasFocus(): + self.zoomWidget.setValue(self.imageSlider.value()) def shapeSelectionChanged(self, selected_shapes): self._noSelectionSlot = True @@ -998,7 +946,7 @@ class MainWindow(QMainWindow, WindowMixin): self.shapesToItems[shape].setSelected(True) self.shapesToItemsbox[shape].setSelected(True) - self.labelList.scrollToItem(self.currentItem()) # QAbstractItemView.EnsureVisible + self.labelList.scrollToItem(self.currentItem()) # QAbstractItemView.EnsureVisible self.BoxList.scrollToItem(self.currentBox()) self._noSelectionSlot = False @@ -1030,6 +978,10 @@ class MainWindow(QMainWindow, WindowMixin): action.setEnabled(True) self.updateComboBox() + # update show counting + self.BoxListDock.setWindowTitle(self.BoxListDockName + f" ({self.BoxList.count()})") + self.labelListDock.setWindowTitle(self.labelListDockName + f" ({self.labelList.count()})") + def remLabels(self, shapes): if shapes is None: # print('rm empty label') @@ -1051,7 +1003,7 @@ class MainWindow(QMainWindow, WindowMixin): def loadLabels(self, shapes): s = [] for label, points, line_color, fill_color, difficult in shapes: - shape = Shape(label=label,line_color=line_color) + shape = Shape(label=label, line_color=line_color) for x, y in points: # Ensure the labels are within the bounds of the image. If not, fix them. @@ -1061,7 +1013,7 @@ class MainWindow(QMainWindow, WindowMixin): shape.addPoint(QPointF(x, y)) shape.difficult = difficult - #shape.locked = False + # shape.locked = False shape.close() s.append(shape) @@ -1074,12 +1026,11 @@ class MainWindow(QMainWindow, WindowMixin): # shape.fill_color = QColor(*fill_color) # else: # shape.fill_color = generateColorByText(label) - + self.addLabel(shape) - + self.updateComboBox() self.canvas.loadShapes(s) - def singleLabel(self, shape): if shape is None: @@ -1115,13 +1066,13 @@ class MainWindow(QMainWindow, WindowMixin): line_color=s.line_color.getRgb(), fill_color=s.fill_color.getRgb(), points=[(int(p.x()), int(p.y())) for p in s.points], # QPonitF - # add chris + # add chris difficult=s.difficult) # bool shapes = [] if mode == 'Auto' else \ [format_shape(shape) for shape in self.canvas.shapes if shape.line_color != DEFAULT_LOCK_COLOR] # Can add differrent annotation formats here - for box in self.result_dic : + for box in self.result_dic: trans_dic = {"label": box[1][0], "points": box[0], 'difficult': False} if trans_dic["label"] == "" and mode == 'Auto': continue @@ -1130,7 +1081,8 @@ class MainWindow(QMainWindow, WindowMixin): try: trans_dic = [] for box in shapes: - trans_dic.append({"transcription": box['label'], "points": box['points'], 'difficult': box['difficult']}) + trans_dic.append( + {"transcription": box['label'], "points": box['points'], 'difficult': box['difficult']}) self.PPlabel[annotationFilePath] = trans_dic if mode == 'Auto': self.Cachelabel[annotationFilePath] = trans_dic @@ -1148,8 +1100,7 @@ class MainWindow(QMainWindow, WindowMixin): for shape in self.canvas.copySelectedShape(): self.addLabel(shape) # fix copy and delete - #self.shapeSelectionChanged(True) - + # self.shapeSelectionChanged(True) def labelSelectionChanged(self): if self._noSelectionSlot: @@ -1163,10 +1114,9 @@ class MainWindow(QMainWindow, WindowMixin): else: self.canvas.deSelectShape() - def boxSelectionChanged(self): if self._noSelectionSlot: - #self.BoxList.scrollToItem(self.currentBox(), QAbstractItemView.PositionAtCenter) + # self.BoxList.scrollToItem(self.currentBox(), QAbstractItemView.PositionAtCenter) return if self.canvas.editing(): selected_shapes = [] @@ -1177,7 +1127,6 @@ class MainWindow(QMainWindow, WindowMixin): else: self.canvas.deSelectShape() - def labelItemChanged(self, item): shape = self.itemsToShapes[item] label = item.text() @@ -1185,7 +1134,7 @@ class MainWindow(QMainWindow, WindowMixin): shape.label = item.text() # shape.line_color = generateColorByText(shape.label) self.setDirty() - elif not ((item.checkState()== Qt.Unchecked) ^ (not shape.difficult)): + elif not ((item.checkState() == Qt.Unchecked) ^ (not shape.difficult)): shape.difficult = True if item.checkState() == Qt.Unchecked else False self.setDirty() else: # User probably changed item visibility @@ -1211,7 +1160,7 @@ class MainWindow(QMainWindow, WindowMixin): if text is not None: self.prevLabelText = self.stringBundle.getString('tempLabel') # generate_color = generateColorByText(text) - shape = self.canvas.setLastLabel(text, None, None)#generate_color, generate_color + shape = self.canvas.setLastLabel(text, None, None) # generate_color, generate_color self.addLabel(shape) if self.beginner(): # Switch to edit mode. self.canvas.setEditing(True) @@ -1239,6 +1188,7 @@ class MainWindow(QMainWindow, WindowMixin): def addZoom(self, increment=10): self.setZoom(self.zoomWidget.value() + increment) + self.imageSlider.setValue(self.zoomWidget.value() + increment) # set zoom slider value def zoomRequest(self, delta): # get the current scrollbar positions @@ -1324,17 +1274,16 @@ class MainWindow(QMainWindow, WindowMixin): # unicodeFilePath = os.path.abspath(unicodeFilePath) # Tzutalin 20160906 : Add file list and dock to move faster # Highlight the file item - + if unicodeFilePath and self.fileListWidget.count() > 0: if unicodeFilePath in self.mImgList: index = self.mImgList.index(unicodeFilePath) fileWidgetItem = self.fileListWidget.item(index) print('unicodeFilePath is', unicodeFilePath) fileWidgetItem.setSelected(True) - ### self.iconlist.clear() self.additems5(None) - + for i in range(5): item_tooltip = self.iconlist.item(i).toolTip() # print(i,"---",item_tooltip) @@ -1385,7 +1334,7 @@ class MainWindow(QMainWindow, WindowMixin): self.showBoundingBoxFromPPlabel(filePath) self.setWindowTitle(__appname__ + ' ' + filePath) - + # Default : select last item if there is at least one item if self.labelList.count(): self.labelList.setCurrentItem(self.labelList.item(self.labelList.count() - 1)) @@ -1394,9 +1343,11 @@ class MainWindow(QMainWindow, WindowMixin): # show file list image count 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()})") - + self.fileDock.setWindowTitle(self.fileListName + f" ({select_indexes[0].row() + 1}" + 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()})") self.canvas.setFocus(True) return True @@ -1405,24 +1356,23 @@ class MainWindow(QMainWindow, WindowMixin): def showBoundingBoxFromPPlabel(self, filePath): width, height = self.image.width(), self.image.height() imgidx = self.getImglabelidx(filePath) - shapes =[] - #box['ratio'] of the shapes saved in lockedShapes contains the ratio of the + shapes = [] + # box['ratio'] of the shapes saved in lockedShapes contains the ratio of the # four corner coordinates of the shapes to the height and width of the image for box in self.canvas.lockedShapes: if self.canvas.isInTheSameImage: - shapes.append((box['transcription'], [[s[0]*width,s[1]*height]for s in box['ratio']], - DEFAULT_LOCK_COLOR, None, box['difficult'])) + shapes.append((box['transcription'], [[s[0] * width, s[1] * height] for s in box['ratio']], + DEFAULT_LOCK_COLOR, None, box['difficult'])) else: - shapes.append(('锁定框：待检测', [[s[0]*width,s[1]*height]for s in box['ratio']], - DEFAULT_LOCK_COLOR, None, box['difficult'])) + shapes.append(('锁定框：待检测', [[s[0] * width, s[1] * height] for s in box['ratio']], + DEFAULT_LOCK_COLOR, None, box['difficult'])) if imgidx in self.PPlabel.keys(): for box in self.PPlabel[imgidx]: shapes.append((box['transcription'], box['points'], None, None, box['difficult'])) - + self.loadLabels(shapes) self.canvas.verified = False - def validFilestate(self, filePath): if filePath not in self.fileStatedict.keys(): return None @@ -1433,7 +1383,7 @@ class MainWindow(QMainWindow, WindowMixin): def resizeEvent(self, event): if self.canvas and not self.image.isNull() \ - and self.zoomMode != self.MANUAL_ZOOM: + and self.zoomMode != self.MANUAL_ZOOM: self.adjustScale() super(MainWindow, self).resizeEvent(event) @@ -1451,7 +1401,7 @@ class MainWindow(QMainWindow, WindowMixin): """Figure out the size of the pixmap in order to fit the main widget.""" e = 2.0 # So that no scrollbars are generated. w1 = self.centralWidget().width() - e - h1 = self.centralWidget().height() - e -110 + h1 = self.centralWidget().height() - e - 110 a1 = w1 / h1 # Calculate a new scale value based on the pixmap's aspect ratio. w2 = self.canvas.pixmap.width() - 0.0 @@ -1502,7 +1452,7 @@ class MainWindow(QMainWindow, WindowMixin): def loadRecent(self, filename): if self.mayContinue(): - print(filename,"======") + print(filename, "======") self.loadFile(filename) def scanAllImages(self, folderPath): @@ -1517,8 +1467,6 @@ class MainWindow(QMainWindow, WindowMixin): natural_sort(images, key=lambda x: x.lower()) return images - - def openDirDialog(self, _value=False, dirpath=None, silent=False): if not self.mayContinue(): return @@ -1530,15 +1478,15 @@ class MainWindow(QMainWindow, WindowMixin): defaultOpenDirPath = os.path.dirname(self.filePath) if self.filePath else '.' if silent != True: targetDirPath = ustr(QFileDialog.getExistingDirectory(self, - '%s - Open Directory' % __appname__, - defaultOpenDirPath, - QFileDialog.ShowDirsOnly | QFileDialog.DontResolveSymlinks)) + '%s - Open Directory' % __appname__, + defaultOpenDirPath, + QFileDialog.ShowDirsOnly | QFileDialog.DontResolveSymlinks)) else: targetDirPath = ustr(defaultOpenDirPath) self.lastOpenDir = targetDirPath self.importDirImages(targetDirPath) - def openDatasetDirDialog(self,): + def openDatasetDirDialog(self): if self.lastOpenDir and os.path.exists(self.lastOpenDir): if platform.system() == 'Windows': os.startfile(self.lastOpenDir) @@ -1550,12 +1498,13 @@ class MainWindow(QMainWindow, WindowMixin): if self.lang == 'ch': self.msgBox.warning(self, "提示", "\n 原文件夹已不存在,请从新选择数据集路径!") else: - self.msgBox.warning(self, "Warn", "\n The original folder no longer exists, please choose the data set path again!") + self.msgBox.warning(self, "Warn", + "\n The original folder no longer exists, please choose the data set path again!") self.actions.open_dataset_dir.setEnabled(False) defaultOpenDirPath = os.path.dirname(self.filePath) if self.filePath else '.' - def importDirImages(self, dirpath, isDelete = False): + def importDirImages(self, dirpath, isDelete=False): if not self.mayContinue() or not dirpath: return if self.defaultSaveDir and self.defaultSaveDir != dirpath: @@ -1563,7 +1512,7 @@ class MainWindow(QMainWindow, WindowMixin): if not isDelete: self.loadFilestate(dirpath) - self.PPlabelpath = dirpath+ '/Label.txt' + self.PPlabelpath = dirpath + '/Label.txt' self.PPlabel = self.loadLabelFile(self.PPlabelpath) self.Cachelabelpath = dirpath + '/Cache.cach' self.Cachelabel = self.loadLabelFile(self.Cachelabelpath) @@ -1572,7 +1521,6 @@ class MainWindow(QMainWindow, WindowMixin): self.lastOpenDir = dirpath self.dirname = dirpath - self.defaultSaveDir = dirpath self.statusBar().showMessage('%s started. Annotation will be saved to %s' % (__appname__, self.defaultSaveDir)) @@ -1607,7 +1555,7 @@ class MainWindow(QMainWindow, WindowMixin): self.actions.rotateRight.setEnabled(True) self.fileListWidget.setCurrentRow(0) # set list index to first - self.filedock.setWindowTitle(self.fileListName + f" (1/{self.fileListWidget.count()})") # show image count + self.fileDock.setWindowTitle(self.fileListName + f" (1/{self.fileListWidget.count()})") # show image count def openPrevImg(self, _value=False): if len(self.mImgList) <= 0: @@ -1643,7 +1591,7 @@ class MainWindow(QMainWindow, WindowMixin): else: self.mImgList5 = self.indexTo5Files(currIndex) if filename: - print('file name in openNext is ',filename) + print('file name in openNext is ', filename) self.loadFile(filename) def updateFileListIcon(self, filename): @@ -1655,30 +1603,6 @@ class MainWindow(QMainWindow, WindowMixin): imgidx = self.getImglabelidx(self.filePath) self._saveFile(imgidx, mode=mode) - - def saveFileAs(self, _value=False): - assert not self.image.isNull(), "cannot save empty image" - self._saveFile(self.saveFileDialog()) - - def saveFileDialog(self, removeExt=True): - caption = '%s - Choose File' % __appname__ - filters = 'File (*%s)' % LabelFile.suffix - openDialogPath = self.currentPath() - dlg = QFileDialog(self, caption, openDialogPath, filters) - dlg.setDefaultSuffix(LabelFile.suffix[1:]) - dlg.setAcceptMode(QFileDialog.AcceptSave) - filenameWithoutExtension = os.path.splitext(self.filePath)[0] - dlg.selectFile(filenameWithoutExtension) - dlg.setOption(QFileDialog.DontUseNativeDialog, False) - if dlg.exec_(): - fullFilePath = ustr(dlg.selectedFiles()[0]) - if removeExt: - return os.path.splitext(fullFilePath)[0] # Return file path without the extension. - else: - return fullFilePath - return '' - - def saveLockedShapes(self): self.canvas.lockedShapes = [] self.canvas.selectedShapes = [] @@ -1691,7 +1615,6 @@ class MainWindow(QMainWindow, WindowMixin): self.canvas.selectedShapes.remove(s) self.canvas.shapes.remove(s) - def _saveFile(self, annotationFilePath, mode='Manual'): if len(self.canvas.lockedShapes) != 0: self.saveLockedShapes() @@ -1701,9 +1624,9 @@ class MainWindow(QMainWindow, WindowMixin): img = cv2.imread(self.filePath) width, height = self.image.width(), self.image.height() for shape in self.canvas.lockedShapes: - box = [[int(p[0]*width), int(p[1]*height)] for p in shape['ratio']] + box = [[int(p[0] * width), int(p[1] * height)] for p in shape['ratio']] assert len(box) == 4 - result = [(shape['transcription'],1)] + result = [(shape['transcription'], 1)] result.insert(0, box) self.result_dic_locked.append(result) self.result_dic += self.result_dic_locked @@ -1717,7 +1640,7 @@ class MainWindow(QMainWindow, WindowMixin): item.setIcon(newIcon('done')) self.fileStatedict[self.filePath] = 1 - if len(self.fileStatedict)%self.autoSaveNum ==0: + if len(self.fileStatedict) % self.autoSaveNum == 0: self.saveFilestate() self.savePPlabel(mode='Auto') @@ -1750,8 +1673,8 @@ class MainWindow(QMainWindow, WindowMixin): if platform.system() == 'Windows': from win32com.shell import shell, shellcon shell.SHFileOperation((0, shellcon.FO_DELETE, deletePath, None, - shellcon.FOF_SILENT | shellcon.FOF_ALLOWUNDO | shellcon.FOF_NOCONFIRMATION, - None, None)) + shellcon.FOF_SILENT | shellcon.FOF_ALLOWUNDO | shellcon.FOF_NOCONFIRMATION, + None, None)) # linux elif platform.system() == 'Linux': cmd = 'trash ' + deletePath @@ -1831,6 +1754,8 @@ class MainWindow(QMainWindow, WindowMixin): if self.noShapes(): for action in self.actions.onShapesPresent: action.setEnabled(False) + self.BoxListDock.setWindowTitle(self.BoxListDockName + f" ({self.BoxList.count()})") + self.labelListDock.setWindowTitle(self.labelListDockName + f" ({self.labelList.count()})") def chshapeLineColor(self): color = self.colorDialog.getColor(self.lineColor, u'Choose line color', @@ -1867,7 +1792,6 @@ class MainWindow(QMainWindow, WindowMixin): else: self.labelHist.append(line) - def togglePaintLabelsOption(self): for shape in self.canvas.shapes: shape.paintLabel = self.displayLabelOption.isChecked() @@ -1896,7 +1820,7 @@ class MainWindow(QMainWindow, WindowMixin): prelen = lentoken // 2 bfilename = prelen * " " + pfilename + (lentoken - prelen) * " " # item = QListWidgetItem(QIcon(pix.scaled(100, 100, Qt.KeepAspectRatio, Qt.SmoothTransformation)),filename[:10]) - item = QListWidgetItem(QIcon(pix.scaled(100, 100, Qt.IgnoreAspectRatio, Qt.FastTransformation)),pfilename) + item = QListWidgetItem(QIcon(pix.scaled(100, 100, Qt.IgnoreAspectRatio, Qt.FastTransformation)), pfilename) # item.setForeground(QBrush(Qt.white)) item.setToolTip(file) self.iconlist.addItem(item) @@ -1908,7 +1832,7 @@ class MainWindow(QMainWindow, WindowMixin): self.iconlist.setMinimumWidth(owidth + 50) def getImglabelidx(self, filePath): - if platform.system()=='Windows': + if platform.system() == 'Windows': spliter = '\\' else: spliter = '/' @@ -1923,14 +1847,13 @@ class MainWindow(QMainWindow, WindowMixin): self.autoDialog = AutoDialog(parent=self, ocr=self.ocr, mImgList=uncheckedList, lenbar=len(uncheckedList)) self.autoDialog.popUp() self.currIndex = len(self.mImgList) - 1 - self.loadFile(self.filePath) # ADD + self.loadFile(self.filePath) # ADD self.haveAutoReced = True self.AutoRecognition.setEnabled(False) self.actions.AutoRec.setEnabled(False) self.setDirty() self.saveCacheLabel() - def reRecognition(self): img = cv2.imread(self.filePath) # org_box = [dic['points'] for dic in self.PPlabel[self.getImglabelidx(self.filePath)]] @@ -1959,24 +1882,27 @@ class MainWindow(QMainWindow, WindowMixin): print('Can not recognise the box') if shape.line_color == DEFAULT_LOCK_COLOR: shape.label = result[0][0] - self.result_dic_locked.append([box,(self.noLabelText,0)]) + self.result_dic_locked.append([box, (self.noLabelText, 0)]) else: - self.result_dic.append([box,(self.noLabelText,0)]) + self.result_dic.append([box, (self.noLabelText, 0)]) try: if self.noLabelText == shape.label or result[1][0] == shape.label: print('label no change') else: rec_flag += 1 except IndexError as e: - print('Can not recognise the box') - if (len(self.result_dic) > 0 and rec_flag > 0)or self.canvas.lockedShapes: - self.canvas.isInTheSameImage = True + print('Can not recognise the box') + if (len(self.result_dic) > 0 and rec_flag > 0) or self.canvas.lockedShapes: + self.canvas.isInTheSameImage = True self.saveFile(mode='Auto') self.loadFile(self.filePath) self.canvas.isInTheSameImage = False self.setDirty() elif len(self.result_dic) == len(self.canvas.shapes) and rec_flag == 0: - QMessageBox.information(self, "Information", "The recognition result remains unchanged!") + if self.lang == 'ch': + QMessageBox.information(self, "Information", "识别结果保持一致！") + else: + QMessageBox.information(self, "Information", "The recognition result remains unchanged!") else: print('Can not recgonise in ', self.filePath) else: @@ -2041,7 +1967,6 @@ class MainWindow(QMainWindow, WindowMixin): self.AutoRecognition.setEnabled(True) self.actions.AutoRec.setEnabled(True) - def modelChoose(self): print(self.comboBox.currentText()) lg_idx = {'Chinese & English': 'ch', 'English': 'en', 'French': 'french', 'German': 'german', @@ -2068,14 +1993,12 @@ class MainWindow(QMainWindow, WindowMixin): self.actions.saveLabel.setEnabled(True) self.actions.saveRec.setEnabled(True) - def saveFilestate(self): with open(self.fileStatepath, 'w', encoding='utf-8') as f: for key in self.fileStatedict: f.write(key + '\t') f.write(str(self.fileStatedict[key]) + '\n') - def loadLabelFile(self, labelpath): labeldict = {} if not os.path.exists(labelpath): @@ -2094,8 +2017,7 @@ class MainWindow(QMainWindow, WindowMixin): labeldict[file] = [] return labeldict - - def savePPlabel(self,mode='Manual'): + def savePPlabel(self, mode='Manual'): savedfile = [self.getImglabelidx(i) for i in self.fileStatedict.keys()] with open(self.PPlabelpath, 'w', encoding='utf-8') as f: for key in self.PPlabel: @@ -2139,17 +2061,19 @@ class MainWindow(QMainWindow, WindowMixin): for i, label in enumerate(self.PPlabel[idx]): if label['difficult']: continue img_crop = get_rotate_crop_image(img, np.array(label['points'], np.float32)) - img_name = os.path.splitext(os.path.basename(idx))[0] + '_crop_'+str(i)+'.jpg' - cv2.imwrite(crop_img_dir+img_name, img_crop) - f.write('crop_img/'+ img_name + '\t') + img_name = os.path.splitext(os.path.basename(idx))[0] + '_crop_' + str(i) + '.jpg' + cv2.imwrite(crop_img_dir + img_name, img_crop) + f.write('crop_img/' + img_name + '\t') f.write(label['transcription'] + '\n') except Exception as e: ques_img.append(key) - print("Can not read image ",e) + print("Can not read image ", e) if ques_img: - QMessageBox.information(self, "Information", "The following images can not be saved, " - "please check the image path and labels.\n" + "".join(str(i)+'\n' for i in ques_img)) - QMessageBox.information(self, "Information", "Cropped images have been saved in "+str(crop_img_dir)) + QMessageBox.information(self, + "Information", + "The following images can not be saved, please check the image path and labels.\n" + + "".join(str(i) + '\n' for i in ques_img)) + QMessageBox.information(self, "Information", "Cropped images have been saved in " + str(crop_img_dir)) def speedChoose(self): if self.labelDialogOption.isChecked(): @@ -2162,14 +2086,14 @@ class MainWindow(QMainWindow, WindowMixin): def autoSaveFunc(self): if self.autoSaveOption.isChecked(): - self.autoSaveNum = 1 # Real auto_Save + self.autoSaveNum = 1 # Real auto_Save try: self.saveLabelFile() except: pass print('The program will automatically save once after confirming an image') else: - self.autoSaveNum = 5 # Used for backup + self.autoSaveNum = 5 # Used for backup print('The program will automatically save once after confirming 5 images (default)') def undoShapeEdit(self): @@ -2186,25 +2110,26 @@ class MainWindow(QMainWindow, WindowMixin): self.labelList.clearSelection() self._noSelectionSlot = False self.canvas.loadShapes(shapes, replace=replace) - print("loadShapes")#1 - - + print("loadShapes") # 1 + def lockSelectedShape(self): - """lock the selsected shapes. + """lock the selected shapes. Add self.selectedShapes to lock self.canvas.lockedShapes, which holds the ratio of the four coordinates of the locked shapes to the width and height of the image """ width, height = self.image.width(), self.image.height() + def format_shape(s): return dict(label=s.label, # str line_color=s.line_color.getRgb(), fill_color=s.fill_color.getRgb(), - ratio=[[int(p.x())/width, int(p.y())/height] for p in s.points], # QPonitF - # add chris + ratio=[[int(p.x()) / width, int(p.y()) / height] for p in s.points], # QPonitF + # add chris difficult=s.difficult) # bool - #lock + + # lock if len(self.canvas.lockedShapes) == 0: for s in self.canvas.selectedShapes: s.line_color = DEFAULT_LOCK_COLOR @@ -2216,7 +2141,7 @@ class MainWindow(QMainWindow, WindowMixin): self.canvas.lockedShapes = trans_dic self.actions.save.setEnabled(True) - #unlock + # unlock else: for s in self.canvas.shapes: s.line_color = DEFAULT_LINE_COLOR @@ -2237,9 +2162,11 @@ def read(filename, default=None): except: return default + def str2bool(v): return v.lower() in ("true", "t", "1") + def get_main_app(argv=[]): """ Standard boilerplate Qt application code. @@ -2248,23 +2175,24 @@ def get_main_app(argv=[]): app = QApplication(argv) app.setApplicationName(__appname__) app.setWindowIcon(newIcon("app")) - # Tzutalin 201705+: Accept extra agruments to change predefined class file - argparser = argparse.ArgumentParser() - argparser.add_argument("--lang", type=str, default='en', nargs="?") - argparser.add_argument("--gpu", type=str2bool, default=False, nargs="?") - argparser.add_argument("--predefined_classes_file", - default=os.path.join(os.path.dirname(__file__), "data", "predefined_classes.txt"), - nargs="?") - args = argparser.parse_args(argv[1:]) - # Usage : labelImg.py image predefClassFile saveDir - win = MainWindow(lang=args.lang, gpu=args.gpu, - defaultPrefdefClassFile=args.predefined_classes_file) + # Tzutalin 201705+: Accept extra arguments to change predefined class file + arg_parser = argparse.ArgumentParser() + arg_parser.add_argument("--lang", type=str, default='en', nargs="?") + arg_parser.add_argument("--gpu", type=str2bool, default=True, nargs="?") + arg_parser.add_argument("--predefined_classes_file", + default=os.path.join(os.path.dirname(__file__), "data", "predefined_classes.txt"), + nargs="?") + args = arg_parser.parse_args(argv[1:]) + + win = MainWindow(lang=args.lang, + gpu=args.gpu, + default_predefined_class_file=args.predefined_classes_file) win.show() return app, win def main(): - '''construct main app and run it''' + """construct main app and run it""" app, _win = get_main_app(sys.argv) return app.exec_() @@ -2276,5 +2204,5 @@ if __name__ == '__main__': output = os.system('pyrcc5 -o libs/resources.py resources.qrc') assert output == 0, "operate the cmd have some problems ,please check whether there is a in the lib " \ "directory resources.py " - import libs.resources + sys.exit(main()) diff --git a/PPOCRLabel/README.md b/PPOCRLabel/README.md index 10bfa4699d0141c94131a7cb5b4860f7a1edd03f..19e54ab14663ab86285a45680ac2b6421420e4d4 100644 --- a/PPOCRLabel/README.md +++ b/PPOCRLabel/README.md @@ -8,6 +8,8 @@ PPOCRLabel is a semi-automatic graphic annotation tool suitable for OCR field, w ### Recent Update +- 2022.01：（by [PeterH0323](https://github.com/peterh0323) ） + - Improve user experience: prompt for the number of files and labels, optimize interaction, and fix bugs such as only use CPU when inference - 2021.11.17: - Support install and start PPOCRLabel through the whl package (by [d2623587501](https://github.com/d2623587501)) - Dataset segmentation: Divide the annotation file into training, verification and testing parts (refer to section 3.5 below, by [MrCuiHao](https://github.com/MrCuiHao)) @@ -110,7 +112,7 @@ python PPOCRLabel.py 6. Click 're-Recognition', model will rewrite ALL recognition results in ALL detection box[3]. -7. Double click the result in 'recognition result' list to manually change inaccurate recognition results. +7. Single click the result in 'recognition result' list to manually change inaccurate recognition results. 8. **Click "Check", the image status will switch to "√",then the program automatically jump to the next.** @@ -143,15 +145,17 @@ python PPOCRLabel.py ### 3.1 Shortcut keys | Shortcut keys | Description | -|--------------------------| ------------------------------------------------ | +|--------------------------|--------------------------------------------------| | Ctrl + Shift + R | Re-recognize all the labels of the current image | | W | Create a rect box | | Q | Create a four-points box | +| X | Rotate the box anti-clockwise | +| C | Rotate the box clockwise | | Ctrl + E | Edit label of the selected box | | Ctrl + R | Re-recognize the selected box | | Ctrl + C | Copy and paste the selected box | | Ctrl + Left Mouse Button | Multi select the label box | -| Ctrl + X | Delete the selected box | +| Alt + X | Delete the selected box | | Ctrl + V | Check image | | Ctrl + Shift + d | Delete image | | D | Next image | diff --git a/PPOCRLabel/README_ch.md b/PPOCRLabel/README_ch.md index 03e1b2da2eac7c71f029ce612a89fb4e8ccae993..2226336631c68a892e3a7075b2dc8d65bccdf204 100644 --- a/PPOCRLabel/README_ch.md +++ b/PPOCRLabel/README_ch.md @@ -8,6 +8,8 @@ PPOCRLabel是一款适用于OCR领域的半自动化图形标注工具，内置P #### 近期更新 +- 2022.01：（by [PeterH0323](https://github.com/peterh0323) ） + - 提升用户体验：新增文件与标记数目提示、优化交互、修复gpu使用等问题 - 2021.11.17： - 新增支持通过whl包安装和启动PPOCRLabel（by [d2623587501](https://github.com/d2623587501)） - 标注数据集切分：对标注数据进行训练、验证与测试集划分（参考下方3.5节，by [MrCuiHao](https://github.com/MrCuiHao)） @@ -102,7 +104,7 @@ python PPOCRLabel.py --lang ch 4. 手动标注：点击 “矩形标注”（推荐直接在英文模式下点击键盘中的 “W”)，用户可对当前图片中模型未检出的部分进行手动绘制标记框。点击键盘Q，则使用四点标注模式（或点击“编辑” - “四点标注”），用户依次点击4个点后，双击左键表示标注完成。 5. 标记框绘制完成后，用户点击 “确认”，检测框会先被预分配一个 “待识别” 标签。 6. 重新识别：将图片中的所有检测画绘制/调整完成后，点击 “重新识别”，PPOCR模型会对当前图片中的**所有检测框**重新识别[3]。 -7. 内容更改：双击识别结果，对不准确的识别结果进行手动更改。 +7. 内容更改：单击识别结果，对不准确的识别结果进行手动更改。 8. **确认标记：点击 “确认”，图片状态切换为 “√”，跳转至下一张。** 9. 删除：点击 “删除图像”，图片将会被删除至回收站。 10. 导出结果：用户可以通过菜单中“文件-导出标记结果”手动导出，同时也可以点击“文件 - 自动导出标记结果”开启自动导出。手动确认过的标记将会被存放在所打开图片文件夹下的*Label.txt*中。在菜单栏点击 “文件” - "导出识别结果"后，会将此类图片的识别训练数据保存在*crop_img*文件夹下，识别标签保存在*rec_gt.txt*中[4]。 @@ -131,23 +133,25 @@ python PPOCRLabel.py --lang ch ### 3.1 快捷键 -| 快捷键 | 说明 | -|------------------| ---------------------------- | -| Ctrl + shift + R | 对当前图片的所有标记重新识别 | -| W | 新建矩形框 | -| Q | 新建四点框 | -| Ctrl + E | 编辑所选框标签 | -| Ctrl + R | 重新识别所选标记 | +| 快捷键 | 说明 | +|------------------|----------------| +| Ctrl + shift + R | 对当前图片的所有标记重新识别 | +| W | 新建矩形框 | +| Q | 新建四点框 | +| X | 框逆时针旋转 | +| C | 框顺时针旋转 | +| Ctrl + E | 编辑所选框标签 | +| Ctrl + R | 重新识别所选标记 | | Ctrl + C | 复制并粘贴选中的标记框 | -| Ctrl + 鼠标左键 | 多选标记框 | -| Ctrl + X | 删除所选框 | -| Ctrl + V | 确认本张图片标记 | -| Ctrl + Shift + d | 删除本张图片 | -| D | 下一张图片 | -| A | 上一张图片 | -| Ctrl++ | 缩小 | -| Ctrl-- | 放大 | -| ↑→↓← | 移动标记框 | +| Ctrl + 鼠标左键 | 多选标记框 | +| Alt + X | 删除所选框 | +| Ctrl + V | 确认本张图片标记 | +| Ctrl + Shift + d | 删除本张图片 | +| D | 下一张图片 | +| A | 上一张图片 | +| Ctrl++ | 缩小 | +| Ctrl-- | 放大 | +| ↑→↓← | 移动标记框 | ### 3.2 内置模型 diff --git a/PPOCRLabel/combobox.py b/PPOCRLabel/combobox.py deleted file mode 100644 index 8526b45392902e564364be27948517377217bbeb..0000000000000000000000000000000000000000 --- a/PPOCRLabel/combobox.py +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright (c) <2015-Present> Tzutalin -# Copyright (C) 2013 MIT, Computer Science and Artificial Intelligence Laboratory. Bryan Russell, Antonio Torralba, -# William T. Freeman. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and -# associated documentation files (the "Software"), to deal in the Software without restriction, including without -# limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the -# Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -# The above copyright notice and this permission notice shall be included in all copies or substantial portions of -# the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT -# NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT -# SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF -# CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -import sys -try: - from PyQt5.QtWidgets import QWidget, QHBoxLayout, QComboBox -except ImportError: - # needed for py3+qt4 - # Ref: - # http://pyqt.sourceforge.net/Docs/PyQt4/incompatible_apis.html - # http://stackoverflow.com/questions/21217399/pyqt4-qtcore-qvariant-object-instead-of-a-string - if sys.version_info.major >= 3: - import sip - sip.setapi('QVariant', 2) - from PyQt4.QtGui import QWidget, QHBoxLayout, QComboBox - - -class ComboBox(QWidget): - def __init__(self, parent=None, items=[]): - super(ComboBox, self).__init__(parent) - - layout = QHBoxLayout() - self.cb = QComboBox() - self.items = items - self.cb.addItems(self.items) - - self.cb.currentIndexChanged.connect(parent.comboSelectionChanged) - - layout.addWidget(self.cb) - self.setLayout(layout) - - def update_items(self, items): - self.items = items - - self.cb.clear() - self.cb.addItems(self.items) diff --git a/PPOCRLabel/libs/canvas.py b/PPOCRLabel/libs/canvas.py index 6116f357d6efb91a5a9d9cdc6ba757fbd06df60e..8d257e6bd7e7a61d7c28e9787042c3eb9d42609f 100644 --- a/PPOCRLabel/libs/canvas.py +++ b/PPOCRLabel/libs/canvas.py @@ -11,19 +11,13 @@ # CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -try: - from PyQt5.QtGui import * - from PyQt5.QtCore import * - from PyQt5.QtWidgets import * -except ImportError: - from PyQt4.QtGui import * - from PyQt4.QtCore import * - -#from PyQt4.QtOpenGL import * +import copy +from PyQt5.QtCore import Qt, pyqtSignal, QPointF, QPoint +from PyQt5.QtGui import QPainter, QBrush, QColor, QPixmap +from PyQt5.QtWidgets import QWidget, QMenu, QApplication from libs.shape import Shape from libs.utils import distance -import copy CURSOR_DEFAULT = Qt.ArrowCursor CURSOR_POINT = Qt.PointingHandCursor @@ -31,8 +25,6 @@ CURSOR_DRAW = Qt.CrossCursor CURSOR_MOVE = Qt.ClosedHandCursor CURSOR_GRAB = Qt.OpenHandCursor -# class Canvas(QGLWidget): - class Canvas(QWidget): zoomRequest = pyqtSignal(int) @@ -129,7 +121,6 @@ class Canvas(QWidget): def selectedVertex(self): return self.hVertex is not None - def mouseMoveEvent(self, ev): """Update line with last point and current coordinates.""" pos = self.transformPos(ev.pos()) @@ -333,7 +324,6 @@ class Canvas(QWidget): self.movingShape = False - def endMove(self, copy=False): assert self.selectedShapes and self.selectedShapesCopy assert len(self.selectedShapesCopy) == len(self.selectedShapes) @@ -410,7 +400,6 @@ class Canvas(QWidget): self.selectionChanged.emit(shapes) self.update() - def selectShapePoint(self, point, multiple_selection_mode): """Select the first shape created which contains this point.""" if self.selectedVertex(): # A vertex is marked for selection. @@ -494,7 +483,6 @@ class Canvas(QWidget): else: shape.moveVertexBy(index, shiftPos) - def boundedMoveShape(self, shapes, pos): if type(shapes).__name__ != 'list': shapes = [shapes] if self.outOfPixmap(pos): @@ -515,6 +503,7 @@ class Canvas(QWidget): if dp: for shape in shapes: shape.moveBy(dp) + shape.close() self.prevPoint = pos return True return False @@ -728,6 +717,31 @@ class Canvas(QWidget): self.moveOnePixel('Up') elif key == Qt.Key_Down and self.selectedShapes: self.moveOnePixel('Down') + elif key == Qt.Key_X and self.selectedShapes: + for i in range(len(self.selectedShapes)): + self.selectedShape = self.selectedShapes[i] + if self.rotateOutOfBound(0.01): + continue + self.selectedShape.rotate(0.01) + self.shapeMoved.emit() + self.update() + + elif key == Qt.Key_C and self.selectedShapes: + for i in range(len(self.selectedShapes)): + self.selectedShape = self.selectedShapes[i] + if self.rotateOutOfBound(-0.01): + continue + self.selectedShape.rotate(-0.01) + self.shapeMoved.emit() + self.update() + + def rotateOutOfBound(self, angle): + for shape in range(len(self.selectedShapes)): + self.selectedShape = self.selectedShapes[shape] + for i, p in enumerate(self.selectedShape.points): + if self.outOfPixmap(self.selectedShape.rotatePoint(p, angle)): + return True + return False def moveOnePixel(self, direction): # print(self.selectedShape.points) diff --git a/PPOCRLabel/libs/editinlist.py b/PPOCRLabel/libs/editinlist.py index c1b8249baeab81a22c22f6b183866954b2ee45de..79d2d3aa371ac076de513a4d52ea51b27c6e08f2 100644 --- a/PPOCRLabel/libs/editinlist.py +++ b/PPOCRLabel/libs/editinlist.py @@ -1,31 +1,29 @@ -import sys, time -from PyQt5 import QtWidgets -from PyQt5.QtGui import * -from PyQt5.QtCore import * -from PyQt5.QtWidgets import * +# !/usr/bin/env python +# -*- coding: utf-8 -*- +from PyQt5.QtCore import QModelIndex +from PyQt5.QtWidgets import QListWidget + class EditInList(QListWidget): def __init__(self): - super(EditInList,self).__init__() - # click to edit - self.clicked.connect(self.item_clicked) + super(EditInList, self).__init__() + self.edited_item = None + + def item_clicked(self, modelindex: QModelIndex): + try: + if self.edited_item is not None: + self.closePersistentEditor(self.edited_item) + except: + self.edited_item = self.currentItem() - def item_clicked(self, modelindex: QModelIndex) -> None: - self.edited_item = self.currentItem() - self.closePersistentEditor(self.edited_item) - item = self.item(modelindex.row()) - # time.sleep(0.2) - self.edited_item = item - self.openPersistentEditor(item) - # time.sleep(0.2) - self.editItem(item) + self.edited_item = self.item(modelindex.row()) + self.openPersistentEditor(self.edited_item) + self.editItem(self.edited_item) def mouseDoubleClickEvent(self, event): - # close edit - for i in range(self.count()): - self.closePersistentEditor(self.item(i)) + pass def leaveEvent(self, event): # close edit for i in range(self.count()): - self.closePersistentEditor(self.item(i)) \ No newline at end of file + self.closePersistentEditor(self.item(i)) diff --git a/PPOCRLabel/libs/shape.py b/PPOCRLabel/libs/shape.py index e2cdcb322790c9b6edd3c504405ad65097a7bc49..528b1102b010ceef8fa1057309e652010a91376d 100644 --- a/PPOCRLabel/libs/shape.py +++ b/PPOCRLabel/libs/shape.py @@ -10,19 +10,14 @@ # SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF # CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -#!/usr/bin/python +# !/usr/bin/python # -*- coding: utf-8 -*- +import math +import sys - -try: - from PyQt5.QtGui import * - from PyQt5.QtCore import * -except ImportError: - from PyQt4.QtGui import * - from PyQt4.QtCore import * - +from PyQt5.QtCore import QPointF +from PyQt5.QtGui import QColor, QPen, QPainterPath, QFont from libs.utils import distance -import sys DEFAULT_LINE_COLOR = QColor(0, 255, 0, 128) DEFAULT_FILL_COLOR = QColor(255, 0, 0, 128) @@ -59,6 +54,8 @@ class Shape(object): self.difficult = difficult self.paintLabel = paintLabel self.locked = False + self.direction = 0 + self.center = None self._highlightIndex = None self._highlightMode = self.NEAR_VERTEX self._highlightSettings = { @@ -74,7 +71,24 @@ class Shape(object): # is used for drawing the pending line a different color. self.line_color = line_color + def rotate(self, theta): + for i, p in enumerate(self.points): + self.points[i] = self.rotatePoint(p, theta) + self.direction -= theta + self.direction = self.direction % (2 * math.pi) + + def rotatePoint(self, p, theta): + order = p - self.center + cosTheta = math.cos(theta) + sinTheta = math.sin(theta) + pResx = cosTheta * order.x() + sinTheta * order.y() + pResy = - sinTheta * order.x() + cosTheta * order.y() + pRes = QPointF(self.center.x() + pResx, self.center.y() + pResy) + return pRes + def close(self): + self.center = QPointF((self.points[0].x() + self.points[2].x()) / 2, + (self.points[0].y() + self.points[2].y()) / 2) self._closed = True def reachMaxPoints(self): @@ -83,7 +97,9 @@ class Shape(object): return False def addPoint(self, point): - if not self.reachMaxPoints(): # 4个点时发出close信号 + if self.reachMaxPoints(): + self.close() + else: self.points.append(point) def popPoint(self): @@ -112,7 +128,7 @@ class Shape(object): # Uncommenting the following line will draw 2 paths # for the 1st vertex, and make it non-filled, which # may be desirable. - #self.drawVertex(vrtx_path, 0) + # self.drawVertex(vrtx_path, 0) for i, p in enumerate(self.points): line_path.lineTo(p) @@ -136,9 +152,9 @@ class Shape(object): font.setPointSize(8) font.setBold(True) painter.setFont(font) - if(self.label == None): + if self.label is None: self.label = "" - if(min_y < MIN_Y_LABEL): + if min_y < MIN_Y_LABEL: min_y += MIN_Y_LABEL painter.drawText(min_x, min_y, self.label) @@ -198,6 +214,8 @@ class Shape(object): def copy(self): shape = Shape("%s" % self.label) shape.points = [p for p in self.points] + shape.center = self.center + shape.direction = self.direction shape.fill = self.fill shape.selected = self.selected shape._closed = self._closed diff --git a/doc/doc_ch/thirdparty.md b/doc/doc_ch/thirdparty.md index cd521d090f556812f27c66f208ee9508dc4d986f..d317d139a66057e9957a5b6edb9fe2d59a35427e 100644 --- a/doc/doc_ch/thirdparty.md +++ b/doc/doc_ch/thirdparty.md @@ -21,10 +21,15 @@ PaddleOCR希望可以通过AI的力量助力任何一位有梦想的开发者实 | 通用工具 | [FastOCRLabel](https://gitee.com/BaoJianQiang/FastOCRLabel) | 完整的C#版本标注GUI | [包建强](https://gitee.com/BaoJianQiang) | | 通用工具 | [DangoOCR离线版](https://github.com/PantsuDango/DangoOCR) | 通用型桌面级即时翻译GUI | [PantsuDango](https://github.com/PantsuDango) | | 通用工具 | [scr2txt](https://github.com/lstwzd/scr2txt) | 截屏转文字GUI | [lstwzd](https://github.com/lstwzd) | +| 通用工具 | [ocr_sdk](https://github.com/mymagicpower/AIAS/blob/main/1_image_sdks/text_recognition/ocr_sdk) | OCR java SDK工具箱 | [Calvin](https://github.com/mymagicpower) | +| 通用工具 | [iocr](https://github.com/mymagicpower/AIAS/blob/main/8_suite_hub/iocr) | IOCR 自定义模板识别(支持表格识别) | [Calvin](https://github.com/mymagicpower) | | 垂类工具 | [AI Studio项目](https://aistudio.baidu.com/aistudio/projectdetail/1054614?channelType=0&channel=0) | 英文视频自动生成字幕 | [叶月水狐](https://aistudio.baidu.com/aistudio/personalcenter/thirdview/322052) | | 垂类工具 | [id_card_ocr](https://github.com/baseli/id_card_ocr) | 身份证复印件识别 | [baseli](https://github.com/baseli) | | 垂类工具 | [Paddle_Table_Image_Reader](https://github.com/thunder95/Paddle_Table_Image_Reader) | 能看懂表格图片的数据助手 | [thunder95](https://github.com/thunder95]) | | 前后处理 | [paddleOCRCorrectOutputs](https://github.com/yuranusduke/paddleOCRCorrectOutputs) | 获取OCR识别结果的key-value | [yuranusduke](https://github.com/yuranusduke) | +|前处理| [optlab](https://github.com/GreatV/optlab) |OCR前处理工具箱，基于Qt和Leptonica。|[GreatV](https://github.com/GreatV)| +|应用部署| [PaddleOCRSharp](https://github.com/raoyutian/PaddleOCRSharp) |PaddleOCR的.NET封装与应用部署。|[raoyutian](https://github.com/raoyutian/PaddleOCRSharp)| +| 学术前沿模型训练与推理 | [AI Studio项目](https://aistudio.baidu.com/aistudio/projectdetail/3397137) | StarNet-MobileNetV3算法–中文训练 | [xiaoyangyang2](https://github.com/xiaoyangyang2) | ### 1.2 为PaddleOCR新增功能 diff --git a/test_tipc/test_train_inference_python.sh b/test_tipc/test_train_inference_python.sh index 9bde89d78e0ee78c7b650306047b036488a3eab9..4ad83c66977540d73bdc9bedb8b93bf465e8b6fc 100644 --- a/test_tipc/test_train_inference_python.sh +++ b/test_tipc/test_train_inference_python.sh @@ -284,7 +284,6 @@ else set_amp_config=" " fi for trainer in ${trainer_list[*]}; do - eval ${env} flag_quant=False if [ ${trainer} = ${pact_key} ]; then run_train=${pact_trainer} @@ -344,6 +343,7 @@ else # run eval if [ ${eval_py} != "null" ]; then + eval ${env} set_eval_params1=$(func_set_params "${eval_key1}" "${eval_value1}") eval_cmd="${python} ${eval_py} ${set_eval_pretrain} ${set_use_gpu} ${set_eval_params1}" eval $eval_cmd diff --git a/tools/infer/predict_system.py b/tools/infer/predict_system.py index 8d674809a5fe22e458fcb0c68419a7313e71d5f6..16789b81cd0364af91f15a4a90ddd614a3f87611 100755 --- a/tools/infer/predict_system.py +++ b/tools/infer/predict_system.py @@ -92,11 +92,11 @@ class TextSystem(object): self.draw_crop_rec_res(self.args.crop_res_save_dir, img_crop_list, rec_res) filter_boxes, filter_rec_res = [], [] - for box, rec_reuslt in zip(dt_boxes, rec_res): - text, score = rec_reuslt + for box, rec_result in zip(dt_boxes, rec_res): + text, score = rec_result if score >= self.drop_score: filter_boxes.append(box) - filter_rec_res.append(rec_reuslt) + filter_rec_res.append(rec_result) return filter_boxes, filter_rec_res diff --git a/tools/infer_cls.py b/tools/infer_cls.py index 7522e43907b50b84cc52930ff4eeb8e537cb2c73..ab6a49120b6e22621b462b680a161d70ee965e78 100755 --- a/tools/infer_cls.py +++ b/tools/infer_cls.py @@ -73,8 +73,8 @@ def main(): images = paddle.to_tensor(images) preds = model(images) post_result = post_process_class(preds) - for rec_reuslt in post_result: - logger.info('\t result: {}'.format(rec_reuslt)) + for rec_result in post_result: + logger.info('\t result: {}'.format(rec_result)) logger.info("success!")