diff OrthancStone/Sources/Toolbox/DicomStructuredReport.h @ 2092:b7d4d288459a dicom-sr

refactoring
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 08 Nov 2023 10:32:16 +0100
parents 35de56fb6f89
children 79e984a89a38
line wrap: on
line diff
--- a/OrthancStone/Sources/Toolbox/DicomStructuredReport.h	Wed Nov 08 10:11:21 2023 +0100
+++ b/OrthancStone/Sources/Toolbox/DicomStructuredReport.h	Wed Nov 08 10:32:16 2023 +0100
@@ -97,12 +97,13 @@
 
     std::string                                 studyInstanceUid_;
     std::string                                 seriesInstanceUid_;
+    std::string                                 sopInstanceUid_;
     std::map<std::string, ReferencedInstance*>  instancesInformation_;
     std::vector<std::string>                    orderedInstances_;
     std::list<Structure*>                       structures_;
 
   public:
-    class Frame
+    class ReferencedFrame
     {
     private:
       std::string  studyInstanceUid_;
@@ -112,11 +113,11 @@
       unsigned int frameNumber_;
 
     public:
-      Frame(const std::string& studyInstanceUid,
-            const std::string& seriesInstanceUid,
-            const std::string& sopInstanceUid,
-            const std::string& sopClassUid,
-            unsigned int frameNumber) :
+      ReferencedFrame(const std::string& studyInstanceUid,
+                      const std::string& seriesInstanceUid,
+                      const std::string& sopInstanceUid,
+                      const std::string& sopClassUid,
+                      unsigned int frameNumber) :
         studyInstanceUid_(studyInstanceUid),
         seriesInstanceUid_(seriesInstanceUid),
         sopInstanceUid_(sopInstanceUid),
@@ -165,6 +166,11 @@
       return seriesInstanceUid_;
     }
     
+    const std::string& GetSopInstanceUid() const
+    {
+      return sopInstanceUid_;
+    }
+
     size_t GetReferencedInstancesCount() const
     {
       return orderedInstances_.size();
@@ -176,6 +182,6 @@
                                std::string& sopClassUid,
                                size_t i) const;
 
-    void ExportOrderedFrames(std::list<Frame>& frames) const;
+    void ExportReferencedFrames(std::list<ReferencedFrame>& frames) const;
   };
 }