diff --git a/src/device/DeviceManager.cpp b/src/device/DeviceManager.cpp index 23c13c6..7f1d656 100644 --- a/src/device/DeviceManager.cpp +++ b/src/device/DeviceManager.cpp @@ -1215,7 +1215,7 @@ void DeviceManager::startCreateReconRecord() QString studyUID = record[4].toString(); QString mppsUID = record[5].toString(); - emit createScanToRecon(scanID, studyUID, mppsUID, referenceID, mReconTransferPath + "/" + scanID); + emit createScanToRecon(scanID, mppsUID, referenceID, mReconTransferPath + "/" + scanID); } startTransfer(); } diff --git a/src/device/DeviceManager.h b/src/device/DeviceManager.h index 53d11f2..212eb9e 100644 --- a/src/device/DeviceManager.h +++ b/src/device/DeviceManager.h @@ -172,7 +172,7 @@ signals: void responseEmergencyButtonReset(const QString& aResponse); //Recon void createEmptyScanToRecon(const QString& aScanID, const QString& aPath); - void createScanToRecon(const QString& aScanID, const QString& aStudyUID,const QString& aMPPSUID, const QString& aReferenceID, const QString& aPath); + void createScanToRecon(const QString& aScanID,const QString& aMPPSUID, const QString& aReferenceID, const QString& aPath); void queryScanStatusToRecon(const QStringList& aScanIDs); void updateReconStateFinished(); void checkReconConnection(); diff --git a/src/recon/ProtocolStructs.h b/src/recon/ProtocolStructs.h index 43d6a89..401f123 100644 --- a/src/recon/ProtocolStructs.h +++ b/src/recon/ProtocolStructs.h @@ -3,7 +3,6 @@ #include struct Scan{ std::string ScanID; - std::string StudyUID; std::string MPPSUID; std::string ReferenceID; std::string ReferencePath; diff --git a/src/recon/ReconClient.cpp b/src/recon/ReconClient.cpp index dcc04b3..4b242b2 100644 --- a/src/recon/ReconClient.cpp +++ b/src/recon/ReconClient.cpp @@ -59,10 +59,6 @@ RequestResult ReconClient::Create(const Scan &aScan) { cJSON *obj = cJSON_CreateObject(); cJSON_AddStringToObject(obj, "ScanID", aScan.ScanID.c_str()); - if (aScan.StudyUID.length()>0) - { - cJSON_AddStringToObject(obj, "StudyUID", aScan.StudyUID.c_str()); - } if (aScan.MPPSUID.length()>0) { cJSON_AddStringToObject(obj, "MPPSUID", aScan.MPPSUID.c_str()); diff --git a/src/recon/ReconManager.cpp b/src/recon/ReconManager.cpp index 33a81dc..f1ef1af 100644 --- a/src/recon/ReconManager.cpp +++ b/src/recon/ReconManager.cpp @@ -50,7 +50,7 @@ void ReconManager::setReconIpAndPort(const QString& aIp, const QString& aPort) void ReconManager::createEmptyScan(const QString& aScanID, const QString& aPath) { - Scan empty{aScanID.toStdString(), "", "", "", aPath.toStdString(),0}; + Scan empty{aScanID.toStdString(), "", "", aPath.toStdString(),0}; auto result = mReconClient->Create(empty); if(result.good()) { @@ -73,9 +73,9 @@ void ReconManager::createEmptyScan(const QString& aScanID, const QString& aPath) } } -void ReconManager::createScan(const QString& aScanID, const QString& aStudyUID,const QString& aMPPSUID, const QString& aReferenceID, const QString& aPath) +void ReconManager::createScan(const QString& aScanID,const QString& aMPPSUID, const QString& aReferenceID, const QString& aPath) { - Scan scan{aScanID.toStdString(), aStudyUID.toStdString(), aMPPSUID.toStdString(), aReferenceID.toStdString(), aPath.toStdString(),1}; + Scan scan{aScanID.toStdString(), aMPPSUID.toStdString(), aReferenceID.toStdString(), aPath.toStdString(),1}; auto response = mReconClient->Create(scan); if(response.good()) { diff --git a/src/recon/ReconManager.h b/src/recon/ReconManager.h index eb05347..5bbcb08 100644 --- a/src/recon/ReconManager.h +++ b/src/recon/ReconManager.h @@ -25,7 +25,7 @@ public: public slots: void createEmptyScan(const QString& aScanID, const QString& aPath); - void createScan(const QString& aScanID, const QString& aStudyUID,const QString& aMPPSUID, const QString& aReferenceID, const QString& aPath); + void createScan(const QString& aScanID, const QString& aMPPSUID, const QString& aReferenceID, const QString& aPath); void queryReconStatus(const QStringList& aScanIDs); void setMppsSettings(bool aIsOpen, const QString& aServerAETitle, const QString& aServerIP, int aServerPort); void checkReconConnection();