diff --git a/src/device/UsctStateManager.cpp b/src/device/UsctStateManager.cpp index 5a8e2e6..80f187a 100644 --- a/src/device/UsctStateManager.cpp +++ b/src/device/UsctStateManager.cpp @@ -4,6 +4,11 @@ #include "log/LogManager.h" #include "appvals/AppGlobalValues.h" +namespace +{ + const int RECON_STATE_SIZE = 7; +} + UsctStateManager* UsctStateManager::getInstance() { static UsctStateManager instance; @@ -18,7 +23,9 @@ UsctStateManager::UsctStateManager(QObject* aParent) mState.insert(DmsConnectionState, true); mState.insert(ReconState, true); mState.insert(ReconMppsState, true); - mState.insert(ReconPacsState, true); + mState.insert(ReconPacsState1, true); + mState.insert(ReconPacsState2, true); + mState.insert(ReconPacsState3, true); mState.insert(ReconConnectionState, true); mState.insert(ReconEmptyScanState, true); mState.insert(ReconDBState, true); @@ -84,7 +91,9 @@ QString UsctStateManager::getStateErrorMessage(int aStateCode) case DmsConnectionState : return "Dms Connection Error"; case ReconState : return "Recon Fatal Error"; case ReconMppsState : return "Recon Mpps Connection Error"; - case ReconPacsState : return "Recon Pacs Connection Error"; + case ReconPacsState1 : return "Recon Pacs Node1 Connection Error"; + case ReconPacsState2 : return "Recon Pacs Node2 Connection Error"; + case ReconPacsState3 : return "Recon Pacs Node3 Connection Error"; case ReconEmptyScanState : return "Recon Empty Scan Data Error"; case ReconDBState : return "Recon Database Connection Error"; case ReconConnectionState : return "Recon Connection Error"; @@ -99,7 +108,7 @@ void UsctStateManager::updateReconState(bool aIsConnected,int aState) return; } setState(ReconConnectionState, aIsConnected); - for (int i = 0; i < 5; ++i) + for (int i = 0; i < RECON_STATE_SIZE; ++i) { int mask = 1 << i; @@ -112,7 +121,9 @@ void UsctStateManager::updateReconState(bool aIsConnected,int aState) { case ReconState: setState(ReconState, result); break; case ReconDBState: setState(ReconDBState, result); break; - case ReconPacsState: setState(ReconPacsState, result); break; + case ReconPacsState1: setState(ReconPacsState1, result); break; + case ReconPacsState2: setState(ReconPacsState2, result); break; + case ReconPacsState3: setState(ReconPacsState3, result); break; case ReconMppsState: setState(ReconMppsState, result); break; case ReconEmptyScanState: setState(ReconEmptyScanState, result); if(!mIsEmptyScanUpdateing && !result) diff --git a/src/device/UsctStateManager.h b/src/device/UsctStateManager.h index b7f99a2..382f152 100644 --- a/src/device/UsctStateManager.h +++ b/src/device/UsctStateManager.h @@ -9,8 +9,10 @@ enum UsctState ReconState = 0, //Recon是否有致命错误,false代表存在致命错误 ReconDBState, ReconEmptyScanState, - ReconPacsState, + ReconPacsState1, ReconMppsState, + ReconPacsState2, + ReconPacsState3, ReconConnectionState, DmsState, //Dms是否有致命错误,false代表存在致命错误 DmsConnectionState