diff --git a/.idea/misc.xml b/.idea/misc.xml
index 8822db8..bab9f7e 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,4 +4,7 @@
+
+
+
\ No newline at end of file
diff --git a/src/device/DeviceManager.cpp b/src/device/DeviceManager.cpp
index 5c98f7c..66bba1b 100644
--- a/src/device/DeviceManager.cpp
+++ b/src/device/DeviceManager.cpp
@@ -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() {
diff --git a/src/translations/zh_CN.qm b/src/translations/zh_CN.qm
index c7046c0..d189d52 100644
Binary files a/src/translations/zh_CN.qm and b/src/translations/zh_CN.qm differ
diff --git a/src/translations/zh_CN.ts b/src/translations/zh_CN.ts
index 0f17527..c90d368 100644
--- a/src/translations/zh_CN.ts
+++ b/src/translations/zh_CN.ts
@@ -253,22 +253,22 @@
- AdminSettingForm
+ SettingFormWidget
-
-
+
+
General
通用
-
-
+
+
Account
- 用户
+ 账号
-
-
+
+
System
系统
@@ -297,8 +297,8 @@
操作日志
-
-
+
+
About
关于
@@ -426,6 +426,59 @@
接受
+
+ EditPatientDialog
+
+
+ Edit Patient
+ 修改患者信息
+
+
+
+ ID
+
+
+
+
+ Name
+ 姓名
+
+
+
+ Birth Date
+ 出生日期
+
+
+
+ Comment
+ 备注
+
+
+
+ Gender
+ 性别
+
+
+
+ Female
+ 女
+
+
+
+ Male
+ 男
+
+
+
+ Cancel
+ 取消
+
+
+ Accept
+ 接受
+
+
+
GUIFormBaseDialog
@@ -561,29 +614,29 @@
- LoginWindow
+ LoginDialog
-
+
U S C T
-
+
Username
用户名
-
+
Password
密码
-
+
Login
登录
- login
+ Login
登录
diff --git a/src/translations/zh_CN.ts.bak b/src/translations/zh_CN.ts.bak
index 0f17527..c90d368 100644
--- a/src/translations/zh_CN.ts.bak
+++ b/src/translations/zh_CN.ts.bak
@@ -253,22 +253,22 @@
- AdminSettingForm
+ SettingFormWidget
-
-
+
+
General
通用
-
-
+
+
Account
- 用户
+ 账号
-
-
+
+
System
系统
@@ -297,8 +297,8 @@
操作日志
-
-
+
+
About
关于
@@ -426,6 +426,59 @@
接受
+
+ EditPatientDialog
+
+
+ Edit Patient
+ 修改患者信息
+
+
+
+ ID
+
+
+
+
+ Name
+ 姓名
+
+
+
+ Birth Date
+ 出生日期
+
+
+
+ Comment
+ 备注
+
+
+
+ Gender
+ 性别
+
+
+
+ Female
+ 女
+
+
+
+ Male
+ 男
+
+
+
+ Cancel
+ 取消
+
+
+ Accept
+ 接受
+
+
+
GUIFormBaseDialog
@@ -561,29 +614,29 @@
- LoginWindow
+ LoginDialog
-
+
U S C T
-
+
Username
用户名
-
+
Password
密码
-
+
Login
登录
- login
+ Login
登录
diff --git a/src/windows/MainWindow.cpp b/src/windows/MainWindow.cpp
index 9d0fe70..d9c5d4d 100644
--- a/src/windows/MainWindow.cpp
+++ b/src/windows/MainWindow.cpp
@@ -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); }