Mercurial > hg > orthanc

comparison OrthancServer/Sources/ResourceFinder.h @ 5609:4690a0d2b01e find-refactoring

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
preliminary support of requestedTags
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 08 May 2024 18:28:36 +0200
parents 3d0aa94b44b3
children a10978a5e65c
comparison
equal deleted inserted replaced
5608:3d0aa94b44b3 5609:4690a0d2b01e
33 class ResourceFinder : public boost::noncopyable 33 class ResourceFinder : public boost::noncopyable
34 { 34 {
35 private: 35 private:
36 FindRequest request_; 36 FindRequest request_;
37 bool expand_; 37 bool expand_;
38 std::set<DicomTag> requestedTags_;
39 DicomToJsonFormat format_; 38 DicomToJsonFormat format_;
39 bool hasRequestedTags_;
40 std::set<DicomTag> requestedPatientTags_;
41 std::set<DicomTag> requestedStudyTags_;
42 std::set<DicomTag> requestedSeriesTags_;
43 std::set<DicomTag> requestedInstanceTags_;
44 std::set<DicomTag> requestedTagsFromFileStorage_;
40 bool includeAllMetadata_; // Same as: ExpandResourceFlags_IncludeAllMetadata 45 bool includeAllMetadata_; // Same as: ExpandResourceFlags_IncludeAllMetadata
41 46
42 SeriesStatus GetSeriesStatus(uint32_t& expectedNumberOfInstances, 47 SeriesStatus GetSeriesStatus(uint32_t& expectedNumberOfInstances,
43 const FindResponse::Resource& resource) const; 48 const FindResponse::Resource& resource) const;
44 49
47 ServerIndex& index) const; 52 ServerIndex& index) const;
48 53
49 public: 54 public:
50 ResourceFinder(ResourceType level, 55 ResourceFinder(ResourceType level,
51 bool expand); 56 bool expand);
52
53 void SetRequestedTags(const std::set<DicomTag>& tags)
54 {
55 requestedTags_ = tags;
56 }
57 57
58 void SetFormat(DicomToJsonFormat format) 58 void SetFormat(DicomToJsonFormat format)
59 { 59 {
60 format_ = format; 60 format_ = format;
61 } 61 }
69 void SetIncludeAllMetadata(bool include) 69 void SetIncludeAllMetadata(bool include)
70 { 70 {
71 includeAllMetadata_ = include; 71 includeAllMetadata_ = include;
72 } 72 }
73 73
74 void AddRequestedTags(const DicomTag& tag);
75
76 void AddRequestedTags(const std::set<DicomTag>& tags);
77
74 void Execute(Json::Value& target, 78 void Execute(Json::Value& target,
75 ServerContext& context); 79 ServerContext& context);
76 }; 80 };
77 } 81 }