wip: refactor

This commit is contained in:
2023-08-15 14:23:06 +08:00
parent 7e0aaeef35
commit 0126ce6b9a
13 changed files with 1010 additions and 734 deletions

View File

@ -0,0 +1,174 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>OcrQueue</class>
<widget class="QWidget" name="OcrQueue">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>741</width>
<height>372</height>
</rect>
</property>
<property name="windowTitle">
<string>OcrQueue</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>ocr.title</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QGroupBox" name="groupBox_3">
<property name="title">
<string>ocr.queue.title</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QPushButton" name="ocr_addImageButton">
<property name="text">
<string>ocr.queue.addImageButton</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="ocr_removeSelectedButton">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string>ocr.queue.removeSelected</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="ocr_removeAllButton">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string>ocr.queue.removeAll</string>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="ocr_startButton">
<property name="text">
<string>ocr.queue.startOcrButton</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QTableView" name="tableView">
<property name="editTriggers">
<set>QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed</set>
</property>
<property name="selectionMode">
<enum>QAbstractItemView::MultiSelection</enum>
</property>
<property name="selectionBehavior">
<enum>QAbstractItemView::SelectRows</enum>
</property>
<property name="verticalScrollMode">
<enum>QAbstractItemView::ScrollPerPixel</enum>
</property>
<property name="horizontalScrollMode">
<enum>QAbstractItemView::ScrollPerPixel</enum>
</property>
</widget>
</item>
<item>
<widget class="QProgressBar" name="progressBar">
<property name="minimum">
<number>0</number>
</property>
<property name="maximum">
<number>0</number>
</property>
<property name="value">
<number>0</number>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="format">
<string notr="true">%v/%m - %p%</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QGroupBox" name="groupBox_5">
<property name="title">
<string>ocr.results</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<widget class="QPushButton" name="ocr_acceptSelectedButton">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string>ocr.results.acceptSelectedButton</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="ocr_acceptAllButton">
<property name="text">
<string>ocr.results.acceptAllButton</string>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QCheckBox" name="ocr_ignoreValidateCheckBox">
<property name="text">
<string>ocr.results.ignoreValidate</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>

View File

