Mercurial > hg > orthanc-stone

comparison Framework/Radiography/RadiographyDicomLayer.h @ 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 1e26bb5f2a02
children c35e98d22764
comparison
equal deleted inserted replaced
713:e63c8b9b7b02 714:d2c0e347ddc2
19 **/ 19 **/
20 20
21 21
22 #pragma once 22 #pragma once
23 23
24 #include "../Toolbox/DicomFrameConverter.h"
24 #include "RadiographyLayer.h" 25 #include "RadiographyLayer.h"
26
25 #include <Plugins/Samples/Common/FullOrthancDataset.h> 27 #include <Plugins/Samples/Common/FullOrthancDataset.h>
26 28
27 namespace OrthancStone 29 namespace OrthancStone
28 { 30 {
29 class RadiographyScene; 31 class RadiographyScene;
30 class DicomFrameConverter;
31 32
32 class RadiographyDicomLayer : public RadiographyLayer 33 class RadiographyDicomLayer : public RadiographyLayer
33 { 34 {
34 private: 35 private:
35 std::auto_ptr<Orthanc::ImageAccessor> source_; // Content of PixelData 36 std::auto_ptr<Orthanc::ImageAccessor> source_; // Content of PixelData
36 std::auto_ptr<DicomFrameConverter> converter_; 37 std::auto_ptr<Deprecated::DicomFrameConverter> converter_;
37 std::auto_ptr<Orthanc::ImageAccessor> converted_; // Float32 38 std::auto_ptr<Orthanc::ImageAccessor> converted_; // Float32
38 std::string instanceId_; 39 std::string instanceId_;
39 unsigned int frame_; 40 unsigned int frame_;
40 41
41 void ApplyConverter(); 42 void ApplyConverter();
63 64
64 void SetSourceImage(Orthanc::ImageAccessor* image); // Takes ownership 65 void SetSourceImage(Orthanc::ImageAccessor* image); // Takes ownership
65 66
66 const Orthanc::ImageAccessor* GetSourceImage() const {return source_.get();} // currently need this access to serialize scene in plain old data to send to a WASM worker 67 const Orthanc::ImageAccessor* GetSourceImage() const {return source_.get();} // currently need this access to serialize scene in plain old data to send to a WASM worker
67 68
68 const DicomFrameConverter& GetDicomFrameConverter() const {return *converter_;} // currently need this access to serialize scene in plain old data to send to a WASM worker 69 const Deprecated::DicomFrameConverter& GetDicomFrameConverter() const {return *converter_;} // currently need this access to serialize scene in plain old data to send to a WASM worker
69 70
70 // Takes ownership 71 // Takes ownership
71 void SetDicomFrameConverter(DicomFrameConverter* converter); 72 void SetDicomFrameConverter(Deprecated::DicomFrameConverter* converter);
72 73
73 virtual void Render(Orthanc::ImageAccessor& buffer, 74 virtual void Render(Orthanc::ImageAccessor& buffer,
74 const AffineTransform2D& viewTransform, 75 const AffineTransform2D& viewTransform,
75 ImageInterpolation interpolation) const; 76 ImageInterpolation interpolation) const;
76 77