Mercurial > hg > orthanc
diff OrthancServer/Sources/Database/FindRequest.h @ 5676:b744a2cf408a find-refactoring
shorten ParentRetrieveSpecification/ChildrenRetrieveSpecification as ParentSpecification/ChildrenSpecification
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Sat, 06 Jul 2024 15:04:28 +0200 |
parents | 74f3aab95886 |
children | dc96401dbe88 |
line wrap: on
line diff
--- a/OrthancServer/Sources/Database/FindRequest.h Sat Jul 06 15:00:45 2024 +0200 +++ b/OrthancServer/Sources/Database/FindRequest.h Sat Jul 06 15:04:28 2024 +0200 @@ -155,14 +155,14 @@ }; - class ParentRetrieveSpecification : public boost::noncopyable + class ParentSpecification : public boost::noncopyable { private: bool mainDicomTags_; bool metadata_; public: - ParentRetrieveSpecification() : + ParentSpecification() : mainDicomTags_(false), metadata_(false) { @@ -195,7 +195,7 @@ }; - class ChildrenRetrieveSpecification : public boost::noncopyable + class ChildrenSpecification : public boost::noncopyable { private: bool identifiers_; @@ -203,7 +203,7 @@ std::set<DicomTag> mainDicomTags_; public: - ChildrenRetrieveSpecification() : + ChildrenSpecification() : identifiers_(false) { } @@ -263,12 +263,12 @@ bool retrieveLabels_; bool retrieveAttachments_; bool retrieveParentIdentifier_; - ParentRetrieveSpecification retrieveParentPatient_; - ParentRetrieveSpecification retrieveParentStudy_; - ParentRetrieveSpecification retrieveParentSeries_; - ChildrenRetrieveSpecification retrieveChildrenStudies_; - ChildrenRetrieveSpecification retrieveChildrenSeries_; - ChildrenRetrieveSpecification retrieveChildrenInstances_; + ParentSpecification retrieveParentPatient_; + ParentSpecification retrieveParentStudy_; + ParentSpecification retrieveParentSeries_; + ChildrenSpecification retrieveChildrenStudies_; + ChildrenSpecification retrieveChildrenSeries_; + ChildrenSpecification retrieveChildrenInstances_; bool retrieveOneInstanceIdentifier_; std::unique_ptr<MainDicomTagsRegistry> mainDicomTagsRegistry_; @@ -396,18 +396,18 @@ return retrieveParentIdentifier_; } - ParentRetrieveSpecification& GetParentRetrieveSpecification(ResourceType level); + ParentSpecification& GetParentSpecification(ResourceType level); - const ParentRetrieveSpecification& GetParentRetrieveSpecification(ResourceType level) const + const ParentSpecification& GetParentSpecification(ResourceType level) const { - return const_cast<FindRequest&>(*this).GetParentRetrieveSpecification(level); + return const_cast<FindRequest&>(*this).GetParentSpecification(level); } - ChildrenRetrieveSpecification& GetChildrenRetrieveSpecification(ResourceType level); + ChildrenSpecification& GetChildrenSpecification(ResourceType level); - const ChildrenRetrieveSpecification& GetChildrenRetrieveSpecification(ResourceType level) const + const ChildrenSpecification& GetChildrenSpecification(ResourceType level) const { - return const_cast<FindRequest&>(*this).GetChildrenRetrieveSpecification(level); + return const_cast<FindRequest&>(*this).GetChildrenSpecification(level); } void SetRetrieveOneInstanceIdentifier(bool retrieve); @@ -415,7 +415,7 @@ bool IsRetrieveOneInstanceIdentifier() const { return (retrieveOneInstanceIdentifier_ || - GetChildrenRetrieveSpecification(ResourceType_Instance).IsRetrieveIdentifiers()); + GetChildrenSpecification(ResourceType_Instance).IsRetrieveIdentifiers()); } }; }