changeset 1839:d7ac540e0149

merge
author Alain Mazy <alain@mazy.be>
date Thu, 17 Jun 2021 17:00:36 +0200
parents 80e029f8ec91 (current diff) f6eaf617d8e8 (diff)
children c01ed7a7c11f
files
diffstat 2 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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();
   }
 
--- 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;