Mercurial > hg > orthanc

changeset 4770:248408d2b336

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hiding FromDcmtkBridge::Apply() on IDicomPathVisitor
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 25 Aug 2021 15:42:34 +0200
parents 9da6ca57a977
children 9f207131c7f4
files OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.cpp OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h
diffstat 2 files changed, 20 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.cpp	Wed Aug 25 15:20:48 2021 +0200
+++ b/OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.cpp	Wed Aug 25 15:42:34 2021 +0200
@@ -2978,10 +2978,10 @@
   }
 
 
-  static void ApplyInternal(FromDcmtkBridge::IDicomPathVisitor& visitor,
-                            DcmItem& item,
-                            const DicomPath& pattern,
-                            const DicomPath& actualPath)
+  void FromDcmtkBridge::IDicomPathVisitor::ApplyInternal(FromDcmtkBridge::IDicomPathVisitor& visitor,
+                                                         DcmItem& item,
+                                                         const DicomPath& pattern,
+                                                         const DicomPath& actualPath)
   {
     const size_t level = actualPath.GetPrefixLength();
       
@@ -3020,9 +3020,9 @@
   }
 
 
-  void FromDcmtkBridge::Apply(IDicomPathVisitor& visitor,
-                              DcmDataset& dataset,
-                              const DicomPath& path)
+  void FromDcmtkBridge::IDicomPathVisitor::Apply(IDicomPathVisitor& visitor,
+                                                 DcmDataset& dataset,
+                                                 const DicomPath& path)
   {
     DicomPath actualPath(path.GetFinalTag());
     ApplyInternal(visitor, dataset, path, actualPath);
@@ -3044,7 +3044,7 @@
     };
     
     Visitor visitor;
-    Apply(visitor, dataset, path);
+    IDicomPathVisitor::Apply(visitor, dataset, path);
   }
   
 
@@ -3084,7 +3084,7 @@
     };
     
     Visitor visitor(onlyIfExists);
-    Apply(visitor, dataset, path);
+    IDicomPathVisitor::Apply(visitor, dataset, path);
   }
   
 
@@ -3159,7 +3159,7 @@
     else
     {
       Visitor visitor(element, mode);
-      Apply(visitor, dataset, path);
+      IDicomPathVisitor::Apply(visitor, dataset, path);
     }
   }
 }
--- a/OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h	Wed Aug 25 15:20:48 2021 +0200
+++ b/OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h	Wed Aug 25 15:42:34 2021 +0200
@@ -64,6 +64,12 @@
     // New in Orthanc 1.9.4
     class ORTHANC_PUBLIC IDicomPathVisitor : public boost::noncopyable
     {
+    private:
+      static void ApplyInternal(FromDcmtkBridge::IDicomPathVisitor& visitor,
+                                DcmItem& item,
+                                const DicomPath& pattern,
+                                const DicomPath& actualPath);
+      
     public:
       virtual ~IDicomPathVisitor()
       {
@@ -71,6 +77,10 @@
 
       virtual void Visit(DcmItem& item,
                          const DicomPath& path) = 0;
+
+      static void Apply(IDicomPathVisitor& visitor,
+                        DcmDataset& dataset,
+                        const DicomPath& path);
     };
     
 
@@ -256,10 +266,6 @@
 
     static void LogMissingTagsForStore(DcmDataset& dicom);
 
-    static void Apply(IDicomPathVisitor& visitor,
-                      DcmDataset& dataset,
-                      const DicomPath& path);
-
     static void RemovePath(DcmDataset& dataset,
                            const DicomPath& path);