Mercurial > hg > orthanc-stone

diff Framework/Toolbox/OrthancSlicesLoader.cpp @ 118:a4d0b6c82b29 wasm

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 02 Oct 2017 14:31:26 +0200
parents 42c05a3baee3
children ba83e38cf3ff
line wrap: on
line diff
--- a/Framework/Toolbox/OrthancSlicesLoader.cpp	Thu Sep 28 16:55:51 2017 +0200
+++ b/Framework/Toolbox/OrthancSlicesLoader.cpp	Mon Oct 02 14:31:26 2017 +0200
@@ -31,7 +31,6 @@
 #include <Core/Logging.h>
 #include <Core/OrthancException.h>
 #include <Core/Toolbox.h>
-#include <Plugins/Samples/Common/DicomDatasetReader.h>
 #include <Plugins/Samples/Common/FullOrthancDataset.h>
 
 #include <boost/lexical_cast.hpp>
@@ -295,10 +294,12 @@
     for (size_t i = 0; i < instances.size(); i++)
     {
       OrthancPlugins::FullOrthancDataset dataset(series[instances[i]]);
-      OrthancPlugins::DicomDatasetReader reader(dataset);
+
+      Orthanc::DicomMap dicom;
+      MessagingToolbox::ConvertDataset(dicom, dataset);
       
       unsigned int frames;
-      if (!reader.GetUnsignedIntegerValue(frames, OrthancPlugins::DICOM_TAG_NUMBER_OF_FRAMES))
+      if (!dicom.ParseUnsignedInteger32(frames, Orthanc::DICOM_TAG_NUMBER_OF_FRAMES))
       {
         frames = 1;
       }
@@ -306,7 +307,7 @@
       for (unsigned int frame = 0; frame < frames; frame++)
       {
         Slice slice;
-        if (slice.ParseOrthancFrame(dataset, instances[i], frame))
+        if (slice.ParseOrthancFrame(dicom, instances[i], frame))
         {
           slices_.AddSlice(slice);
         }
@@ -359,10 +360,12 @@
     }
 
     OrthancPlugins::FullOrthancDataset dataset(tags);
-    OrthancPlugins::DicomDatasetReader reader(dataset);
 
+    Orthanc::DicomMap dicom;
+    MessagingToolbox::ConvertDataset(dicom, dataset);
+      
     unsigned int frames;
-    if (!reader.GetUnsignedIntegerValue(frames, OrthancPlugins::DICOM_TAG_NUMBER_OF_FRAMES))
+    if (!dicom.ParseUnsignedInteger32(frames, Orthanc::DICOM_TAG_NUMBER_OF_FRAMES))
     {
       frames = 1;
     }
@@ -374,7 +377,7 @@
     for (unsigned int frame = 0; frame < frames; frame++)
     {
       Slice slice;
-      if (slice.ParseOrthancFrame(dataset, instanceId, frame))
+      if (slice.ParseOrthancFrame(dicom, instanceId, frame))
       {
         slices_.AddSlice(slice);
       }
@@ -406,9 +409,12 @@
     OrthancPlugins::FullOrthancDataset dataset(tags);
 
     state_ = State_GeometryReady;
-      
+
+    Orthanc::DicomMap dicom;
+    MessagingToolbox::ConvertDataset(dicom, dataset);
+
     Slice slice;
-    if (slice.ParseOrthancFrame(dataset, instanceId, frame))
+    if (slice.ParseOrthancFrame(dicom, instanceId, frame))
     {
       LOG(INFO) << "Loaded instance " << instanceId;
       slices_.AddSlice(slice);