sunwen/GUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some display setting and logic

Browse Source
This commit is contained in:
Krad
2023-03-28 14:08:02 +08:00
parent 3a6a755ef1
commit ba2daf58a5
6 changed files with 146 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.idea/misc.xml generated
View File

@@ -4,4 +4,7 @@
<component name="JavaScriptSettings">
<option name="languageLevel" value="ES6" />
</component>
<component name="ProjectPlainTextFileTypeManager">
<file url="file://$PROJECT_DIR$/src/translations/zh_CN.ts" />
</component>
</project>

27
src/device/DeviceManager.cpp
View File

@@ -103,15 +103,6 @@ void DeviceManager::startScan(const char* json, bool empty) {
static QString msg = "Start scan...";
AppGlobalValues::setInProcessing(true);
TRIGGER_EVENT(GUIEvents::InvokeOperationStart, nullptr, (QObject*)&msg);
qDebug() << "SetScanInfo>>>>>>>>>>>>>>>>>>>>";
AppGlobalValues::setEmptyScanFlag(empty);
int ret = SetScanInfo(json, empty ? 1 : 0);
if (ret) {
qDebug() << ">>>>>>>>>>>>>>>>>>>>SetScanInfo failed";
THROW_ERROR("Transfer patient information fail!")
return;
}
qDebug() << ">>>>>>>>>>>>>>>>>>>>SetScanInfo success";
postScanCommand();
}
@@ -188,24 +179,6 @@ void DeviceManager::prepareFinishScan() {
// stop normal scan with prompt
TRIGGER_EVENT(InvokeOperationEnd, nullptr, (QObject *) &var);
AppGlobalValues::setInProcessing(false);
// get output data path
QString outputPath = GetDeviceInfo(DEV_OUTPATH);
outputPath = outputPath.replace("\\", "/");
// get scan ID from path
if (outputPath.endsWith('/')) outputPath = outputPath.remove(outputPath.length() - 1, 1);
QStringList list = outputPath.split('/');
if (list.length()) {
if (AppGlobalValues::EmptyScanFlag().toBool()) {
ScanJson::Current()->setEmptyScanID(list.last().toStdString().c_str());
} else {
ScanJson::Current()->setScanID(list.last().toStdString().c_str());
}
// save json
ScanJson::Current()->save();
} else {
THROW_ERROR("Scan Output Path error!")
}
}
void DeviceManager::stopScan() {

BIN
src/translations/zh_CN.qm
View File

Binary file not shown.

85
src/translations/zh_CN.ts
View File

@@ -253,22 +253,22 @@
</message>
</context>
<context>
<name>AdminSettingForm</name>
<name>SettingFormWidget</name>
<message>
<location filename="../AdminSettingForm.cpp" line="32"/>
<location filename="../AdminSettingForm.cpp" line="82"/>
<location filename="../SettingFormWidget.cpp" line="32"/>
<location filename="../SettingFormWidget.cpp" line="82"/>
<source>General</source>
<translation>通用</translation>
</message>
<message>
<location filename="../AdminSettingForm.cpp" line="32"/>
<location filename="../AdminSettingForm.cpp" line="82"/>
<location filename="../SettingFormWidget.cpp" line="32"/>
<location filename="../SettingFormWidget.cpp" line="82"/>
<source>Account</source>
<translation>用户</translation>
<translation>账号</translation>
</message>
<message>
<location filename="../AdminSettingForm.cpp" line="32"/>
<location filename="../AdminSettingForm.cpp" line="82"/>
<location filename="../SettingFormWidget.cpp" line="32"/>
<location filename="../SettingFormWidget.cpp" line="82"/>
<source>System</source>
<translation>系统</translation>
</message>
@@ -297,8 +297,8 @@
<translation type="vanished">操作日志</translation>
</message>
<message>
<location filename="../AdminSettingForm.cpp" line="32"/>
<location filename="../AdminSettingForm.cpp" line="82"/>
<location filename="../SettingFormWidget.cpp" line="32"/>
<location filename="../SettingFormWidget.cpp" line="82"/>
<source>About</source>
<translation>关于</translation>
</message>
@@ -426,6 +426,59 @@
<translation>接受</translation>
</message>
</context>
<context>
<name>EditPatientDialog</name>
<message>
<location filename="../dialogs/EditPatientDialog.cpp" line="35"/>
<source>Edit Patient</source>
<translation>修改患者信息</translation>
</message>
<message>
<location filename="../dialogs/EditPatientDialog.cpp" line="41"/>
<source>ID</source>
<translation></translation>
</message>
<message>
<location filename="../dialogs/EditPatientDialog.cpp" line="50"/>
<source>Name</source>
<translation>姓名</translation>
</message>
<message>
<location filename="../dialogs/EditPatientDialog.cpp" line="87"/>
<source>Birth Date</source>
<translation>出生日期</translation>
</message>
<message>
<location filename="../dialogs/EditPatientDialog.cpp" line="106"/>
<source>Comment</source>
<translation>备注</translation>
</message>
<message>
<location filename="../dialogs/EditPatientDialog.cpp" line="59"/>
<source>Gender</source>
<translation>性别</translation>
</message>
<message>
<location filename="../dialogs/EditPatientDialog.cpp" line="62"/>
<source>Female</source>
<translation>女</translation>
</message>
<message>
<location filename="../dialogs/EditPatientDialog.cpp" line="69"/>
<source>Male</source>
<translation>男</translation>
</message>
<message>
<location filename="../dialogs/EditPatientDialog.cpp" line="69"/>
<source>Cancel</source>
<translation>取消</translation>
</message>
<message>
<source>Accept</source>
<translation>接受</translation>
</message>
</context>
<context>
<name>GUIFormBaseDialog</name>
<message>
@@ -561,29 +614,29 @@
</message>
</context>
<context>
<name>LoginWindow</name>
<name>LoginDialog</name>
<message>
<location filename="../loginwindow.cpp" line="54"/>
<location filename="../LoginDialog.cpp" line="54"/>
<source>U S C T</source>
<translation></translation>
</message>
<message>
<location filename="../loginwindow.cpp" line="71"/>
<location filename="../LoginDialog.cpp" line="71"/>
<source>Username</source>
<translation>用户名</translation>
</message>
<message>
<location filename="../loginwindow.cpp" line="78"/>
<location filename="../LoginDialog.cpp" line="78"/>
<source>Password</source>
<translation>密码</translation>
</message>
<message>
<location filename="../loginwindow.cpp" line="82"/>
<location filename="../LoginDialog.cpp" line="91"/>
<source>Login</source>
<translation>登录</translation>
</message>
<message>
<source>login</source>
<source>Login</source>
<translation type="vanished">登录</translation>
</message>
</context>

85
src/translations/zh_CN.ts.bak
View File

@@ -253,22 +253,22 @@
</message>
</context>
<context>
<name>AdminSettingForm</name>
<name>SettingFormWidget</name>
<message>
<location filename="../AdminSettingForm.cpp" line="32"/>
<location filename="../AdminSettingForm.cpp" line="82"/>
<location filename="../SettingFormWidget.cpp" line="32"/>
<location filename="../SettingFormWidget.cpp" line="82"/>
<source>General</source>
<translation>通用</translation>
</message>
<message>
<location filename="../AdminSettingForm.cpp" line="32"/>
<location filename="../AdminSettingForm.cpp" line="82"/>
<location filename="../SettingFormWidget.cpp" line="32"/>
<location filename="../SettingFormWidget.cpp" line="82"/>
<source>Account</source>
<translation>用户</translation>
<translation>账号</translation>
</message>
<message>
<location filename="../AdminSettingForm.cpp" line="32"/>
<location filename="../AdminSettingForm.cpp" line="82"/>
<location filename="../SettingFormWidget.cpp" line="32"/>
<location filename="../SettingFormWidget.cpp" line="82"/>
<source>System</source>
<translation>系统</translation>
</message>
@@ -297,8 +297,8 @@
<translation type="vanished">操作日志</translation>
</message>
<message>
<location filename="../AdminSettingForm.cpp" line="32"/>
<location filename="../AdminSettingForm.cpp" line="82"/>
<location filename="../SettingFormWidget.cpp" line="32"/>
<location filename="../SettingFormWidget.cpp" line="82"/>
<source>About</source>
<translation>关于</translation>
</message>
@@ -426,6 +426,59 @@
<translation>接受</translation>
</message>
</context>
<context>
<name>EditPatientDialog</name>
<message>
<location filename="../dialogs/EditPatientDialog.cpp" line="35"/>
<source>Edit Patient</source>
<translation>修改患者信息</translation>
</message>
<message>
<location filename="../dialogs/EditPatientDialog.cpp" line="41"/>
<source>ID</source>
<translation></translation>
</message>
<message>
<location filename="../dialogs/EditPatientDialog.cpp" line="50"/>
<source>Name</source>
<translation>姓名</translation>
</message>
<message>
<location filename="../dialogs/EditPatientDialog.cpp" line="87"/>
<source>Birth Date</source>
<translation>出生日期</translation>
</message>
<message>
<location filename="../dialogs/EditPatientDialog.cpp" line="106"/>
<source>Comment</source>
<translation>备注</translation>
</message>
<message>
<location filename="../dialogs/EditPatientDialog.cpp" line="59"/>
<source>Gender</source>
<translation>性别</translation>
</message>
<message>
<location filename="../dialogs/EditPatientDialog.cpp" line="62"/>
<source>Female</source>
<translation>女</translation>
</message>
<message>
<location filename="../dialogs/EditPatientDialog.cpp" line="69"/>
<source>Male</source>
<translation>男</translation>
</message>
<message>
<location filename="../dialogs/EditPatientDialog.cpp" line="69"/>
<source>Cancel</source>
<translation>取消</translation>
</message>
<message>
<source>Accept</source>
<translation>接受</translation>
</message>
</context>
<context>
<name>GUIFormBaseDialog</name>
<message>
@@ -561,29 +614,29 @@
</message>
</context>
<context>
<name>LoginWindow</name>
<name>LoginDialog</name>
<message>
<location filename="../loginwindow.cpp" line="54"/>
<location filename="../LoginDialog.cpp" line="54"/>
<source>U S C T</source>
<translation></translation>
</message>
<message>
<location filename="../loginwindow.cpp" line="71"/>
<location filename="../LoginDialog.cpp" line="71"/>
<source>Username</source>
<translation>用户名</translation>
</message>
<message>
<location filename="../loginwindow.cpp" line="78"/>
<location filename="../LoginDialog.cpp" line="78"/>
<source>Password</source>
<translation>密码</translation>
</message>
<message>
<location filename="../loginwindow.cpp" line="82"/>
<location filename="../LoginDialog.cpp" line="91"/>
<source>Login</source>
<translation>登录</translation>
</message>
<message>
<source>login</source>
<source>Login</source>
<translation type="vanished">登录</translation>
</message>
</context>

9
src/windows/MainWindow.cpp
View File

@@ -107,16 +107,17 @@ void MainWindow::initializeTabWidget()
mTabWidget->addTab(selectForm, tr("Select"));
auto scanForm = new ScanFormWidget(this);
mTabWidget->addTab(scanForm, tr("Scan"));
auto verifyForm = new TabFormWidget(this);
mTabWidget->addTab(verifyForm, tr("Verify"));
// auto verifyForm = new TabFormWidget(this);
// mTabWidget->addTab(verifyForm, tr("Verify"));
mTabWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
}
void MainWindow::reloadLanguage() {
mTabWidget->setTabText(0, tr("Select"));
mTabWidget->setTabText(1, tr("Scan"));
mTabWidget->setTabText(2, tr("Verify"));
mTabWidget->setTabText(3, tr("Settings"));
// mTabWidget->setTabText(2, tr("Verify"));
mTabWidget->setTabText(2, tr("Settings"));
}
void MainWindow::switchToScanTab() { mTabWidget->setCurrentIndex(1); }