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

feat: Change httpclient logic to fit web interface change

Browse Source
This commit is contained in:
kradchen
2024-09-18 13:05:38 +08:00
parent 3b7f2ebd04
commit df7342625e
6 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/device/DeviceManager.cpp
View File

@@ -1215,7 +1215,7 @@ void DeviceManager::startCreateReconRecord()
QString studyUID = record[4].toString(); QString studyUID = record[4].toString();
QString mppsUID = record[5].toString(); QString mppsUID = record[5].toString();
emit createScanToRecon(scanID, studyUID, mppsUID, referenceID, mReconTransferPath + "/" + scanID); emit createScanToRecon(scanID, mppsUID, referenceID, mReconTransferPath + "/" + scanID);
} }
startTransfer(); startTransfer();
} }

2
src/device/DeviceManager.h
View File

@@ -172,7 +172,7 @@ signals:
void responseEmergencyButtonReset(const QString& aResponse); void responseEmergencyButtonReset(const QString& aResponse);
//Recon //Recon
void createEmptyScanToRecon(const QString& aScanID, const QString& aPath); 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 queryScanStatusToRecon(const QStringList& aScanIDs);
void updateReconStateFinished(); void updateReconStateFinished();
void checkReconConnection(); void checkReconConnection();

1
src/recon/ProtocolStructs.h
View File

@@ -3,7 +3,6 @@
#include <string> #include <string>
struct Scan{ struct Scan{
std::string ScanID; std::string ScanID;
std::string StudyUID;
std::string MPPSUID; std::string MPPSUID;
std::string ReferenceID; std::string ReferenceID;
std::string ReferencePath; std::string ReferencePath;

4
src/recon/ReconClient.cpp
View File

@@ -59,10 +59,6 @@ RequestResult ReconClient::Create(const Scan &aScan)
{ {
cJSON *obj = cJSON_CreateObject(); cJSON *obj = cJSON_CreateObject();
cJSON_AddStringToObject(obj, "ScanID", aScan.ScanID.c_str()); 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) if (aScan.MPPSUID.length()>0)
{ {
cJSON_AddStringToObject(obj, "MPPSUID", aScan.MPPSUID.c_str()); cJSON_AddStringToObject(obj, "MPPSUID", aScan.MPPSUID.c_str());

6
src/recon/ReconManager.cpp
View File

@@ -50,7 +50,7 @@ void ReconManager::setReconIpAndPort(const QString& aIp, const QString& aPort)
void ReconManager::createEmptyScan(const QString& aScanID, const QString& aPath) 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); auto result = mReconClient->Create(empty);
if(result.good()) 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); auto response = mReconClient->Create(scan);
if(response.good()) if(response.good())
{ {

2
src/recon/ReconManager.h
View File

@@ -25,7 +25,7 @@ public:
public slots: public slots:
void createEmptyScan(const QString& aScanID, const QString& aPath); 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 queryReconStatus(const QStringList& aScanIDs);
void setMppsSettings(bool aIsOpen, const QString& aServerAETitle, const QString& aServerIP, int aServerPort); void setMppsSettings(bool aIsOpen, const QString& aServerAETitle, const QString& aServerIP, int aServerPort);
void checkReconConnection(); void checkReconConnection();