# HG changeset patch
# User Alain Mazy <alain@mazy.be>
# Date 1623942036 -7200
# Node ID d7ac540e0149063742ebcf045df888f3aa39393e
# Parent  80e029f8ec91e9a78f40270de65b574a7ca232a9# Parent  f6eaf617d8e8ab6ceb8b3db10a3860c621225717
merge

diff -r 80e029f8ec91 -r d7ac540e0149 OrthancStone/Sources/Toolbox/DicomStructureSet2.cpp
--- a/OrthancStone/Sources/Toolbox/DicomStructureSet2.cpp	Thu Jun 17 17:00:06 2021 +0200
+++ b/OrthancStone/Sources/Toolbox/DicomStructureSet2.cpp	Thu Jun 17 17:00:36 2021 +0200
@@ -83,15 +83,14 @@
     {
       Orthanc::DicomTag tag = dicomPath.GetPrefixTag(i);
 
-      // We use this other object to be able to use GetMainTagsName
-      // and Format
+      // We use this other object to be able to use Format
       Orthanc::DicomTag tag2(tag.GetGroup(), tag.GetElement());
       size_t index = dicomPath.GetPrefixIndex(i);
-      tmp << tag2.GetMainTagsName() << " (" << tag2.Format() << ") [" << index << "] / ";
+      tmp << " (" << tag2.Format() << ") [" << index << "] / ";
     }
     const Orthanc::DicomTag& tag = dicomPath.GetFinalTag();
     Orthanc::DicomTag tag2(tag.GetGroup(), tag.GetElement());
-    tmp << tag2.GetMainTagsName() << " (" << tag2.Format() << ")";
+    tmp << " (" << tag2.Format() << ")";
     s = tmp.str();
   }
 
diff -r 80e029f8ec91 -r d7ac540e0149 UnitTestsSources/TestStructureSet.cpp
--- a/UnitTestsSources/TestStructureSet.cpp	Thu Jun 17 17:00:06 2021 +0200
+++ b/UnitTestsSources/TestStructureSet.cpp	Thu Jun 17 17:00:36 2021 +0200
@@ -4301,6 +4301,8 @@
 }
 
 
+#include <Toolbox.h>
+
 TEST(StructureSet, ReadFromJsonThatsAll)
 {
   DicomStructureSet2 structureSet;