comparison Framework/Radiography/RadiographyScene.h @ 1259:69177b10e2b9

various fixes for RadiographyScene: support text layers outside the dicom layer, fix background in this case + extract dicom from rendered scene
author Alain Mazy <alain@mazy.be>
date Tue, 21 Jan 2020 16:52:37 +0100
parents 6af941a68472
children 2d8ab34c8c91 a989c7d46b9a
comparison
equal deleted inserted replaced
1258:9c20ae049669 1259:69177b10e2b9
34 34
35 class RadiographyScene : 35 class RadiographyScene :
36 public IObserver, 36 public IObserver,
37 public IObservable 37 public IObservable
38 { 38 {
39 friend class RadiographySceneGeometryReader;
39 public: 40 public:
40 class GeometryChangedMessage : public OriginMessage<RadiographyScene> 41 class GeometryChangedMessage : public OriginMessage<RadiographyScene>
41 { 42 {
42 ORTHANC_STONE_MESSAGE(__FILE__, __LINE__); 43 ORTHANC_STONE_MESSAGE(__FILE__, __LINE__);
43 44
165 bool hasWindowing_; 166 bool hasWindowing_;
166 float windowingCenter_; 167 float windowingCenter_;
167 float windowingWidth_; 168 float windowingWidth_;
168 Layers layers_; 169 Layers layers_;
169 170
171 public:
172 RadiographyLayer& RegisterLayer(RadiographyLayer* layer);
173
170 protected: 174 protected:
171 RadiographyLayer& RegisterLayer(RadiographyLayer* layer);
172
173 virtual void _RegisterLayer(RadiographyLayer* layer); 175 virtual void _RegisterLayer(RadiographyLayer* layer);
174 176
175 void SetLayerIndex(RadiographyLayer* layer, size_t index) 177 void SetLayerIndex(RadiographyLayer* layer, size_t index)
176 { 178 {
177 layer->SetIndex(index); 179 layer->SetIndex(index);
345 ImageInterpolation interpolation, 347 ImageInterpolation interpolation,
346 bool invert, 348 bool invert,
347 int64_t maxValue /* for inversion */, 349 int64_t maxValue /* for inversion */,
348 bool applyWindowing); 350 bool applyWindowing);
349 351
352 void ExtractLayerFromRenderedScene(Orthanc::ImageAccessor& layer,
353 const Orthanc::ImageAccessor& renderedScene,
354 size_t layerIndex,
355 ImageInterpolation interpolation);
350 }; 356 };
351 } 357 }