fix: Fix stop scan process while emergency button pushed.

2024-06-25 20:02:31 +08:00
parent 229ca8e755
commit 4f9e007868
5 changed files with 79 additions and 36 deletions
--- 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 : "<<alarmCode;
    LOG_SYS_OPERATION("Dms alarm reported. code: " + alarm)
    if(alarmCode >= 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();
 }
--- 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)
--- 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)
--- a/src/translations/en_US.ts
+++ b/src/translations/en_US.ts
@@ -366,6 +366,10 @@ progress:99%</source>
        <source>Scan data transfer Succeeded!</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Error: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>DicomCfgDialog</name>
@@ -1359,6 +1363,17 @@ progress:99%</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
+<context>
+    <name>ReconManager</name>
+    <message>
+        <source>Set PACS settings failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set PACS settings succeed</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
    <name>ReconSettingsDialog</name>
    <message>
--- a/src/translations/zh_CN.ts
+++ b/src/translations/zh_CN.ts
@@ -416,26 +416,26 @@
    <name>DeviceManager</name>
    <message>
        <location filename="../device/DeviceManager.cpp" line="168"/>
-        <location filename="../device/DeviceManager.cpp" line="807"/>
-        <location filename="../device/DeviceManager.cpp" line="1413"/>
+        <location filename="../device/DeviceManager.cpp" line="806"/>
+        <location filename="../device/DeviceManager.cpp" line="1414"/>
        <source>DMS connection error</source>
        <translation type="unfinished">DMS失去连接</translation>
    </message>
    <message>
-        <location filename="../device/DeviceManager.cpp" line="352"/>
-        <location filename="../device/DeviceManager.cpp" line="359"/>
+        <location filename="../device/DeviceManager.cpp" line="351"/>
+        <location filename="../device/DeviceManager.cpp" line="358"/>
        <source>progress:%1%</source>
        <translation type="unfinished">进度:%1%</translation>
    </message>
    <message>
-        <location filename="../device/DeviceManager.cpp" line="359"/>
+        <location filename="../device/DeviceManager.cpp" line="358"/>
        <source>Patient can leave.
 progress:%1%</source>
        <translation type="unfinished">检查对象可以离开检查仓
 进度:%1%</translation>
    </message>
    <message>
-        <location filename="../device/DeviceManager.cpp" line="365"/>
+        <location filename="../device/DeviceManager.cpp" line="364"/>
        <source>Data quality assessment in progress
 progress:99%</source>
        <translation type="unfinished">数据质量判断中
@@ -443,8 +443,8 @@ progress:99%</source>
    </message>
    <message>
        <location filename="../device/DeviceManager.cpp" line="250"/>
-        <location filename="../device/DeviceManager.cpp" line="861"/>
-        <location filename="../device/DeviceManager.cpp" line="869"/>
+        <location filename="../device/DeviceManager.cpp" line="860"/>
+        <location filename="../device/DeviceManager.cpp" line="868"/>
        <source>Initialize Failed.</source>
        <translation type="unfinished">初始化失败</translation>
    </message>
@@ -454,91 +454,96 @@ progress:99%</source>
        <translation type="unfinished">数据库连接失败，请重启设备后再试!</translation>
    </message>
    <message>
-        <location filename="../device/DeviceManager.cpp" line="312"/>
+        <location filename="../device/DeviceManager.cpp" line="311"/>
        <source>Device is not ready, start scan operation failed!</source>
        <translation type="unfinished">设备状态错误，无法开始检查流程</translation>
    </message>
    <message>
-        <location filename="../device/DeviceManager.cpp" line="312"/>
+        <location filename="../device/DeviceManager.cpp" line="311"/>
        <source>Device is not ready, start empty scan operation failed!</source>
        <translation type="unfinished">设备状态错误，无法开始空水扫查</translation>
    </message>
    <message>
-        <location filename="../device/DeviceManager.cpp" line="418"/>
+        <location filename="../device/DeviceManager.cpp" line="417"/>
        <source>Scan completed!</source>
        <translation type="unfinished">扫查结束</translation>
    </message>
    <message>
-        <location filename="../device/DeviceManager.cpp" line="834"/>
+        <location filename="../device/DeviceManager.cpp" line="758"/>
+        <source>Error: </source>
+        <translation type="unfinished">错误: </translation>
+    </message>
+    <message>
+        <location filename="../device/DeviceManager.cpp" line="833"/>
        <source>Start scan failed. Reason:time out.</source>
        <translation type="unfinished">扫查启动失败，原因：超时</translation>
    </message>
    <message>
-        <location filename="../device/DeviceManager.cpp" line="845"/>
+        <location filename="../device/DeviceManager.cpp" line="844"/>
        <source>Start scan failed. Reason:%1</source>
        <translation type="unfinished">扫查启动失败，原因：%1</translation>
    </message>
    <message>