@ -0,0 +1,141 @@
# -*- coding: utf-8 -*-
################################################################################
## Form generated from reading UI file 'ocrQueue.ui'
##
## Created by: Qt User Interface Compiler version 6.5.1
##
## WARNING! All changes made in this file will be lost when recompiling UI file!
################################################################################
from PySide6.QtCore import (QCoreApplication, QDate, QDateTime, QLocale,
QMetaObject, QObject, QPoint, QRect,
QSize, QTime, QUrl, Qt)
from PySide6.QtGui import (QBrush, QColor, QConicalGradient, QCursor,
QFont, QFontDatabase, QGradient, QIcon,
QImage, QKeySequence, QLinearGradient, QPainter,
QPalette, QPixmap, QRadialGradient, QTransform)
from PySide6.QtWidgets import (QAbstractItemView, QApplication, QCheckBox, QGroupBox,
QHBoxLayout, QHeaderView, QProgressBar, QPushButton,
QSizePolicy, QSpacerItem, QTableView, QVBoxLayout,
QWidget)
class Ui_OcrQueue(object):
def setupUi(self, OcrQueue):
if not OcrQueue.objectName():
OcrQueue.setObjectName(u"OcrQueue")
OcrQueue.resize(741, 372)
self.verticalLayout = QVBoxLayout(OcrQueue)
self.verticalLayout.setObjectName(u"verticalLayout")
self.groupBox_2 = QGroupBox(OcrQueue)
self.groupBox_2.setObjectName(u"groupBox_2")
self.horizontalLayout = QHBoxLayout(self.groupBox_2)
self.horizontalLayout.setObjectName(u"horizontalLayout")
self.groupBox_3 = QGroupBox(self.groupBox_2)
self.groupBox_3.setObjectName(u"groupBox_3")
self.verticalLayout_2 = QVBoxLayout(self.groupBox_3)
self.verticalLayout_2.setObjectName(u"verticalLayout_2")
self.ocr_addImageButton = QPushButton(self.groupBox_3)
self.ocr_addImageButton.setObjectName(u"ocr_addImageButton")
self.verticalLayout_2.addWidget(self.ocr_addImageButton)
self.ocr_removeSelectedButton = QPushButton(self.groupBox_3)
self.ocr_removeSelectedButton.setObjectName(u"ocr_removeSelectedButton")
self.ocr_removeSelectedButton.setEnabled(True)
self.verticalLayout_2.addWidget(self.ocr_removeSelectedButton)
self.ocr_removeAllButton = QPushButton(self.groupBox_3)
self.ocr_removeAllButton.setObjectName(u"ocr_removeAllButton")
self.ocr_removeAllButton.setEnabled(True)
self.verticalLayout_2.addWidget(self.ocr_removeAllButton)
self.verticalSpacer = QSpacerItem(20, 40, QSizePolicy.Minimum, QSizePolicy.Expanding)
self.verticalLayout_2.addItem(self.verticalSpacer)
self.ocr_startButton = QPushButton(self.groupBox_3)
self.ocr_startButton.setObjectName(u"ocr_startButton")
self.verticalLayout_2.addWidget(self.ocr_startButton)
self.horizontalLayout.addWidget(self.groupBox_3)
self.verticalLayout_3 = QVBoxLayout()
self.verticalLayout_3.setObjectName(u"verticalLayout_3")
self.tableView = QTableView(self.groupBox_2)
self.tableView.setObjectName(u"tableView")
self.tableView.setEditTriggers(QAbstractItemView.DoubleClicked|QAbstractItemView.EditKeyPressed)
self.tableView.setSelectionMode(QAbstractItemView.MultiSelection)
self.tableView.setSelectionBehavior(QAbstractItemView.SelectRows)
self.tableView.setVerticalScrollMode(QAbstractItemView.ScrollPerPixel)
self.tableView.setHorizontalScrollMode(QAbstractItemView.ScrollPerPixel)
self.verticalLayout_3.addWidget(self.tableView)
self.progressBar = QProgressBar(self.groupBox_2)
self.progressBar.setObjectName(u"progressBar")
self.progressBar.setMinimum(0)
self.progressBar.setMaximum(0)
self.progressBar.setValue(0)
self.progressBar.setAlignment(Qt.AlignCenter)
self.progressBar.setFormat(u"%v/%m - %p%")
self.verticalLayout_3.addWidget(self.progressBar)
self.horizontalLayout.addLayout(self.verticalLayout_3)
self.groupBox_5 = QGroupBox(self.groupBox_2)
self.groupBox_5.setObjectName(u"groupBox_5")
self.verticalLayout_4 = QVBoxLayout(self.groupBox_5)
self.verticalLayout_4.setObjectName(u"verticalLayout_4")
self.ocr_acceptSelectedButton = QPushButton(self.groupBox_5)
self.ocr_acceptSelectedButton.setObjectName(u"ocr_acceptSelectedButton")
self.ocr_acceptSelectedButton.setEnabled(True)
self.verticalLayout_4.addWidget(self.ocr_acceptSelectedButton)
self.ocr_acceptAllButton = QPushButton(self.groupBox_5)
self.ocr_acceptAllButton.setObjectName(u"ocr_acceptAllButton")
self.verticalLayout_4.addWidget(self.ocr_acceptAllButton)
self.verticalSpacer_2 = QSpacerItem(20, 40, QSizePolicy.Minimum, QSizePolicy.Expanding)
self.verticalLayout_4.addItem(self.verticalSpacer_2)
self.ocr_ignoreValidateCheckBox = QCheckBox(self.groupBox_5)
self.ocr_ignoreValidateCheckBox.setObjectName(u"ocr_ignoreValidateCheckBox")
self.verticalLayout_4.addWidget(self.ocr_ignoreValidateCheckBox)
self.horizontalLayout.addWidget(self.groupBox_5)
self.verticalLayout.addWidget(self.groupBox_2)
self.retranslateUi(OcrQueue)
QMetaObject.connectSlotsByName(OcrQueue)
# setupUi
def retranslateUi(self, OcrQueue):
OcrQueue.setWindowTitle(QCoreApplication.translate("OcrQueue", u"OcrQueue", None))
self.groupBox_2.setTitle(QCoreApplication.translate("OcrQueue", u"ocr.title", None))
self.groupBox_3.setTitle(QCoreApplication.translate("OcrQueue", u"ocr.queue.title", None))
self.ocr_addImageButton.setText(QCoreApplication.translate("OcrQueue", u"ocr.queue.addImageButton", None))
self.ocr_removeSelectedButton.setText(QCoreApplication.translate("OcrQueue", u"ocr.queue.removeSelected", None))
self.ocr_removeAllButton.setText(QCoreApplication.translate("OcrQueue", u"ocr.queue.removeAll", None))
self.ocr_startButton.setText(QCoreApplication.translate("OcrQueue", u"ocr.queue.startOcrButton", None))
self.groupBox_5.setTitle(QCoreApplication.translate("OcrQueue", u"ocr.results", None))
self.ocr_acceptSelectedButton.setText(QCoreApplication.translate("OcrQueue", u"ocr.results.acceptSelectedButton", None))
self.ocr_acceptAllButton.setText(QCoreApplication.translate("OcrQueue", u"ocr.results.acceptAllButton", None))
self.ocr_ignoreValidateCheckBox.setText(QCoreApplication.translate("OcrQueue", u"ocr.results.ignoreValidate", None))
# retranslateUi

