From 983c655dc681c118cbfa13f641be021de3bf57f9 Mon Sep 17 00:00:00 2001 From: sunwen Date: Thu, 10 Jul 2025 14:37:58 +0800 Subject: [PATCH] fix: Clear scan process sequence when stop scan. --- src/device/DeviceManager.cpp | 8 +- src/translations/en_US.ts | 8 +- src/translations/zh_CN.ts | 191 +++++++++++++++++------------------ 3 files changed, 96 insertions(+), 111 deletions(-) diff --git a/src/device/DeviceManager.cpp b/src/device/DeviceManager.cpp index 6828167..fd5d374 100644 --- a/src/device/DeviceManager.cpp +++ b/src/device/DeviceManager.cpp @@ -389,6 +389,7 @@ void DeviceManager::processScanProgress(const QString& aProgress) break; } case 2: + case 3: { QVariant var; if(mIsEmptyScan) @@ -407,12 +408,6 @@ void DeviceManager::processScanProgress(const QString& aProgress) TRIGGER_EVENT(InvokeOperationProgress, nullptr, (QObject *) &var); break; } - case 3: - { - QVariant var(tr("Patient can leave.\nprogress:%1%").arg(msg)); - TRIGGER_EVENT(InvokeOperationProgress, nullptr, (QObject *) &var); - break; - } case 4: checkDataQuality(); break; @@ -441,6 +436,7 @@ void DeviceManager::prepareFinishScan(bool isNormalFinish, const QString& aReaso bool isCompleteNotify = JsonObject::Instance()->getCompleteNotify(); if(!isNormalFinish) { + ScanProcessSequence::getInstance()->clear(); if(!mIsEmptyScan) { TRIGGER_EVENT(StopScanProcess, nullptr, nullptr); diff --git a/src/translations/en_US.ts b/src/translations/en_US.ts index 3da5bb9..2dbc2f8 100644 --- a/src/translations/en_US.ts +++ b/src/translations/en_US.ts @@ -7,10 +7,6 @@ HJ-USCT-01 V1.0 - - ? - - GUI Software V%1 @@ -2071,11 +2067,11 @@ Error: TopBarWidget - 浙江衡玖医疗科技 + °C - °C + 浙江衡玖医疗 diff --git a/src/translations/zh_CN.ts b/src/translations/zh_CN.ts index 82c6cd7..2498064 100644 --- a/src/translations/zh_CN.ts +++ b/src/translations/zh_CN.ts @@ -4,85 +4,79 @@ AboutForm - - + + HJ-USCT-01 V1.0 - - - ? - - - - + USCT Software V0.1.0 - + Reconstruction Software Loading... - - + + GUI Software V%1 - + Operation System Information Loading... - + DICOM Library Information Loading... - + cJSON V1.7.16 - + Embedded Software %1 - + Reconstruction Software V1.2 - + FEB Information - + Qt 5.12.0 - + Copyright © 2017-2022 Zhejiang Equilibrium Nine Medical Equipment Co., Ltd. All Rights Reserved - + Copyright (c) 1994-2021, OFFIS e.V. - + Copyright (c) 2009-2017 Dave Gamble - + Copyright © 2017-2020 Zhejiang Equilibrium Nine Medical Equipment Co., Ltd. All Rights Reversed @@ -477,21 +471,20 @@ DeviceManager - - - + + + DMS connection error DMS失去连接 - + progress:%1% 进度:%1% - - + Patient can leave. progress:%1% 患者可以起身 @@ -505,8 +498,8 @@ progress:99% - - + + Initialize Failed. 初始化失败 @@ -518,9 +511,9 @@ progress:99% - - - + + + Error: @@ -537,51 +530,51 @@ Error: 设备状态错误，无法开始空水扫查 - + Scan completed! Please prepare for the next scan. After lying down, click the confirm buttonto start scanning on the next side. 扫查结束，请准备下一侧扫查。 请在趴好后再点击确认按钮! - + Scan completed! 扫查结束 - + Error: 错误: - + Start scan failed. Reason:time out. 扫查启动失败，原因：超时 - + Start scan failed. Reason:%1 扫查启动失败，原因：%1 - + Start CE Scan Failed. CE扫查启动失败 - + Shut down failed, please push emergency button to shutdown. 关机失败，请按电源按钮进行关机。 - + Open drain vavle failed. 排水阀打开失败 - - + + Cleaning startup failed. 清洁启动失败 @@ -590,43 +583,43 @@ After lying down, click the confirm buttonto start scanning on the next side.扫查数据上传失败 - + Create empty scan data failed 空水数据新增失败 - + Create scan data failed 扫查数据新增失败 - + Recon disconnected. 重建软件已断开连接 - - + + Water injection failed. 注水启动失败 - + Recon error, can't start scan process 重建软件错误，无法开始检查流程 - + Start auto locate failed 自动化定位启动失败 - + The data quality is low, please restart the data scan. 扫查数据质量较低，请重新开始检查流程 - + Device reset failed, please contact maintenance person 设备复位失败，请联系维修人员 @@ -2433,7 +2426,7 @@ The emergency button has been pushed. Please reset it before other operations. - + Account 账户 @@ -2454,7 +2447,7 @@ The emergency button has been pushed. Please reset it before other operations. - + ShutDown 关机 @@ -2464,24 +2457,24 @@ The emergency button has been pushed. Please reset it before other operations. - + Start Scan 开始检查流程 - - - - + + + + Waterflood 注水 - - - + + + Clean 清洁 @@ -2492,19 +2485,19 @@ The emergency button has been pushed. Please reset it before other operations. - + Confirm Water Injection 注水确认 - + Waterflooding 注水中 - + Confirm Drainage 排水确认 @@ -2515,45 +2508,45 @@ The emergency button has been pushed. Please reset it before other operations. - - + + Confirm cleaning 清洁确认 - - - + + + Cleaning 清洁中 - + exit failed. 退出失败 - + Waterflood finished. 注水完成 - + Please click the confirm button for cleaning after disinfection. 请消毒完成后，再点击确认按钮进行清洁 - + Waterflood failed. 注水失败 - - - - + + + + Drain 排水 @@ -2567,7 +2560,7 @@ The emergency button has been pushed. Please reset it before other operations. - + Draining 排水中 @@ -2577,73 +2570,73 @@ The emergency button has been pushed. Please reset it before other operations.请确认是否进行清洁消毒? - + Drainage finished. Please do the disinfection in next step. 排水完成，请下一步进行清洁消毒 - - - + + + Error: 错误: - + Drainage failed. 排水失败 - + Clean failed. 清洁失败 - + Shut down now ? 是否需要进行设备关机操作，请确认？ - + Shut Down 关机 - - - + + + Please confirm checking patient information to start the process 请确定患者信息开始流程 - + Data scanning, please keep the current position and don't move. 数据扫查中，请患者保持当前姿势，不要移动 - + Data exporting, patient can leave the holder 数据导出中，患者可以离开检查仓 - + Data exporting, patient can leave the holder, drainage in progress. 数据导出中，患者可以离开检查仓，自动排水中 - + cleanning finished. 清洁完成 - + Left side scan initiated, auto positioning in progress. 左侧扫查启动，自动定位中 - + Right side scan initiated, auto positioning in progress. 右侧扫查启动，自动定位中 @@ -3231,8 +3224,8 @@ parameters TopBarWidget - 浙江衡玖医疗科技 - + 浙江衡玖医疗 +