Mercurial > hg > orthanc

diff OrthancServer/Sources/ServerContext.h @ 4511:1ec156a0da38

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ServerContext::ReadDicomUntilPixelData()
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 11 Feb 2021 19:06:29 +0100
parents 98b7b9d21d83
children 1f455b86b054
line wrap: on
line diff
--- a/OrthancServer/Sources/ServerContext.h	Thu Feb 11 17:51:04 2021 +0100
+++ b/OrthancServer/Sources/ServerContext.h	Thu Feb 11 19:06:29 2021 +0100
@@ -159,9 +159,6 @@
     static void SaveJobsThread(ServerContext* that,
                                unsigned int sleepDelay);
 
-    void ReadDicomAsJsonInternal(std::string& result,
-                                 const std::string& instancePublicId);
-
     void SaveJobsEngine();
 
     virtual void SignalJobSubmitted(const std::string& jobId) ORTHANC_OVERRIDE;
@@ -316,36 +313,27 @@
                                      CompressionType compression);
 
     void ReadDicomAsJson(std::string& result,
-                         const std::string& instancePublicId,
-                         const std::set<DicomTag>& ignoreTagLength);
+                         const std::string& instancePublicId);
 
     void ReadDicomAsJson(Json::Value& result,
                          const std::string& instancePublicId,
                          const std::set<DicomTag>& ignoreTagLength);
 
-    void ReadDicomAsJson(std::string& result,
-                         const std::string& instancePublicId)
-    {
-      std::set<DicomTag> ignoreTagLength;
-      ReadDicomAsJson(result, instancePublicId, ignoreTagLength);
-    }
-
     void ReadDicomAsJson(Json::Value& result,
-                         const std::string& instancePublicId)
-    {
-      std::set<DicomTag> ignoreTagLength;
-      ReadDicomAsJson(result, instancePublicId, ignoreTagLength);
-    }
+                         const std::string& instancePublicId);
 
     void ReadDicom(std::string& dicom,
                    const std::string& instancePublicId);
     
-    // TODO CACHING MECHANISM AT THIS POINT
+    bool ReadDicomUntilPixelData(std::string& dicom,
+                                 const std::string& instancePublicId);
+
+    // This method is for low-level operations on "/instances/.../attachments/..."
     void ReadAttachment(std::string& result,
                         const std::string& instancePublicId,
                         FileContentType content,
                         bool uncompressIfNeeded);
-    
+
     void SetStoreMD5ForAttachments(bool storeMD5);
 
     bool IsStoreMD5ForAttachments() const