sunwen/GUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Add create failed because recon connect error.

Browse Source
This commit is contained in:
sunwen
2024-06-19 13:53:40 +08:00
parent 8ef17aee96
commit 87b37d5ce9
4 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/device/DeviceManager.cpp
View File

@@ -1080,7 +1080,7 @@ void DeviceManager::processTransferProgress(const QString& aProgress)
} }
} }
void DeviceManager::processReconCreateEmptyScan(bool aResult, const QString& aScanID, const QString& aMessage) void DeviceManager::processReconCreateEmptyScan(bool aResult, const QString& aScanID, const QString& aMessage, bool aIsConnectSucceed)
{ {
if(aResult) if(aResult)
{ {
@@ -1095,7 +1095,7 @@ void DeviceManager::processReconCreateEmptyScan(bool aResult, const QString& aSc
} }
emitInfoCallback(aMessage, MessageLevel::Error); emitInfoCallback(aMessage, MessageLevel::Error);
QString sql = QString("UPDATE EScan set State = 204 where ScanID = '%1'").arg(aScanID); QString sql = QString("UPDATE EScan set State = %1 where ScanID = '%2'").arg(aIsConnectSucceed ? "304" : "204").arg(aScanID);
if(!SQLHelper::exec(sql)) if(!SQLHelper::exec(sql))
{ {
QString msg = "DB Error. Code:G505"; QString msg = "DB Error. Code:G505";
@@ -1103,7 +1103,7 @@ void DeviceManager::processReconCreateEmptyScan(bool aResult, const QString& aSc
} }
} }
void DeviceManager::processReconCreateScan(bool aResult, const QString& aScanID, const QString& aMessage) void DeviceManager::processReconCreateScan(bool aResult, const QString& aScanID, const QString& aMessage, bool aIsConnectSucceed)
{ {
if(aResult) if(aResult)
{ {
@@ -1117,7 +1117,7 @@ void DeviceManager::processReconCreateScan(bool aResult, const QString& aScanID,
} }
emitInfoCallback(aMessage, MessageLevel::Error); emitInfoCallback(aMessage, MessageLevel::Error);
QString sql = QString("UPDATE Scan set State = 204 where ScanID = '%1'").arg(aScanID); QString sql = QString("UPDATE Scan set State = %1 where ScanID = '%2'").arg(aIsConnectSucceed ? "304" : "204").arg(aScanID);
if(!SQLHelper::exec(sql)) if(!SQLHelper::exec(sql))
{ {
QString msg = "DB Error. Code:G505"; QString msg = "DB Error. Code:G505";

4
src/device/DeviceManager.h
View File

@@ -135,8 +135,8 @@ private slots:
void processReceiveDMSInfoResult(int aServerID, int aActionID, const QString& aContents); void processReceiveDMSInfoResult(int aServerID, int aActionID, const QString& aContents);
//Recon //Recon
void processReconCreateEmptyScan(bool aResult, const QString& aScanID, const QString& aMessage); void processReconCreateEmptyScan(bool aResult, const QString& aScanID, const QString& aMessage, bool aIsConnectSucceed);
void processReconCreateScan(bool aResult, const QString& aScanID, const QString& aMessage); void processReconCreateScan(bool aResult, const QString& aScanID, const QString& aMessage, bool aIsConnectSucceed);
void processReconQueryScanState(bool aResult, const QVariant& aState); void processReconQueryScanState(bool aResult, const QVariant& aState);
void startCreateReconRecord(); void startCreateReconRecord();
void updateReconConnectionState(bool aIsConnected); void updateReconConnectionState(bool aIsConnected);

18
src/recon/ReconManager.cpp
View File

@@ -62,7 +62,14 @@ void ReconManager::createEmptyScan(const QString& aScanID, const QString& aPath)
{ {
qDebug()<< "Create empty scan fail by %s\n" << result.error().data(); qDebug()<< "Create empty scan fail by %s\n" << result.error().data();
LOG_SYS_OPERATION("Create empty scan failed. " + QString(result.error().data())) LOG_SYS_OPERATION("Create empty scan failed. " + QString(result.error().data()))
emit createEmptyScanResponsed(false, aScanID, result.error().data()); if(result.isConnectFailure())
{
emit createEmptyScanResponsed(false, aScanID, result.error().data(), false);
}
else
{
emit createEmptyScanResponsed(false, aScanID, result.error().data());
}
} }
} }
@@ -80,7 +87,14 @@ void ReconManager::createScan(const QString& aScanID, const QString& aStudyUID,c
{ {
qDebug()<< "Recon create scan failed by " << response.error().data(); qDebug()<< "Recon create scan failed by " << response.error().data();
LOG_SYS_OPERATION("Recon create scan failed" + QString(response.error().data())) LOG_SYS_OPERATION("Recon create scan failed" + QString(response.error().data()))
emit createScanResponsed(false, aScanID, response.error().data()); if(response.isConnectFailure())
{
emit createScanResponsed(false, aScanID, response.error().data(), false);
}
else
{
emit createScanResponsed(false, aScanID, response.error().data());
}
} }
} }

4
src/recon/ReconManager.h
View File

@@ -32,8 +32,8 @@ private:
signals: signals:
void restartCreatReconRecord(); void restartCreatReconRecord();
void createEmptyScanResponsed(bool aResult, const QString& aScanID, const QString& aMessage = ""); void createEmptyScanResponsed(bool aResult, const QString& aScanID, const QString& aMessage = "", bool aIsConnectSucceed = true);
void createScanResponsed(bool aResult, const QString& aScanID, const QString& aMessage = ""); void createScanResponsed(bool aResult, const QString& aScanID, const QString& aMessage = "", bool aIsConnectSucceed = true);
void queryReconStateResponsed(bool aResult, const QVariant& aData); void queryReconStateResponsed(bool aResult, const QVariant& aData);
void setPacsSettingsResponsed(bool aResult, const QVariant& aMessage); void setPacsSettingsResponsed(bool aResult, const QVariant& aMessage);
void setMppsSettingsResponsed(bool aResult, const QVariant& aMessage); void setMppsSettingsResponsed(bool aResult, const QVariant& aMessage);