View File

@ -55,125 +55,7 @@
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QGroupBox" name="groupBox_3">
<property name="title">
<string>ocr.queue.title</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QPushButton" name="ocr_addImageButton">
<property name="text">
<string>ocr.queue.addImageButton</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="ocr_removeSelectedButton">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string>ocr.queue.removeSelected</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="ocr_removeAllButton">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string>ocr.queue.removeAll</string>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="ocr_startButton">
<property name="text">
<string>ocr.queue.startOcrButton</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QTableView" name="tableView">
<property name="editTriggers">
<set>QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed</set>
</property>
<property name="selectionMode">
<enum>QAbstractItemView::MultiSelection</enum>
</property>
<property name="selectionBehavior">
<enum>QAbstractItemView::SelectRows</enum>
</property>
<property name="verticalScrollMode">
<enum>QAbstractItemView::ScrollPerPixel</enum>
</property>
<property name="horizontalScrollMode">
<enum>QAbstractItemView::ScrollPerPixel</enum>
</property>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_5">
<property name="title">
<string>ocr.results</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<widget class="QPushButton" name="ocr_acceptSelectedButton">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string>ocr.results.acceptSelectedButton</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="ocr_acceptAllButton">
<property name="text">
<string>ocr.results.acceptAllButton</string>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QCheckBox" name="ocr_ignoreValidateCheckBox">
<property name="text">
<string>ocr.results.ignoreValidate</string>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="OcrQueue" name="ocrQueue" native="true"/>
</item>
</layout>
</widget>
@ -192,6 +74,12 @@
<extends>QComboBox</extends>
<header>ui.implements.components</header>
</customwidget>
<customwidget>
<class>OcrQueue</class>
<extends>QWidget</extends>
<header>ui.implements.components</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources/>
<connections/>

View File

