From ba2daf58a585a85e648e15009e0ee5070e7d6939 Mon Sep 17 00:00:00 2001 From: Krad Date: Tue, 28 Mar 2023 14:08:02 +0800 Subject: [PATCH] Some display setting and logic --- .idea/misc.xml | 3 ++ src/device/DeviceManager.cpp | 27 ----------- src/translations/zh_CN.qm | Bin 10613 -> 11184 bytes src/translations/zh_CN.ts | 85 +++++++++++++++++++++++++++------- src/translations/zh_CN.ts.bak | 85 +++++++++++++++++++++++++++------- src/windows/MainWindow.cpp | 9 ++-- 6 files changed, 146 insertions(+), 63 deletions(-) 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 c7046c04fa8948fa2dba89048503cb0b5a00ecff..d189d5293edbf117cd279d800a4062027a86e0ba 100644 GIT binary patch delta 2010 zcmaKsdr(w$6vxlKdw+ZP?%g*m%P#CoU7|9T6oXL{1LQG?D3TVKV63H`2=7C`tFO51wm1pxU^lw#mLo`cemzW`XzP&%V1M|=c8CIF~% z0ira>DoQ>21@}u_!T1Y0rSo9<6z(jvjf=$x1OM4@HQo1!I0)&fRIg0tnn|rKbxuh zKspW(e2-~ODF@Kjvr$hmKs2zsYXlq#u%}la1u#^y-S3_TaQ?ymeiQw;_hnyyh8@5; z+2zs#Eab85_AOLE-6^}z>TuRt?zs|tAM`ypz9k<(rs7uCV1ddMO8sN5q6G_4{K{2J zyQ9!y54SA^3sD}TRE?oDL{eHuQQFJ6?M?<@cn?=MayRaRi_-ijrDF@ z8m>L29d{{~Qagdtd6etu+kp&D>U%IWQ-d*@`#JR+RG^G9D4f!gMxt-xXxK3%#;^lG z=ppM8+OQB8sj3@?Bb-TUUfhMVPNuZ%C3~vz%(syGeJ60F)uipb7ZqAXIyPNGzZ%l< zLmu9DQX-vcB`AFn=?+6`KB3g!k*DYm;d!BaPSYrq^sxNH=mY>uH>GVJpOwg=^gH>g z&aJouFY((8gK;D;Q-(gK3>(Yuuey%A6V4y>A~igva}NKH<`IBPk`$>oP63RFQ=}h$ zfE7+x?7MygE89q^TcJ2n)rtuo38|OxUl5)wEY4A({}W;H+>vPCCKT42P=RuxEgs`_ z-w7RY*lDm#cxrzYz}TsLa{=yBNV+nAVxYiUO7ehGQeLAEhB=hxlgj+M9|6p>l(jMV z*(q02nkz--EBu^rIDH&(T;z|oT&sTRfqms;h z_03GAVyC*ti@W6-r-`twcjw1?b^}eEf6a^x6;@5Z>yFLcxrR)?mRqa{Xf6*}1F0PSxp*`T5zW3)IuIkD>MqJF zbPwU}&oSA=K@IqKxQvNxO2QECfzsGzuMAwyO&juR|5cN9@XZY#T@vT-U()5i3X~~rN#mjtsHD?CL;(Jac8K V&s{Xw-#^c8_Q#oohHSe<`7g%&{G9** delta 1542 zcmZXUZBSHY6vxlqz0cmgd-v`x8!QV8yDT7CIVg=7l%a;m%c!Fg(iDt@phLUxQ#4MuFJDg#Mz)M8BtDM$I@E0P7{~dI#;EX&<#GWHk77@jn zzYLz&QnCg$p}oO+4Luo+Ro|RM`F!eMB!&h>=BVj zJEwhy(|MD`%kL4Hk%ylF1Dt_LoFP{^-DAY$uZV)cggHdk3}Pu&L}4++(&EWWn!E=F zNdl*}f-__-r{g}StC?6uEe@{Yj7TC@j|-((VxR6tBKJ6L{}4NtM--e#ro;eLUQde# zV zmlNp+eAfi0SHDDHeYa6qp^zB#7p~bRw0-zJ(PIO`Kzb#S>1|C*qfF!s()7OZEd<)2 zx$kPZ?%|&7VTY)1r3Q7A1}qawOL%$UqGZa zin|&S-ZCQY>Awx(Y08ZDiIOOkOK!cxNqCiFbIpYi*cQ`{LS^N}~)hu8M z*26@GR0i@5qNrMZ#^h-zn5AER zVg~DT^sV0OlgR9SeXF15Rr*sk0|+oIXN=gB;? zTwrdJhnAvJ>$p7YN`jIthL<;CR)V4p1&jR&HgU2U&VX1>d%dBc?I$AplLl{70*2bY zK@q;j@S}SV7&)p)C)c9KFDmj9D8n2|N~r-u|E^M4R*gW#%Ike+k=O;LawQTGx|O;Y zlJQa9QNBDeAG4HZTv9oKmT8QQ%lBeP*BN^R{GKeS#&dfvVSk13#!@J6DDbLoHil_G zpw3VJl}J|A{B1`O;Femw29@gV>i%K$UcJugvZ;Loi_zon)XRNPOt`B~WrA{^I_<#> zMWvf!LiZu?K~qlHZLGUYllMV`!EEThi1ND4N_7@EZ64L5MK)8M`EMP15_GVLC|c<{ z$#NuLha&oVBZ8M%mK78ic`^&j%ZoglSCnio7POE^+%Y%*8NFXD9Uf`f#*HOAJmnJX zNA~-|-L8N~y{p|$9ryZ5p9t-WQg3K{(~f - 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); }