Mercurial > hg > orthanc-stone

comparison Framework/Radiography/RadiographyScene.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 63982c8c294a
children 4f2416d519b4
comparison
equal deleted inserted replaced
713:e63c8b9b7b02 714:d2c0e347ddc2
20 20
21 21
22 #pragma once 22 #pragma once
23 23
24 #include "RadiographyLayer.h" 24 #include "RadiographyLayer.h"
25 #include "../Toolbox/DicomFrameConverter.h"
25 #include "../Toolbox/OrthancApiClient.h" 26 #include "../Toolbox/OrthancApiClient.h"
26 #include "Framework/StoneEnumerations.h" 27 #include "Framework/StoneEnumerations.h"
27 #include "Core/Images/Image.h" 28 #include "Core/Images/Image.h"
28 #include "Core/Images/ImageProcessing.h" 29 #include "Core/Images/ImageProcessing.h"
29 30
30 namespace OrthancStone 31 namespace OrthancStone
31 { 32 {
32 class RadiographyDicomLayer; 33 class RadiographyDicomLayer;
33 class DicomFrameConverter;
34 34
35 class RadiographyScene : 35 class RadiographyScene :
36 public IObserver, 36 public IObserver,
37 public IObservable 37 public IObservable
38 { 38 {
191 RadiographyLayer::Geometry* geometry); 191 RadiographyLayer::Geometry* geometry);
192 192
193 virtual RadiographyLayer& LoadDicomImage(Orthanc::ImageAccessor* dicomImage, // takes ownership 193 virtual RadiographyLayer& LoadDicomImage(Orthanc::ImageAccessor* dicomImage, // takes ownership
194 const std::string& instance, 194 const std::string& instance,
195 unsigned int frame, 195 unsigned int frame,
196 DicomFrameConverter* converter, // takes ownership 196 Deprecated::DicomFrameConverter* converter, // takes ownership
197 PhotometricDisplayMode preferredPhotometricDisplayMode, 197 PhotometricDisplayMode preferredPhotometricDisplayMode,
198 RadiographyLayer::Geometry* geometry); 198 RadiographyLayer::Geometry* geometry);
199 199
200 virtual RadiographyLayer& LoadDicomFrame(OrthancApiClient& orthanc, 200 virtual RadiographyLayer& LoadDicomFrame(OrthancApiClient& orthanc,
201 const std::string& instance, 201 const std::string& instance,