feat: Use config file recon transfer path in DeviceManager.
This commit is contained in:
@@ -43,7 +43,6 @@ namespace
|
||||
const int EFFECTIVE_POSITION_Z_START = 150;
|
||||
const int EFFECTIVE_POSITION_Z_END = 225;
|
||||
const QString DEFAULT_DMS_START_FAILED = "Dms start failed.";
|
||||
const QString RECON_TRANSFER_PATH = "/home/krad/TestStore";
|
||||
|
||||
QJsonObject toJsonObject(const QString& aJsonString)
|
||||
{
|
||||
@@ -95,6 +94,9 @@ void DeviceManager::initDevice()
|
||||
emit initializeFinished();
|
||||
return;
|
||||
}
|
||||
|
||||
mReconTransferPath = JsonObject::Instance()->getReconTransferPath();
|
||||
|
||||
dmsmq_init(0);
|
||||
|
||||
// empty scan
|
||||
@@ -979,7 +981,7 @@ void DeviceManager::startTransfer()
|
||||
}
|
||||
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}");
|
||||
mTransferAction->setSendData("{\"MD5\":1, \"dst\":\"" + host.ae + "@" + host.ip +":" + mReconTransferPath + "\", \"src\":\"" + scanID + "\",\"delete\":1,\"active report\":0}");
|
||||
DmsSyncActionResult result = mTransferAction->execute();
|
||||
if(!result.mIsSucessful)
|
||||
{
|
||||
@@ -1148,7 +1150,7 @@ void DeviceManager::startCreateReconRecord()
|
||||
for (const QVariant &variant : result)
|
||||
{
|
||||
QString scanid = variant.value<QList<QVariant>>()[0].toString();
|
||||
emit createEmptyScanToRecon(scanid, RECON_TRANSFER_PATH + "/" + scanid);
|
||||
emit createEmptyScanToRecon(scanid, mReconTransferPath + "/" + scanid);
|
||||
}
|
||||
|
||||
sql = "SELECT ScanID, ReferenceID, PatientID, AccessionNumber FROM Scan WHERE State < 300 And State >= 200 ORDER BY ScanDateTime ASC";
|
||||
@@ -1170,7 +1172,7 @@ void DeviceManager::startCreateReconRecord()
|
||||
SQLHelper::QueryFirst(pat_sql, map, params);
|
||||
QString studyUID = map.contains("StudyUID")?map["StudyUID"].toString():"";
|
||||
QString mppsUID = map.contains("MPPSUID")?map["MPPSUID"].toString():"";
|
||||
emit createScanToRecon(scanID, studyUID, mppsUID, referenceID, RECON_TRANSFER_PATH + "/" + scanID);
|
||||
emit createScanToRecon(scanID, studyUID, mppsUID, referenceID, mReconTransferPath + "/" + scanID);
|
||||
}
|
||||
startTransfer();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user