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

Update GUI and Recon connection.

Browse Source
This commit is contained in:
sunwen
2023-08-22 17:51:08 +08:00
parent e47b1c9602
commit d4e46767a8
9 changed files with 266 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/device/DeviceManager.cpp
View File

@@ -132,7 +132,7 @@ void DeviceManager::initDevice()
mStopScanAction = new DmsSyncAction(USRV_SCAN, ACT_SCAN_STOP, this, "responseStopScan(const QString&)", this);
mPreviewScanAction = new DmsSyncAction(USRV_SCAN, ACT_SCAN_PREVIEW, this, "responsePreviewScan(const QString&)", this);
mTransferAction = new DmsSyncAction(USRV_XFR, ACT_XFR_START, this, "responseTransfer(const QString&)", this);
mGetTransferProgressAction = new DmsSyncAction(USRV_XFR, ACT_XFR_PROGRESS_PASSIVE, this, "responseGetTransferProgress(const QString&)", this);
//Async action
mGetScanProgressAction = new DmsAsyncAction(USRV_SCAN, ACT_SCAN_PROGRESS_PASSIVE, this,"responseGetScanProgress(const QString&)", this);
@@ -479,7 +479,7 @@ void DeviceManager::processReceiveDMSInfoResult(int aServerID, int aActionID, co
emit responseTransfer(aContents);
break;
case ACT_XFR_PROGRESS_PASSIVE :
processTransferProgress(aContents);
emit responseGetTransferProgress(aContents);
break;
case ACT_XFR_PROGRESS_ACTIVE :
processTransferProgress(aContents);
@@ -654,7 +654,7 @@ void DeviceManager::startTransfer()
return;
}
QString sql = "SELECT ScanID FROM %1 WHERE State=0 ORDER BY ScanDateTime ASC LIMIT 1";
QString sql = "SELECT ScanID FROM %1 WHERE State<200 ORDER BY ScanDateTime ASC LIMIT 1";
QString table = "EScan";
QVariant sqlResult = SQLHelper::queryValue(sql.arg(table));
mIsTransferEmptyScan = true;
@@ -668,7 +668,6 @@ void DeviceManager::startTransfer()
return;
}
}
QString scanID = sqlResult.toString();
auto host = JsonObject::Instance()->getServer(JsonObject::RECON);
mTransferAction->setSendData("{\"MD5\":1, \"dst\":\"" + host.ae + "@" + host.ip +":" + RECON_TRANSFER_PATH + "\", \"src\":\"" + scanID + "\",\"delete\":1,\"active report\":0}");
@@ -812,6 +811,7 @@ void DeviceManager::processReconQueryScanState(const QMap<QString, int> aResult)
emitInfoCallback(msg, MessageLevel::Error);
}
}
emit updateReconStateFinished();
}
void DeviceManager::createScanReconRecord(const QString& aScanID, const QString& aPatientID, const QString& aReferenceID)
@@ -834,6 +834,7 @@ void DeviceManager::initEmptyScanMeasurementID()
void DeviceManager::updateReconState()
{
updateTransferProgress();
QString sql = "SELECT ScanID FROM Scan WHERE State != 999";
auto result = SQLHelper::queryValues(sql);
QStringList scanIDs;
@@ -842,9 +843,31 @@ void DeviceManager::updateReconState()
scanIDs << variant.toString();
}
if(!scanIDs.isEmpty())
if(scanIDs.isEmpty())
{
emit queryScanStatusToRecon(scanIDs);
emit updateReconStateFinished();
return;
}
emit queryScanStatusToRecon(scanIDs);
}
void DeviceManager::updateTransferProgress()
{
if(!mIsTransfering)
{
return;
}
mTransferProgress = 0;
auto result = mGetTransferProgressAction->execute();
QJsonObject jsonObj = toJsonObject(result.mData);
if(jsonObj["code"].toInt() == 0 )
{
mTransferProgress = jsonObj["info"].toInt();
}
}
int DeviceManager::getTransferProgress()
{
return mTransferProgress;
}