Mercurial > hg > orthanc-stone

comparison Framework/Radiography/RadiographyDicomLayer.cpp @ 860:238693c3bc51 am-dev

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge default -> am-dev
author Alain Mazy <alain@mazy.be>
date Mon, 24 Jun 2019 14:35:00 +0200
parents be9c1530d40a
children b537002f83a9 35e798b16b65
comparison
equal deleted inserted replaced
856:a6e17a5a39e7 860:238693c3bc51
20 20
21 21
22 #include "RadiographyDicomLayer.h" 22 #include "RadiographyDicomLayer.h"
23 23
24 #include "RadiographyScene.h" 24 #include "RadiographyScene.h"
25 #include "../Toolbox/DicomFrameConverter.h" 25 #include "../Deprecated/Toolbox/DicomFrameConverter.h"
26 26
27 #include <Core/OrthancException.h> 27 #include <Core/OrthancException.h>
28 #include <Core/Images/Image.h> 28 #include <Core/Images/Image.h>
29 #include <Core/Images/ImageProcessing.h> 29 #include <Core/Images/ImageProcessing.h>
30 #include <Plugins/Samples/Common/DicomDatasetReader.h> 30 #include <Plugins/Samples/Common/DicomDatasetReader.h>
83 83
84 if (dataset.GetStringValue(tmp, ConvertTag(Orthanc::DICOM_TAG_PHOTOMETRIC_INTERPRETATION))) 84 if (dataset.GetStringValue(tmp, ConvertTag(Orthanc::DICOM_TAG_PHOTOMETRIC_INTERPRETATION)))
85 { 85 {
86 if (tmp == "MONOCHROME1") 86 if (tmp == "MONOCHROME1")
87 { 87 {
88 SetPreferredPhotomotricDisplayMode(PhotometricDisplayMode_Monochrome1); 88 SetPreferredPhotomotricDisplayMode(RadiographyPhotometricDisplayMode_Monochrome1);
89 } 89 }
90 else if (tmp == "MONOCHROME2") 90 else if (tmp == "MONOCHROME2")
91 { 91 {
92 SetPreferredPhotomotricDisplayMode(PhotometricDisplayMode_Monochrome2); 92 SetPreferredPhotomotricDisplayMode(RadiographyPhotometricDisplayMode_Monochrome2);
93 } 93 }
94 } 94 }
95 } 95 }
96 96
97 void RadiographyDicomLayer::SetSourceImage(Orthanc::ImageAccessor* image) // Takes ownership 97 void RadiographyDicomLayer::SetSourceImage(Orthanc::ImageAccessor* image) // Takes ownership