Mercurial > hg > orthanc
diff OrthancServer/DicomProtocol/DicomUserConnection.h @ 1368:b22ba8c5edbe query-retrieve
query retrieve
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Tue, 26 May 2015 17:54:34 +0200 |
| parents | a3559b66fba7 |
| children | f528849ee9f7 |
line wrap: on
line diff
--- a/OrthancServer/DicomProtocol/DicomUserConnection.h Fri May 22 17:40:10 2015 +0200 +++ b/OrthancServer/DicomProtocol/DicomUserConnection.h Tue May 26 17:54:34 2015 +0200 @@ -46,14 +46,6 @@ class DicomUserConnection : public boost::noncopyable { private: - enum FindRootModel - { - FindRootModel_Patient, - FindRootModel_Study, - FindRootModel_Series, - FindRootModel_Instance - }; - struct PImpl; boost::shared_ptr<PImpl> pimpl_; @@ -72,10 +64,6 @@ void SetupPresentationContexts(const std::string& preferredTransferSyntax); - void Find(DicomFindAnswers& result, - FindRootModel model, - const DicomMap& fields); - void MoveInternal(const std::string& targetAet, const DicomMap& fields); @@ -150,17 +138,9 @@ void StoreFile(const std::string& path); - void FindPatient(DicomFindAnswers& result, - const DicomMap& fields); - - void FindStudy(DicomFindAnswers& result, - const DicomMap& fields); - - void FindSeries(DicomFindAnswers& result, - const DicomMap& fields); - - void FindInstance(DicomFindAnswers& result, - const DicomMap& fields); + void Find(DicomFindAnswers& result, + ResourceType level, + const DicomMap& fields); void Move(const std::string& targetAet, const DicomMap& findResult);