From 37b67b99dae1aef3f6a34491826ba32c39ea01f9 Mon Sep 17 00:00:00 2001 From: sunwen Date: Mon, 23 Sep 2024 10:08:53 +0800 Subject: [PATCH] feat: Remove auto locate in scan process and change prompt after scanning one side. --- src/components/CoordinateXYWidget.cpp | 6 +- src/components/CoordinateZWidget.cpp | 7 +- src/device/DeviceManager.cpp | 44 +-- src/translations/en_US.ts | 5 + src/translations/zh_CN.ts | 465 +++++++++++++------------- 5 files changed, 272 insertions(+), 255 deletions(-) diff --git a/src/components/CoordinateXYWidget.cpp b/src/components/CoordinateXYWidget.cpp index 1cb5921..5e90090 100644 --- a/src/components/CoordinateXYWidget.cpp +++ b/src/components/CoordinateXYWidget.cpp @@ -194,9 +194,9 @@ void CoordinateXYWidget::updateStopFlash() void CoordinateXYWidget::startFlash() { show(); - connect(mTimer,&QTimer::timeout,this, &CoordinateXYWidget::updateFlash); - mStopGradientEnd = 1; - mTimer->start(20); +// connect(mTimer,&QTimer::timeout,this, &CoordinateXYWidget::updateFlash); +// mStopGradientEnd = 1; +// mTimer->start(20); } void CoordinateXYWidget::stopFlash() diff --git a/src/components/CoordinateZWidget.cpp b/src/components/CoordinateZWidget.cpp index bb0852e..0c23553 100644 --- a/src/components/CoordinateZWidget.cpp +++ b/src/components/CoordinateZWidget.cpp @@ -34,6 +34,7 @@ CoordinateZWidget::CoordinateZWidget(QWidget* aParent) connect(ScanProcessSequence::getInstance(), &ScanProcessSequence::quitAutoLocate, this, &CoordinateZWidget::quit); connect(ScanProcessSequence::getInstance(), &ScanProcessSequence::autoLocateZUpdated, this, &CoordinateZWidget::setBlinkPoint); hide(); + mBlinkPoint.setY(204); } void CoordinateZWidget::paintEvent(QPaintEvent* aEvent) @@ -116,9 +117,9 @@ void CoordinateZWidget::setBlinkPoint(int aZ) void CoordinateZWidget::startFlash() { show(); - connect(mTimer,&QTimer::timeout,this, &CoordinateZWidget::updateFlash); - mStopGradientEnd = 1; - mTimer->start(20); +// connect(mTimer,&QTimer::timeout,this, &CoordinateZWidget::updateFlash); +// mStopGradientEnd = 1; +// mTimer->start(20); } void CoordinateZWidget::stopFlash() diff --git a/src/device/DeviceManager.cpp b/src/device/DeviceManager.cpp index bf06bca..2048b46 100644 --- a/src/device/DeviceManager.cpp +++ b/src/device/DeviceManager.cpp @@ -428,7 +428,8 @@ void DeviceManager::prepareFinishScan(bool isNormalFinish, const QString& aReaso if(isCompleteNotify) { - QString msg = tr("Scan completed!"); + QString msg = ScanProcessSequence::getInstance()->getScanPositionSize() == 2 ? tr("Scan completed! Please prepare for the next scan. \n" + "Click the confirm button after lying down.") : tr("Scan completed!") ; TRIGGER_EVENT(InvokeOperationEnd, nullptr, (QObject *)&msg); } else @@ -1321,7 +1322,7 @@ void DeviceManager::stopScanProcess() AppGlobalValues::setInProcessing(false); mIsScanning = false; LOG_SYS_OPERATION("Stop scan process.") - stopAutoLocate(); + //stopAutoLocate(); } bool DeviceManager::startAutoLocate() @@ -1331,24 +1332,27 @@ bool DeviceManager::startAutoLocate() TRIGGER_EVENT(StopScanProcess, nullptr, nullptr); return false; } - auto result = mStartAutoLocateAction->execute(); - if(result.mIsSucessful) - { - mIsAutoLocating = true; - QJsonObject jsonObj = toJsonObject(result.mData); - if(jsonObj["code"].toInt() == 0 ) - { - emit startAutoLocateResult(true); - mEffectivePositionCount = 0; - mGetAutoLocatePositionTimer = startTimer(1000); - return true; - } - } - TRIGGER_EVENT(StopScanProcess, nullptr, nullptr); - QString errorMessage = tr("Start auto locate failed"); - THROW_ERROR(errorMessage) - LOG_SYS_OPERATION("Start auto locate failed.") - return false; + emit startAutoLocateResult(true); + emit autolocatePositionEffective(); + return true; +// auto result = mStartAutoLocateAction->execute(); +// if(result.mIsSucessful) +// { +// mIsAutoLocating = true; +// QJsonObject jsonObj = toJsonObject(result.mData); +// if(jsonObj["code"].toInt() == 0 ) +// { +// emit startAutoLocateResult(true); +// mEffectivePositionCount = 0; +// mGetAutoLocatePositionTimer = startTimer(1000); +// return true; +// } +// } +// TRIGGER_EVENT(StopScanProcess, nullptr, nullptr); +// QString errorMessage = tr("Start auto locate failed"); +// THROW_ERROR(errorMessage) +// LOG_SYS_OPERATION("Start auto locate failed.") +// return false; } void DeviceManager::stopAutoLocate() diff --git a/src/translations/en_US.ts b/src/translations/en_US.ts index de94a50..ff4a670 100644 --- a/src/translations/en_US.ts +++ b/src/translations/en_US.ts @@ -370,6 +370,11 @@ progress:99% Error: + + Scan completed! Please prepare for the next scan. +Click the confirm button after lying down. + + DicomCfgDialog diff --git a/src/translations/zh_CN.ts b/src/translations/zh_CN.ts index d696ec9..5b34b20 100644 --- a/src/translations/zh_CN.ts +++ b/src/translations/zh_CN.ts @@ -247,47 +247,47 @@ - + Name 姓名 - + Role 角色 - + Comment 备注 - + Add 新增 - + Edit 编辑 - + Delete 删除 - + Can't delete current log in account! 无法删除当前用户！ - + Delete account with ID:"%1"! 删除账户ID:"%1"! @@ -416,8 +416,9 @@ DeviceManager - - + + + DMS connection error DMS失去连接 @@ -443,8 +444,8 @@ progress:99% - - + + Initialize Failed. 初始化失败 @@ -465,85 +466,91 @@ progress:99% + Scan completed! Please prepare for the next scan. +Click the confirm button after lying down. + 扫查结束，请准备下一侧扫查。 +请在趴好后再点击确认按钮! + + + Scan completed! 扫查结束 - + Error: 错误: - + Start scan failed. Reason:time out. 扫查启动失败，原因：超时 - + Start scan failed. Reason:%1 扫查启动失败，原因：%1 - + Start CE Scan Failed. CE扫查启动失败 - + Data is currently being transmitted, please shut down later. 数据传输中，请稍后再执行关机。 - + Shut down failed, please push emergency button to shutdown. 关机失败，请按紧急按钮进行关机。 - - - + + + Scan data transfer failed. 扫查数据上传失败 - + Scan data transfer Succeeded! - + Create empty scan data failed 空水数据新增失败 - + Create scan data failed 扫查数据新增失败 - + Recon disconnected. 重建服务器已断开连接 - - + + Open pump failed. 排水阀打开失败 - + Recon error, can't start scan process 重建服务器错误，无法开始检查流程 - - + Start auto locate failed 自动化定位启动失败 - + The data quality is low, please restart the data scan. 扫查数据质量较低，请重新开始检查流程 @@ -551,62 +558,62 @@ progress:99% DicomCfgDialog - + Dialog 检查对象信息 - + DICOM Settings DICOM 配置 - - - + + + IP - - - + + + AE AE - - - + + + Port - - - + + + Name 姓名 - - - + + + ... DICOM - + Worklist 新增(拉取) - + PACS - + 3D Recon @@ -624,27 +631,27 @@ progress:99% DicomSettingsArea - + Form - + Local AE 本机AE - + Server Ip 服务器地址 - + Server AE 服务器AE - + Server Port 服务器端口 @@ -662,58 +669,58 @@ progress:99% - + Accession Number 检查单号 - + Name 姓名 - + Gender 性别 - - - - + + + + Female 女 - - - + + + Male 男 - - + + Other 其他 - + Birth Date 出生日期 - + ID can't be empty! ID不能为空 - + Patient Name can't be empty! 姓名不能为空 - + The ID and Accession number is already existed! ID和检查单号已存在 @@ -722,12 +729,12 @@ progress:99% 备注 - + F - + M @@ -748,7 +755,7 @@ progress:99% GUIMessageDialog - + Dialog @@ -1000,7 +1007,7 @@ progress:99% InputModeMenu - + Form @@ -1046,200 +1053,200 @@ progress:99% Keyboard - + Form - + q - + w - + e - + r - + t - + y - + u - + i - + o - + p - - + + Back - + a - + s - + d - + f - + g - + h - + j - + k - + l - + Enter - + 小写 - + z - + x - + c - + v - + b - + n - + m - + ↑ - + ?123 - - + + En - + Space - - + + Hide - + ← - + ↓ - + → - + Clear @@ -1375,7 +1382,7 @@ progress:99% MainWindow - + MainWindow @@ -1492,102 +1499,102 @@ progress:99% NetworkCfgDialog - - + + Network Settings 网络配置 - + IP Address IP地址 - + DHCP - + Dev 设备 - + Subnet Mask 子网掩码 - + Additional Address 额外地址 - - + + Add 新增 - - + + Edit 编辑 - - + + Delete 删除 - + Address IP配置 - + Default IPv4 Gateway 默认网关 - + Routing Table 路由表 - + Routing 路由配置 - + Name 姓名 - + Port - + AE AE - + IP - + DICOM - + Result 结果 @@ -1708,7 +1715,7 @@ progress:99% Other - + 其他 @@ -1769,42 +1776,42 @@ progress:99% PatientInformationForm - + Form - + Current Patient 当前患者信息 - + Patient Name: 患者姓名: - + Patient ID: 患者编码: - + Patient Birthday: 出生日期: - + Patient Gender: 患者性别: - + Patient AccessionNum: 检查单号: - + Scan Protocol: 检查身侧: @@ -2161,37 +2168,37 @@ parameters ScanSearchCriteriaForm - + Form - + Scan Search 按日期查找 - + Today 今天 - + Yesterday 昨天 - + Last 7 days 过去7天 - + Search All 所有信息 - + Scan date from 开始日期 @@ -2200,52 +2207,52 @@ parameters DICOM - + Scan date to 结束日期 - + Search Dates 检索 - + Search Criteria 按条件查找 - + Retrieve 检索 - + Accession Number 检查单号 - + Manual Refresh 手动刷新 - + Refresh 刷新 - + Patient ID 检查对象ID - + Patient Name 检查对象姓名 - + Clear Fields 清空 @@ -2261,99 +2268,99 @@ parameters 新增(拉取) - - + + Add 新增 - - + + Edit 编辑 - - + + Patient Information Manage 检查对象信息录入 - - + + Delete 删除 - - + + Select 选择 - + Can't delete selected Patient ! 不能删除已经被选择的对象 - - + + Alert - + Delete Patient "%1" ? 删除检查对象"%1"？ - + Confirm 确认 - + Can't delete selected Patient , db submit error! - + ID 检查对象ID - - + + AccessionNumber 检查单号 - - + + Name 姓名 - - + + Birth Date 出生日期 - - + + Gender 性别 - - + + Add Date 添加日期 - - + + Comment 备注 @@ -2423,77 +2430,77 @@ parameters StartScanProcessDialog - + Dialog 检查对象信息 - + Patien Information 检查对象信息 - + PatientBirth: 出生日期: - + PatientGender: 患者性别: - + AccessionNumber: 检查单号: - + PatientName: 患者姓名: - + PatientID: 患者编码: - + Protocol Settings 当前流程设置 - + <html><head/><body><p><br/></p></body></html> - + left->right 左->右 - + right->left 右->左 - + only left 单侧左 - + only right 单侧右 - + start Scan 立即开始 - + Cancel 稍后开始 @@ -2558,7 +2565,7 @@ parameters SystemSettingForm - + Form @@ -2579,7 +2586,7 @@ parameters 自动验证 - + IP @@ -2588,22 +2595,22 @@ parameters Worklist过滤器 - + Recon Settings Recon - + Worklist Settings Worklist - + Pacs Settings Pacs - + Mpps Settings Mpps @@ -2623,7 +2630,7 @@ parameters TabFormWidget - + Form @@ -2675,32 +2682,32 @@ parameters UserOperationLogForm - - + + Log Date: 日志时间 - - + + Operation Date 操作日期 - - + + Operation Time 操作时间 - - + + User 用户 - - + + Operation 操作内容