diff --git a/src/device/DeviceManager.cpp b/src/device/DeviceManager.cpp index 7250bf8..673b144 100644 --- a/src/device/DeviceManager.cpp +++ b/src/device/DeviceManager.cpp @@ -393,11 +393,11 @@ void DeviceManager::prepareFinishScan(bool isNormalFinish, const QString& aReaso bool isCompleteNotify = JsonObject::Instance()->getCompleteNotify(); if(!isNormalFinish) { - TRIGGER_EVENT(InvokeOperationEnd, nullptr, var); if(!mIsEmptyScan) { TRIGGER_EVENT(StopScanProcess, nullptr, nullptr); } + TRIGGER_EVENT(InvokeOperationEnd, nullptr, var); return; } @@ -755,7 +755,7 @@ void DeviceManager::processAlarm(const QString& aAlarm) { QJsonObject jsonObj = toJsonObject(aAlarm); int alarmCode = jsonObj["code"].toInt(); - QString alarm = QString::number(alarmCode); + QString alarm = tr("Error: ") + QString::number(alarmCode); qDebug()<<"processAlarm : "<= 400 && alarmCode < 500) @@ -1299,12 +1299,14 @@ void DeviceManager::startScanProcess() return; } AppGlobalValues::setInProcessing(true); + mIsScanning = true; startAutoLocate(); } void DeviceManager::stopScanProcess() { AppGlobalValues::setInProcessing(false); + mIsScanning = false; LOG_SYS_OPERATION("Stop scan process.") stopAutoLocate(); } diff --git a/src/dialogs/DialogManager.cpp b/src/dialogs/DialogManager.cpp index 10b97ab..eb69d7a 100644 --- a/src/dialogs/DialogManager.cpp +++ b/src/dialogs/DialogManager.cpp @@ -552,7 +552,15 @@ void DialogManager::invokeOperationPending(QObject *parent, QObject *msg) { void DialogManager::invokeOperationEnd(QObject *parent, QObject *msg) { //窗口不存在，撤销操作 - if (!mOperationMessageDialog) return; + if (!mOperationMessageDialog) + { + if(msg != nullptr) + { + raiseDeviceError(nullptr, msg); + } + return; + } + if (!mOperationMessageDialog->isHidden()) { if (msg != nullptr) diff --git a/src/recon/ReconManager.cpp b/src/recon/ReconManager.cpp index 2b26c60..fc080a3 100644 --- a/src/recon/ReconManager.cpp +++ b/src/recon/ReconManager.cpp @@ -150,12 +150,12 @@ void ReconManager::setPacsSettings(const QString& aClientAETitle, const QString& QString msg = QString("Set PACS settings failed : ") + response.error().data(); qDebug()<< msg; LOG_SYS_OPERATION(msg) - emit setPacsSettingsResponsed(false, QVariant::fromValue(msg)); + emit setPacsSettingsResponsed(false, QVariant::fromValue(tr("Set PACS settings failed"))); return; } QString message = "Set PACS settings succeed."; LOG_SYS_OPERATION(message) - emit setPacsSettingsResponsed(true, QVariant::fromValue(message)); + emit setPacsSettingsResponsed(true, QVariant::fromValue(tr("Set PACS settings succeed"))); } void ReconManager::setMppsSettings(bool aIsOpen, const QString& aServerAETitle, const QString& aServerIP, int aServerPort) diff --git a/src/translations/en_US.ts b/src/translations/en_US.ts index e1945a6..9eae06f 100644 --- a/src/translations/en_US.ts +++ b/src/translations/en_US.ts @@ -366,6 +366,10 @@ progress:99% Scan data transfer Succeeded! + + Error: + + DicomCfgDialog @@ -1359,6 +1363,17 @@ progress:99% + + ReconManager + + Set PACS settings failed + + + + Set PACS settings succeed + + + ReconSettingsDialog diff --git a/src/translations/zh_CN.ts b/src/translations/zh_CN.ts index efa0d2c..94fcec7 100644 --- a/src/translations/zh_CN.ts +++ b/src/translations/zh_CN.ts @@ -416,26 +416,26 @@ DeviceManager - - + + DMS connection error DMS失去连接 - - + + progress:%1% 进度:%1% - + Patient can leave. progress:%1% 检查对象可以离开检查仓 进度:%1% - + Data quality assessment in progress progress:99% 数据质量判断中 @@ -443,8 +443,8 @@ progress:99% - - + + Initialize Failed. 初始化失败 @@ -454,91 +454,96 @@ progress:99% 数据库连接失败，请重启设备后再试! - + Device is not ready, start scan operation failed! 设备状态错误，无法开始检查流程 - + Device is not ready, start empty scan operation failed! 设备状态错误，无法开始空水扫查 - + 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. 扫查数据质量较低，请重新开始检查流程 @@ -1908,6 +1913,19 @@ progress:99% 重建状态 + + ReconManager + + + Set PACS settings failed + PACS设置失败 + + + + Set PACS settings succeed + PACS设置成功 + + ReconSettingsDialog @@ -2277,12 +2295,12 @@ parameters Delete Patient "%1" ? - + 删除检查对象"%1"？ Confirm - + 确认