Mercurial > hg > orthanc

changeset 3678:26c6d47467a9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
DicomMap::MergeMainDicomTags()
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 20 Feb 2020 20:00:02 +0100
parents 4182cde57afb
children 6358923d3ced
files Core/DicomFormat/DicomMap.cpp Core/DicomFormat/DicomMap.h
diffstat 2 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/Core/DicomFormat/DicomMap.cpp	Wed Feb 19 17:17:27 2020 +0100
+++ b/Core/DicomFormat/DicomMap.cpp	Thu Feb 20 20:00:02 2020 +0100
@@ -1059,8 +1059,8 @@
   }
 
 
-  void DicomMap::ExtractMainDicomTagsInternal(const DicomMap& other,
-                                              ResourceType level)
+  void DicomMap::MergeMainDicomTags(const DicomMap& other,
+                                    ResourceType level)
   {
     const MainDicomTag* tags = NULL;
     size_t size = 0;
@@ -1085,10 +1085,10 @@
   void DicomMap::ExtractMainDicomTags(const DicomMap& other)
   {
     Clear();
-    ExtractMainDicomTagsInternal(other, ResourceType_Patient);
-    ExtractMainDicomTagsInternal(other, ResourceType_Study);
-    ExtractMainDicomTagsInternal(other, ResourceType_Series);
-    ExtractMainDicomTagsInternal(other, ResourceType_Instance);
+    MergeMainDicomTags(other, ResourceType_Patient);
+    MergeMainDicomTags(other, ResourceType_Study);
+    MergeMainDicomTags(other, ResourceType_Series);
+    MergeMainDicomTags(other, ResourceType_Instance);
   }    
 
 
--- a/Core/DicomFormat/DicomMap.h	Wed Feb 19 17:17:27 2020 +0100
+++ b/Core/DicomFormat/DicomMap.h	Thu Feb 20 20:00:02 2020 +0100
@@ -63,9 +63,6 @@
     static void GetMainDicomTagsInternal(std::set<DicomTag>& result,
                                          ResourceType level);
 
-    void ExtractMainDicomTagsInternal(const DicomMap& other,
-                                      ResourceType level);
-
   public:
     DicomMap()
     {
@@ -215,6 +212,9 @@
 
     void Merge(const DicomMap& other);
 
+    void MergeMainDicomTags(const DicomMap& other,
+                            ResourceType level);
+
     void ExtractMainDicomTags(const DicomMap& other);
 
     bool HasOnlyMainDicomTags() const;