@ -3,7 +3,7 @@
################################################################################
## Form generated from reading UI file 'tabOcr.ui'
##
## Created by: Qt User Interface Compiler version 6.5.0
## Created by: Qt User Interface Compiler version 6.5.1
##
## WARNING! All changes made in this file will be lost when recompiling UI file!
################################################################################
@ -15,11 +15,10 @@ from PySide6.QtGui import (QBrush, QColor, QConicalGradient, QCursor,
QFont, QFontDatabase, QGradient, QIcon,
QImage, QKeySequence, QLinearGradient, QPainter,
QPalette, QPixmap, QRadialGradient, QTransform)
from PySide6.QtWidgets import (QAbstractItemView, QApplication, QCheckBox, QGroupBox,
QHBoxLayout, QHeaderView, QPushButton, QSizePolicy,
QSpacerItem, QTableView, QVBoxLayout, QWidget)
from PySide6.QtWidgets import (QApplication, QGroupBox, QHBoxLayout, QPushButton,
QSizePolicy, QVBoxLayout, QWidget)
from ui.implements.components import (DevicesComboBox, FileSelector)
from ui.implements.components import (DevicesComboBox, FileSelector, OcrQueue)
class Ui_TabOcr(object):
def setupUi(self, TabOcr):
@ -67,75 +66,10 @@ class Ui_TabOcr(object):
self.groupBox_2.setObjectName(u"groupBox_2")
self.horizontalLayout = QHBoxLayout(self.groupBox_2)
self.horizontalLayout.setObjectName(u"horizontalLayout")
self.groupBox_3 = QGroupBox(self.groupBox_2)
self.groupBox_3.setObjectName(u"groupBox_3")
self.verticalLayout_2 = QVBoxLayout(self.groupBox_3)
self.verticalLayout_2.setObjectName(u"verticalLayout_2")
self.ocr_addImageButton = QPushButton(self.groupBox_3)
self.ocr_addImageButton.setObjectName(u"ocr_addImageButton")
self.ocrQueue = OcrQueue(self.groupBox_2)
self.ocrQueue.setObjectName(u"ocrQueue")
self.verticalLayout_2.addWidget(self.ocr_addImageButton)
self.ocr_removeSelectedButton = QPushButton(self.groupBox_3)
self.ocr_removeSelectedButton.setObjectName(u"ocr_removeSelectedButton")
self.ocr_removeSelectedButton.setEnabled(True)
self.verticalLayout_2.addWidget(self.ocr_removeSelectedButton)
self.ocr_removeAllButton = QPushButton(self.groupBox_3)
self.ocr_removeAllButton.setObjectName(u"ocr_removeAllButton")
self.ocr_removeAllButton.setEnabled(True)
self.verticalLayout_2.addWidget(self.ocr_removeAllButton)
self.verticalSpacer = QSpacerItem(20, 40, QSizePolicy.Minimum, QSizePolicy.Expanding)
self.verticalLayout_2.addItem(self.verticalSpacer)
self.ocr_startButton = QPushButton(self.groupBox_3)
self.ocr_startButton.setObjectName(u"ocr_startButton")
self.verticalLayout_2.addWidget(self.ocr_startButton)
self.horizontalLayout.addWidget(self.groupBox_3)
self.tableView = QTableView(self.groupBox_2)
self.tableView.setObjectName(u"tableView")
self.tableView.setEditTriggers(QAbstractItemView.DoubleClicked|QAbstractItemView.EditKeyPressed)
self.tableView.setSelectionMode(QAbstractItemView.MultiSelection)
self.tableView.setSelectionBehavior(QAbstractItemView.SelectRows)
self.tableView.setVerticalScrollMode(QAbstractItemView.ScrollPerPixel)
self.tableView.setHorizontalScrollMode(QAbstractItemView.ScrollPerPixel)
self.horizontalLayout.addWidget(self.tableView)
self.groupBox_5 = QGroupBox(self.groupBox_2)
self.groupBox_5.setObjectName(u"groupBox_5")
self.verticalLayout_4 = QVBoxLayout(self.groupBox_5)
self.verticalLayout_4.setObjectName(u"verticalLayout_4")
self.ocr_acceptSelectedButton = QPushButton(self.groupBox_5)
self.ocr_acceptSelectedButton.setObjectName(u"ocr_acceptSelectedButton")
self.ocr_acceptSelectedButton.setEnabled(True)
self.verticalLayout_4.addWidget(self.ocr_acceptSelectedButton)
self.ocr_acceptAllButton = QPushButton(self.groupBox_5)
self.ocr_acceptAllButton.setObjectName(u"ocr_acceptAllButton")
self.verticalLayout_4.addWidget(self.ocr_acceptAllButton)
self.verticalSpacer_2 = QSpacerItem(20, 40, QSizePolicy.Minimum, QSizePolicy.Expanding)
self.verticalLayout_4.addItem(self.verticalSpacer_2)
self.ocr_ignoreValidateCheckBox = QCheckBox(self.groupBox_5)
self.ocr_ignoreValidateCheckBox.setObjectName(u"ocr_ignoreValidateCheckBox")
self.verticalLayout_4.addWidget(self.ocr_ignoreValidateCheckBox)
self.horizontalLayout.addWidget(self.groupBox_5)
self.horizontalLayout.addWidget(self.ocrQueue)
self.verticalLayout_3.addWidget(self.groupBox_2)
@ -151,15 +85,6 @@ class Ui_TabOcr(object):
self.groupBox.setTitle(QCoreApplication.translate("TabOcr", u"deviceSelector.title", None))
self.groupBox_4.setTitle(QCoreApplication.translate("TabOcr", u"tesseractSelector.title", None))
self.groupBox_2.setTitle(QCoreApplication.translate("TabOcr", u"ocr.title", None))
self.groupBox_3.setTitle(QCoreApplication.translate("TabOcr", u"ocr.queue.title", None))
self.ocr_addImageButton.setText(QCoreApplication.translate("TabOcr", u"ocr.queue.addImageButton", None))
self.ocr_removeSelectedButton.setText(QCoreApplication.translate("TabOcr", u"ocr.queue.removeSelected", None))
self.ocr_removeAllButton.setText(QCoreApplication.translate("TabOcr", u"ocr.queue.removeAll", None))
self.ocr_startButton.setText(QCoreApplication.translate("TabOcr", u"ocr.queue.startOcrButton", None))
self.groupBox_5.setTitle(QCoreApplication.translate("TabOcr", u"ocr.results", None))
self.ocr_acceptSelectedButton.setText(QCoreApplication.translate("TabOcr", u"ocr.results.acceptSelectedButton", None))
self.ocr_acceptAllButton.setText(QCoreApplication.translate("TabOcr", u"ocr.results.acceptAllButton", None))
self.ocr_ignoreValidateCheckBox.setText(QCoreApplication.translate("TabOcr", u"ocr.results.ignoreValidate", None))
pass
# retranslateUi