From 26c1a03d218a2033b74ff6446ce01b4c21e8f466 Mon Sep 17 00:00:00 2001
From: HinGwenWoong <peterhuang0323@qq.com>
Date: Tue, 25 Jan 2022 20:12:00 +0800
Subject: [PATCH] modified according review
---
PPOCRLabel/PPOCRLabel.py | 20 ++++++++++----------
PPOCRLabel/README.md | 11 +----------
PPOCRLabel/README_ch.md | 11 +----------
3 files changed, 12 insertions(+), 30 deletions(-)
diff --git a/PPOCRLabel/PPOCRLabel.py b/PPOCRLabel/PPOCRLabel.py
index 3b514f480..517714104 100644
--- a/PPOCRLabel/PPOCRLabel.py
+++ b/PPOCRLabel/PPOCRLabel.py
@@ -64,7 +64,7 @@ class MainWindow(QMainWindow):
lang="ch",
gpu=False,
default_filename=None,
- default_predicted_class_file=None,
+ default_predefined_class_file=None,
default_save_dir=None):
super(MainWindow, self).__init__()
self.setWindowTitle(__appname__)
@@ -116,7 +116,7 @@ class MainWindow(QMainWindow):
self.screencast = "https://github.com/PaddlePaddle/PaddleOCR"
# Load predefined classes to the list
- self.loadPredefinedClasses(default_predicted_class_file)
+ self.loadPredefinedClasses(default_predefined_class_file)
# Main widgets and related state.
self.labelDialog = LabelDialog(parent=self, listItem=self.labelHist)
@@ -153,10 +153,10 @@ class MainWindow(QMainWindow):
fileListContainer = QWidget()
fileListContainer.setLayout(filelistLayout)
self.fileListName = getStr('fileList')
- self.file_dock = QDockWidget(self.fileListName, self)
- self.file_dock.setObjectName(getStr('files'))
- self.file_dock.setWidget(fileListContainer)
- self.addDockWidget(Qt.LeftDockWidgetArea, self.file_dock)
+ self.fileDock = QDockWidget(self.fileListName, self)
+ self.fileDock.setObjectName(getStr('files'))
+ self.fileDock.setWidget(fileListContainer)
+ self.addDockWidget(Qt.LeftDockWidgetArea, self.fileDock)
# ================== Right Area ==================
listLayout = QVBoxLayout()
@@ -317,7 +317,7 @@ class MainWindow(QMainWindow):
self.addDockWidget(Qt.RightDockWidgetArea, self.dock)
self.dock.setFeatures(QDockWidget.DockWidgetClosable | QDockWidget.DockWidgetFloatable)
- self.file_dock.setFeatures(QDockWidget.NoDockWidgetFeatures)
+ self.fileDock.setFeatures(QDockWidget.NoDockWidgetFeatures)
# ================== Actions ==================
action = partial(newAction, self)
@@ -1343,7 +1343,7 @@ class MainWindow(QMainWindow):
# show file list image count
select_indexes = self.fileListWidget.selectedIndexes()
if len(select_indexes) > 0:
- self.file_dock.setWindowTitle(self.fileListName + f" ({select_indexes[0].row() + 1}"
+ 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()})")
@@ -1555,7 +1555,7 @@ class MainWindow(QMainWindow):
self.actions.rotateRight.setEnabled(True)
self.fileListWidget.setCurrentRow(0) # set list index to first
- self.file_dock.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:
@@ -2186,7 +2186,7 @@ def get_main_app(argv=[]):
win = MainWindow(lang=args.lang,
gpu=args.gpu,
- default_predicted_class_file=args.predefined_classes_file)
+ default_predefined_class_file=args.predefined_classes_file)
win.show()
return app, win
diff --git a/PPOCRLabel/README.md b/PPOCRLabel/README.md
index 5fa65bbb6..19e54ab14 100644
--- a/PPOCRLabel/README.md
+++ b/PPOCRLabel/README.md
@@ -9,16 +9,7 @@ PPOCRLabel is a semi-automatic graphic annotation tool suitable for OCR field, w
### Recent Update
- 2022.01：（by [PeterH0323](https://github.com/peterh0323) ）
- - Optimize multiple Chinese prompt messages
- - Optimize software startup
- - Change the shortcut key for deletion to [Alt + x]
- - New feature: Add count of pictures and labels on the left and right sides.
- - New feature: Add time display when [Auto Label]
- - New feature: use the shortcut keys [x] and [C] to rotate the box
- - Fixed: After automatic recognition, rotating the picture directly without clicking on the file list will cause an error: the array exceeds the index
- - Fixed: When zooming in and out with the shortcut keys, the zoom slider will not change
- - Fixed: When using paddlepaddle-gpu to automatically label, the CPU is still used for infer
- - Fixed: In the picture preview bar below, the tool tip background is black
+ - 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))
diff --git a/PPOCRLabel/README_ch.md b/PPOCRLabel/README_ch.md
index 0ba00c603..222633663 100644
--- a/PPOCRLabel/README_ch.md
+++ b/PPOCRLabel/README_ch.md
@@ -9,16 +9,7 @@ PPOCRLabel是一款适用于OCR领域的半自动化图形标注工具，内置P
#### 近期更新
- 2022.01：（by [PeterH0323](https://github.com/peterh0323) ）
- - 优化多处中文提示信息
- - 优化软件启动
- - 更改删除快捷键为【Alt+X】
- - 新功能：在左右两边的 ListWidget 加入数量显示
- - 新功能：在【自动标注】的时候加上时间显示
- - 新功能：使用快捷键【X】、【C】来对框进行旋转
- - Fixed: 在自动识别后，不单击文件列表，直接执行旋转图片，会引发错误：数组超出索引
- - Fixed: 使用快捷键放大缩小的时候，Zoom Slider 不会跟着变化
- - Fixed: 使用 paddlepaddle-gpu 自动打标签的时候还是使用 CPU 进行推理
- - Fixed: 下方图片预览栏，鼠标悬停显示的 Tool Tip 背景是黑色
+ - 提升用户体验：新增文件与标记数目提示、优化交互、修复gpu使用等问题
- 2021.11.17：
- 新增支持通过whl包安装和启动PPOCRLabel（by [d2623587501](https://github.com/d2623587501)）
- 标注数据集切分：对标注数据进行训练、验证与测试集划分（参考下方3.5节，by [MrCuiHao](https://github.com/MrCuiHao)）