Mercurial > hg > orthanc

comparison OrthancServer/Sources/Database/StatelessDatabaseOperations.h @ 5039:28db9663fc2d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
DicomSequencesMap + fix unit tests
author Alain Mazy <am@osimis.io>
date Mon, 27 Jun 2022 10:48:46 +0200
parents 877bc3b96476
children ec5c203a97ea
comparison
equal deleted inserted replaced
5038:f8bea9c1c0fc 5039:28db9663fc2d
44 */ 44 */
45 struct DicomSequencesMap : public boost::noncopyable 45 struct DicomSequencesMap : public boost::noncopyable
46 { 46 {
47 std::map<DicomTag, Json::Value> sequences_; 47 std::map<DicomTag, Json::Value> sequences_;
48 48
49 void FromJson(const Json::Value& serialized); 49 void Deserialize(const Json::Value& serialized);
50 void Serialize(Json::Value& target, const std::set<DicomTag>& tags) const;
50 void FromDicomAsJson(const Json::Value& dicomAsJson, const std::set<DicomTag>& tags); 51 void FromDicomAsJson(const Json::Value& dicomAsJson, const std::set<DicomTag>& tags);
51 void ToJson(Json::Value& target, DicomToJsonFormat format) const; 52 void ToJson(Json::Value& target, DicomToJsonFormat format) const;
53
54 size_t GetSize() const
55 {
56 return sequences_.size();
57 }
52 }; 58 };
53 59
54 struct ExpandedResource : public boost::noncopyable 60 struct ExpandedResource : public boost::noncopyable
55 { 61 {
56 std::string id_; 62 std::string id_;
663 669
664 void ReconstructInstance(const ParsedDicomFile& dicom); 670 void ReconstructInstance(const ParsedDicomFile& dicom);
665 671
666 StoreStatus Store(std::map<MetadataType, std::string>& instanceMetadata, 672 StoreStatus Store(std::map<MetadataType, std::string>& instanceMetadata,
667 const DicomMap& dicomSummary, 673 const DicomMap& dicomSummary,
668 const std::map<DicomTag, Json::Value>& sequencesToStore, 674 const DicomSequencesMap& sequencesToStore,
669 const Attachments& attachments, 675 const Attachments& attachments,
670 const MetadataMap& metadata, 676 const MetadataMap& metadata,
671 const DicomInstanceOrigin& origin, 677 const DicomInstanceOrigin& origin,
672 bool overwrite, 678 bool overwrite,
673 bool hasTransferSyntax, 679 bool hasTransferSyntax,