-        <location filename="../device/DeviceManager.cpp" line="871"/>
+        <location filename="../device/DeviceManager.cpp" line="870"/>
        <source>Start CE Scan Failed.</source>
        <translation type="unfinished">CE扫查启动失败</translation>
    </message>
    <message>
-        <location filename="../device/DeviceManager.cpp" line="903"/>
+        <location filename="../device/DeviceManager.cpp" line="902"/>
        <source>Data is currently being transmitted, please shut down later.</source>
        <translation type="unfinished">数据传输中，请稍后再执行关机。</translation>
    </message>
    <message>
-        <location filename="../device/DeviceManager.cpp" line="910"/>
+        <location filename="../device/DeviceManager.cpp" line="909"/>
        <source>Shut down failed, please push emergency button to shutdown.</source>
        <translation type="unfinished">关机失败，请按紧急按钮进行关机。</translation>
    </message>
    <message>
-        <location filename="../device/DeviceManager.cpp" line="998"/>
-        <location filename="../device/DeviceManager.cpp" line="1008"/>
-        <location filename="../device/DeviceManager.cpp" line="1084"/>
+        <location filename="../device/DeviceManager.cpp" line="997"/>
+        <location filename="../device/DeviceManager.cpp" line="1007"/>
+        <location filename="../device/DeviceManager.cpp" line="1083"/>
        <source>Scan data transfer failed.</source>
        <translation type="unfinished">扫查数据上传失败</translation>
    </message>
    <message>
-        <location filename="../device/DeviceManager.cpp" line="1062"/>
+        <location filename="../device/DeviceManager.cpp" line="1061"/>
        <source>Scan data transfer Succeeded!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../device/DeviceManager.cpp" line="1104"/>
+        <location filename="../device/DeviceManager.cpp" line="1103"/>
        <source>Create empty scan data failed</source>
        <translation type="unfinished">空水数据新增失败</translation>
    </message>
    <message>
-        <location filename="../device/DeviceManager.cpp" line="1126"/>
+        <location filename="../device/DeviceManager.cpp" line="1125"/>
        <source>Create scan data failed</source>
        <translation type="unfinished">扫查数据新增失败</translation>
    </message>
    <message>
-        <location filename="../device/DeviceManager.cpp" line="1200"/>
+        <location filename="../device/DeviceManager.cpp" line="1199"/>
        <source>Recon disconnected.</source>
        <translation type="unfinished">重建服务器已断开连接</translation>
    </message>
    <message>
-        <location filename="../device/DeviceManager.cpp" line="1265"/>
-        <location filename="../device/DeviceManager.cpp" line="1280"/>
+        <location filename="../device/DeviceManager.cpp" line="1264"/>
+        <location filename="../device/DeviceManager.cpp" line="1279"/>
        <source>Open pump failed.</source>
        <translation type="unfinished">排水阀打开失败</translation>
    </message>
    <message>
-        <location filename="../device/DeviceManager.cpp" line="1296"/>
+        <location filename="../device/DeviceManager.cpp" line="1295"/>
        <source>Recon error, can&apos;t start scan process</source>
        <translation type="unfinished">重建服务器错误，无法开始检查流程</translation>
    </message>
    <message>
-        <location filename="../device/DeviceManager.cpp" line="1335"/>
-        <location filename="../device/DeviceManager.cpp" line="1387"/>
+        <location filename="../device/DeviceManager.cpp" line="1336"/>
+        <location filename="../device/DeviceManager.cpp" line="1388"/>
        <source>Start auto locate failed</source>
        <translation type="unfinished">自动化定位启动失败</translation>
    </message>
    <message>
-        <location filename="../device/DeviceManager.cpp" line="1407"/>
+        <location filename="../device/DeviceManager.cpp" line="1408"/>
        <source>The data quality is low, please restart the data scan.</source>
        <translation type="unfinished">扫查数据质量较低，请重新开始检查流程</translation>
    </message>
@@ -1908,6 +1913,19 @@ progress:99%</source>
        <translation type="unfinished">重建状态</translation>
    </message>
 </context>
+<context>
+    <name>ReconManager</name>
+    <message>
+        <location filename="../recon/ReconManager.cpp" line="153"/>
+        <source>Set PACS settings failed</source>
+        <translation type="unfinished">PACS设置失败</translation>
+    </message>
+    <message>
+        <location filename="../recon/ReconManager.cpp" line="158"/>
+        <source>Set PACS settings succeed</source>
+        <translation type="unfinished">PACS设置成功</translation>
+    </message>
+</context>
 <context>
    <name>ReconSettingsDialog</name>
    <message>
@@ -2277,12 +2295,12 @@ parameters
    <message>
        <location filename="../forms/select/SelectFormWidget.cpp" line="162"/>
        <source>Delete Patient &quot;%1&quot; ?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">删除检查对象&quot;%1&quot;？</translation>
    </message>
    <message>
        <location filename="../forms/select/SelectFormWidget.cpp" line="162"/>
        <source>Confirm</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">确认</translation>
    </message>
    <message>
        <location filename="../forms/select/SelectFormWidget.cpp" line="178"/>