提交 26c1a03d 编写于 作者: H HinGwenWoong

modified according review

上级 089de07a
...@@ -64,7 +64,7 @@ class MainWindow(QMainWindow): ...@@ -64,7 +64,7 @@ class MainWindow(QMainWindow):
lang="ch", lang="ch",
gpu=False, gpu=False,
default_filename=None, default_filename=None,
default_predicted_class_file=None, default_predefined_class_file=None,
default_save_dir=None): default_save_dir=None):
super(MainWindow, self).__init__() super(MainWindow, self).__init__()
self.setWindowTitle(__appname__) self.setWindowTitle(__appname__)
...@@ -116,7 +116,7 @@ class MainWindow(QMainWindow): ...@@ -116,7 +116,7 @@ class MainWindow(QMainWindow):
self.screencast = "https://github.com/PaddlePaddle/PaddleOCR" self.screencast = "https://github.com/PaddlePaddle/PaddleOCR"
# Load predefined classes to the list # Load predefined classes to the list
self.loadPredefinedClasses(default_predicted_class_file) self.loadPredefinedClasses(default_predefined_class_file)
# Main widgets and related state. # Main widgets and related state.
self.labelDialog = LabelDialog(parent=self, listItem=self.labelHist) self.labelDialog = LabelDialog(parent=self, listItem=self.labelHist)
...@@ -153,10 +153,10 @@ class MainWindow(QMainWindow): ...@@ -153,10 +153,10 @@ class MainWindow(QMainWindow):
fileListContainer = QWidget() fileListContainer = QWidget()
fileListContainer.setLayout(filelistLayout) fileListContainer.setLayout(filelistLayout)
self.fileListName = getStr('fileList') self.fileListName = getStr('fileList')
self.file_dock = QDockWidget(self.fileListName, self) self.fileDock = QDockWidget(self.fileListName, self)
self.file_dock.setObjectName(getStr('files')) self.fileDock.setObjectName(getStr('files'))
self.file_dock.setWidget(fileListContainer) self.fileDock.setWidget(fileListContainer)
self.addDockWidget(Qt.LeftDockWidgetArea, self.file_dock) self.addDockWidget(Qt.LeftDockWidgetArea, self.fileDock)
# ================== Right Area ================== # ================== Right Area ==================
listLayout = QVBoxLayout() listLayout = QVBoxLayout()
...@@ -317,7 +317,7 @@ class MainWindow(QMainWindow): ...@@ -317,7 +317,7 @@ class MainWindow(QMainWindow):
self.addDockWidget(Qt.RightDockWidgetArea, self.dock) self.addDockWidget(Qt.RightDockWidgetArea, self.dock)
self.dock.setFeatures(QDockWidget.DockWidgetClosable | QDockWidget.DockWidgetFloatable) self.dock.setFeatures(QDockWidget.DockWidgetClosable | QDockWidget.DockWidgetFloatable)
self.file_dock.setFeatures(QDockWidget.NoDockWidgetFeatures) self.fileDock.setFeatures(QDockWidget.NoDockWidgetFeatures)
# ================== Actions ================== # ================== Actions ==================
action = partial(newAction, self) action = partial(newAction, self)
...@@ -1343,7 +1343,7 @@ class MainWindow(QMainWindow): ...@@ -1343,7 +1343,7 @@ class MainWindow(QMainWindow):
# show file list image count # show file list image count
select_indexes = self.fileListWidget.selectedIndexes() select_indexes = self.fileListWidget.selectedIndexes()
if len(select_indexes) > 0: 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()})") f"/{self.fileListWidget.count()})")
# update show counting # update show counting
self.BoxListDock.setWindowTitle(self.BoxListDockName + f" ({self.BoxList.count()})") self.BoxListDock.setWindowTitle(self.BoxListDockName + f" ({self.BoxList.count()})")
...@@ -1555,7 +1555,7 @@ class MainWindow(QMainWindow): ...@@ -1555,7 +1555,7 @@ class MainWindow(QMainWindow):
self.actions.rotateRight.setEnabled(True) self.actions.rotateRight.setEnabled(True)
self.fileListWidget.setCurrentRow(0) # set list index to first 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): def openPrevImg(self, _value=False):
if len(self.mImgList) <= 0: if len(self.mImgList) <= 0:
...@@ -2186,7 +2186,7 @@ def get_main_app(argv=[]): ...@@ -2186,7 +2186,7 @@ def get_main_app(argv=[]):
win = MainWindow(lang=args.lang, win = MainWindow(lang=args.lang,
gpu=args.gpu, gpu=args.gpu,
default_predicted_class_file=args.predefined_classes_file) default_predefined_class_file=args.predefined_classes_file)
win.show() win.show()
return app, win return app, win
......
...@@ -9,16 +9,7 @@ PPOCRLabel is a semi-automatic graphic annotation tool suitable for OCR field, w ...@@ -9,16 +9,7 @@ PPOCRLabel is a semi-automatic graphic annotation tool suitable for OCR field, w
### Recent Update ### Recent Update
- 2022.01:(by [PeterH0323](https://github.com/peterh0323) - 2022.01:(by [PeterH0323](https://github.com/peterh0323)
- Optimize multiple Chinese prompt messages - Improve user experience: prompt for the number of files and labels, optimize interaction, and fix bugs such as only use CPU when inference
- 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
- 2021.11.17: - 2021.11.17:
- Support install and start PPOCRLabel through the whl package (by [d2623587501](https://github.com/d2623587501)) - 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)) - Dataset segmentation: Divide the annotation file into training, verification and testing parts (refer to section 3.5 below, by [MrCuiHao](https://github.com/MrCuiHao))
......
...@@ -9,16 +9,7 @@ PPOCRLabel是一款适用于OCR领域的半自动化图形标注工具,内置P ...@@ -9,16 +9,7 @@ PPOCRLabel是一款适用于OCR领域的半自动化图形标注工具,内置P
#### 近期更新 #### 近期更新
- 2022.01:(by [PeterH0323](https://github.com/peterh0323) - 2022.01:(by [PeterH0323](https://github.com/peterh0323)
- 优化多处中文提示信息 - 提升用户体验:新增文件与标记数目提示、优化交互、修复gpu使用等问题
- 优化软件启动
- 更改删除快捷键为【Alt+X】
- 新功能:在左右两边的 ListWidget 加入数量显示
- 新功能:在【自动标注】的时候加上时间显示
- 新功能:使用快捷键【X】、【C】来对框进行旋转
- Fixed: 在自动识别后,不单击文件列表,直接执行旋转图片,会引发错误:数组超出索引
- Fixed: 使用快捷键放大缩小的时候,Zoom Slider 不会跟着变化
- Fixed: 使用 paddlepaddle-gpu 自动打标签的时候还是使用 CPU 进行推理
- Fixed: 下方图片预览栏,鼠标悬停显示的 Tool Tip 背景是黑色
- 2021.11.17: - 2021.11.17:
- 新增支持通过whl包安装和启动PPOCRLabel(by [d2623587501](https://github.com/d2623587501) - 新增支持通过whl包安装和启动PPOCRLabel(by [d2623587501](https://github.com/d2623587501)
- 标注数据集切分:对标注数据进行训练、验证与测试集划分(参考下方3.5节,by [MrCuiHao](https://github.com/MrCuiHao) - 标注数据集切分:对标注数据进行训练、验证与测试集划分(参考下方3.5节,by [MrCuiHao](https://github.com/MrCuiHao)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册