Mercurial > hg > orthanc-stone

comparison Framework/Toolbox/DicomFrameConverter.cpp @ 714:d2c0e347ddc2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
deprecating DicomFrameConverter
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 20 May 2019 16:26:34 +0200
parents b70e9be013e4
children
comparison
equal deleted inserted replaced
713:e63c8b9b7b02 714:d2c0e347ddc2
26 #include <Core/Images/Image.h> 26 #include <Core/Images/Image.h>
27 #include <Core/Images/ImageProcessing.h> 27 #include <Core/Images/ImageProcessing.h>
28 #include <Core/OrthancException.h> 28 #include <Core/OrthancException.h>
29 #include <Core/Toolbox.h> 29 #include <Core/Toolbox.h>
30 30
31 namespace OrthancStone 31 namespace Deprecated
32 { 32 {
33 static const Orthanc::DicomTag IMAGE_TAGS[] = 33 static const Orthanc::DicomTag IMAGE_TAGS[] =
34 { 34 {
35 Orthanc::DICOM_TAG_BITS_STORED, 35 Orthanc::DICOM_TAG_BITS_STORED,
36 Orthanc::DICOM_TAG_DOSE_GRID_SCALING, 36 Orthanc::DICOM_TAG_DOSE_GRID_SCALING,
59 59
60 void DicomFrameConverter::ReadParameters(const Orthanc::DicomMap& dicom) 60 void DicomFrameConverter::ReadParameters(const Orthanc::DicomMap& dicom)
61 { 61 {
62 SetDefaultParameters(); 62 SetDefaultParameters();
63 63
64 Vector c, w; 64 OrthancStone::Vector c, w;
65 if (LinearAlgebra::ParseVector(c, dicom, Orthanc::DICOM_TAG_WINDOW_CENTER) && 65 if (OrthancStone::LinearAlgebra::ParseVector(c, dicom, Orthanc::DICOM_TAG_WINDOW_CENTER) &&
66 LinearAlgebra::ParseVector(w, dicom, Orthanc::DICOM_TAG_WINDOW_WIDTH) && 66 OrthancStone::LinearAlgebra::ParseVector(w, dicom, Orthanc::DICOM_TAG_WINDOW_WIDTH) &&
67 c.size() > 0 && 67 c.size() > 0 &&
68 w.size() > 0) 68 w.size() > 0)
69 { 69 {
70 hasDefaultWindow_ = true; 70 hasDefaultWindow_ = true;
71 defaultWindowCenter_ = static_cast<float>(c[0]); 71 defaultWindowCenter_ = static_cast<float>(c[0]);