Mercurial > hg > orthanc

comparison Core/DicomFormat/DicomMap.cpp @ 3681:9dac85e807c2 storage-commitment

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
integration mainline->storage-commitment
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 20 Feb 2020 20:36:47 +0100
parents cccd97333e3d 26c6d47467a9
children 898903022836
comparison
equal deleted inserted replaced
3675:340bdcc298e9 3681:9dac85e807c2
1057 } 1057 }
1058 } 1058 }
1059 } 1059 }
1060 1060
1061 1061
1062 void DicomMap::ExtractMainDicomTagsInternal(const DicomMap& other, 1062 void DicomMap::MergeMainDicomTags(const DicomMap& other,
1063 ResourceType level) 1063 ResourceType level)
1064 { 1064 {
1065 const MainDicomTag* tags = NULL; 1065 const MainDicomTag* tags = NULL;
1066 size_t size = 0; 1066 size_t size = 0;
1067 1067
1068 LoadMainDicomTags(tags, size, level); 1068 LoadMainDicomTags(tags, size, level);
1083 1083
1084 1084
1085 void DicomMap::ExtractMainDicomTags(const DicomMap& other) 1085 void DicomMap::ExtractMainDicomTags(const DicomMap& other)
1086 { 1086 {
1087 Clear(); 1087 Clear();
1088 ExtractMainDicomTagsInternal(other, ResourceType_Patient); 1088 MergeMainDicomTags(other, ResourceType_Patient);
1089 ExtractMainDicomTagsInternal(other, ResourceType_Study); 1089 MergeMainDicomTags(other, ResourceType_Study);
1090 ExtractMainDicomTagsInternal(other, ResourceType_Series); 1090 MergeMainDicomTags(other, ResourceType_Series);
1091 ExtractMainDicomTagsInternal(other, ResourceType_Instance); 1091 MergeMainDicomTags(other, ResourceType_Instance);
1092 } 1092 }
1093 1093
1094 1094
1095 bool DicomMap::HasOnlyMainDicomTags() const 1095 bool DicomMap::HasOnlyMainDicomTags() const
1096 { 1096 {