comparison Framework/Radiography/RadiographyScene.h @ 860:238693c3bc51 am-dev

merge default -> am-dev
author Alain Mazy <alain@mazy.be>
date Mon, 24 Jun 2019 14:35:00 +0200
parents be9c1530d40a
children 580dd82e13f5
comparison
equal deleted inserted replaced
856:a6e17a5a39e7 860:238693c3bc51
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 "../Deprecated/Toolbox/DicomFrameConverter.h"
26 #include "../Toolbox/OrthancApiClient.h" 26 #include "../Deprecated/Toolbox/OrthancApiClient.h"
27 #include "Framework/StoneEnumerations.h" 27 #include "../StoneEnumerations.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 30
31 namespace OrthancStone 31 namespace OrthancStone
32 { 32 {
170 float& width) const; 170 float& width) const;
171 171
172 virtual void SetWindowing(float center, 172 virtual void SetWindowing(float center,
173 float width); 173 float width);
174 174
175 PhotometricDisplayMode GetPreferredPhotomotricDisplayMode() const; 175 RadiographyPhotometricDisplayMode GetPreferredPhotomotricDisplayMode() const;
176 176
177 RadiographyLayer& LoadText(const Orthanc::Font& font, 177 RadiographyLayer& LoadText(const Orthanc::Font& font,
178 const std::string& utf8, 178 const std::string& utf8,
179 RadiographyLayer::Geometry* geometry); 179 RadiographyLayer::Geometry* geometry);
180 180
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 Deprecated::DicomFrameConverter* converter, // takes ownership 196 Deprecated::DicomFrameConverter* converter, // takes ownership
197 PhotometricDisplayMode preferredPhotometricDisplayMode, 197 RadiographyPhotometricDisplayMode preferredPhotometricDisplayMode,
198 RadiographyLayer::Geometry* geometry); 198 RadiographyLayer::Geometry* geometry);
199 199
200 virtual RadiographyLayer& LoadDicomFrame(Deprecated::OrthancApiClient& orthanc, 200 virtual RadiographyLayer& LoadDicomFrame(Deprecated::OrthancApiClient& orthanc,
201 const std::string& instance, 201 const std::string& instance,
202 unsigned int frame, 202 unsigned int frame,