Fix when dms disconnect, preview button and dranage button is checkable.
This commit is contained in:
@@ -210,9 +210,12 @@ void DeviceManager::processInitializeProgress(const QString& aProgress)
|
||||
switch (code)
|
||||
{
|
||||
case 1:
|
||||
emit initializeProgress(msg);
|
||||
//emit initializeProgress(msg);
|
||||
break;
|
||||
case 2:
|
||||
emit initializeProgress(msg);
|
||||
break;
|
||||
case 3:
|
||||
prepareFinishInitialize();
|
||||
emit initializeFinished();
|
||||
break;
|
||||
@@ -286,9 +289,15 @@ void DeviceManager::processScanProgress(const QString& aProgress)
|
||||
break;
|
||||
}
|
||||
case 2:
|
||||
{
|
||||
QVariant var(tr("Patient can leave.\n") + QString("progress:%1%").arg(msg));
|
||||
TRIGGER_EVENT(InvokeOperationProgress, nullptr, (QObject *) &var);
|
||||
break;
|
||||
}
|
||||
case 3:
|
||||
prepareFinishScan(true);
|
||||
break;
|
||||
default:
|
||||
default:
|
||||
prepareFinishScan(false, msg);
|
||||
break;
|
||||
}
|
||||
@@ -427,11 +436,13 @@ void DeviceManager::startPreview()
|
||||
DeviceStatus status = getDeviceStatus();
|
||||
if(status == DeviceStatus::Unkonw)
|
||||
{
|
||||
emit startPreviewScanResult(false);
|
||||
return;
|
||||
}
|
||||
|
||||
if (status != DeviceStatus::Rready)
|
||||
{
|
||||
emit startPreviewScanResult(false);
|
||||
QString msg(status != DeviceStatus::Rready ? "Can't start preview,Device is not ready!" : "Start preview operation fail!");
|
||||
THROW_ERROR(msg);
|
||||
return;
|
||||
@@ -440,12 +451,14 @@ void DeviceManager::startPreview()
|
||||
DmsSyncActionResult result = mPreviewScanAction->execute();
|
||||
if(!result.mIsSucessful)
|
||||
{
|
||||
emit startPreviewScanResult(false);
|
||||
THROW_ERROR(result.mData);
|
||||
return;
|
||||
}
|
||||
QJsonObject jsonObj = toJsonObject(result.mData);
|
||||
if(!jsonObj.contains("code") || jsonObj["code"].toInt() !=0)
|
||||
{
|
||||
emit startPreviewScanResult(false);
|
||||
QString msg = jsonObj.contains("info") ? jsonObj["info"].toString() : DEFAULT_DMS_START_FAILED;
|
||||
THROW_ERROR(msg);
|
||||
return;
|
||||
@@ -453,6 +466,7 @@ void DeviceManager::startPreview()
|
||||
|
||||
AppGlobalValues::setInProcessing(true);
|
||||
mIsPreviewing = true;
|
||||
emit startPreviewScanResult(true);
|
||||
TRIGGER_EVENT(ResponsePreview, nullptr, nullptr);
|
||||
}
|
||||
|
||||
@@ -1026,9 +1040,11 @@ void DeviceManager::controlDrainage(const QString& aCode)
|
||||
QJsonObject jsonObj = toJsonObject(result.mData);
|
||||
if(jsonObj["code"].toInt() == 0 )
|
||||
{
|
||||
emit startPumpControlResult(true);
|
||||
return;
|
||||
}
|
||||
}
|
||||
emit startPumpControlResult(false);
|
||||
QString msg = tr("Open pump failed.");
|
||||
THROW_ERROR(msg);
|
||||
}
|
||||
|
||||
@@ -155,6 +155,8 @@ signals:
|
||||
void initializeFinished();
|
||||
void initializeProgress(const QString& aProgress);
|
||||
void transferStatusUpdated();
|
||||
void startPreviewScanResult(bool aIsSucessful);
|
||||
void startPumpControlResult(bool aIsSucessful);
|
||||
|
||||
|
||||
private:
|
||||
|
||||
Reference in New Issue
Block a user