Mercurial > hg > orthanc-stone

diff Framework/Toolbox/GeometryToolbox.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 2eca030792aa
children e2fe9352f240
line wrap: on
line diff
--- a/Framework/Toolbox/GeometryToolbox.cpp	Thu Sep 28 16:55:51 2017 +0200
+++ b/Framework/Toolbox/GeometryToolbox.cpp	Mon Oct 02 14:31:26 2017 +0200
@@ -68,11 +68,11 @@
 
 
     bool ParseVector(Vector& target,
-                     const OrthancPlugins::IDicomDataset& dataset,
-                     const OrthancPlugins::DicomPath& tag)
+                     const Orthanc::DicomMap& dataset,
+                     const Orthanc::DicomTag& tag)
     {
       std::string value;
-      return (dataset.GetStringValue(value, tag) &&
+      return (dataset.CopyToString(value, tag, false) &&
               ParseVector(target, value));
     }
 
@@ -351,11 +351,11 @@
 
     void GetPixelSpacing(double& spacingX, 
                          double& spacingY,
-                         const OrthancPlugins::IDicomDataset& dicom)
+                         const Orthanc::DicomMap& dicom)
     {
       Vector v;
 
-      if (ParseVector(v, dicom, OrthancPlugins::DICOM_TAG_PIXEL_SPACING))
+      if (ParseVector(v, dicom, Orthanc::DICOM_TAG_PIXEL_SPACING))
       {
         if (v.size() != 2 ||
             v[0] <= 0 ||