Mercurial > hg > orthanc
diff OrthancServer/Sources/ServerJobs/MergeStudyJob.h @ 4717:783f8a048035 openssl-3.x
integration mainline->openssl-3.x
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 23 Jun 2021 16:23:23 +0200 |
parents | f0038043fb97 fb98db281d1d |
children | 2e71a08eea15 |
line wrap: on
line diff
--- a/OrthancServer/Sources/ServerJobs/MergeStudyJob.h Tue Jun 22 10:40:28 2021 +0200 +++ b/OrthancServer/Sources/ServerJobs/MergeStudyJob.h Wed Jun 23 16:23:23 2021 +0200 @@ -47,6 +47,10 @@ void AddSourceStudyInternal(const std::string& study); + // Make setter methods private to prevent incorrect calls + using SetOfInstancesJob::AddParentResource; + using SetOfInstancesJob::AddInstance; + protected: virtual bool HandleInstance(const std::string& instance) ORTHANC_OVERRIDE; @@ -62,12 +66,14 @@ return targetStudy_; } - void AddSource(const std::string& studyOrSeries); + void AddSource(const std::string& publicId); void AddSourceStudy(const std::string& study); void AddSourceSeries(const std::string& series); + void AddSourceInstance(const std::string& instance); // New in Orthanc 1.9.4 + void SetOrigin(const DicomInstanceOrigin& origin); void SetOrigin(const RestApiCall& call);