annotate Framework/Radiography/RadiographyDicomLayer.h @ 655:1e26bb5f2a02

Fixed truncating conversion warnings + fixed deletion of incomplete type (seemingly due to M$ auto_ptr implementation)
author Benjamin Golinvaux <bgo@osimis.io>
date Tue, 14 May 2019 13:51:32 +0200
parents f1bfe3d1759f
children d2c0e347ddc2
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
1 /**
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
2 * Stone of Orthanc
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
4 * Department, University Hospital of Liege, Belgium
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
5 * Copyright (C) 2017-2018 Osimis S.A., Belgium
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
6 *
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
7 * This program is free software: you can redistribute it and/or
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
8 * modify it under the terms of the GNU Affero General Public License
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
9 * as published by the Free Software Foundation, either version 3 of
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
10 * the License, or (at your option) any later version.
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
11 *
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
12 * This program is distributed in the hope that it will be useful, but
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
13 * WITHOUT ANY WARRANTY; without even the implied warranty of
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
15 * Affero General Public License for more details.
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
16 *
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
17 * You should have received a copy of the GNU Affero General Public License
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
18 * along with this program. If not, see <http://www.gnu.org/licenses/>.
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
19 **/
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
20
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
21
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
22 #pragma once
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
23
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
24 #include "RadiographyLayer.h"
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
25 #include <Plugins/Samples/Common/FullOrthancDataset.h>
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
26
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
27 namespace OrthancStone
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
28 {
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
29 class RadiographyScene;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
30 class DicomFrameConverter;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
31
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
32 class RadiographyDicomLayer : public RadiographyLayer
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
33 {
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
34 private:
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
35 std::auto_ptr<Orthanc::ImageAccessor> source_; // Content of PixelData
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
36 std::auto_ptr<DicomFrameConverter> converter_;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
37 std::auto_ptr<Orthanc::ImageAccessor> converted_; // Float32
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
38 std::string instanceId_;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
39 unsigned int frame_;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
40
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
41 void ApplyConverter();
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
42
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
43 public:
655
1e26bb5f2a02 Fixed truncating conversion warnings + fixed deletion of incomplete type
Benjamin Golinvaux <bgo@osimis.io>
parents: 649
diff changeset
44 RadiographyDicomLayer(MessageBroker& broker, const RadiographyScene& scene);
503
77e0eb83ff63 layers are now Observable and emitting LayerEdited messages
amazy
parents: 430
diff changeset
45
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
46 void SetInstance(const std::string& instanceId, unsigned int frame)
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
47 {
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
48 instanceId_ = instanceId;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
49 frame_ = frame;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
50 }
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
51
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
52 std::string GetInstanceId() const
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
53 {
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
54 return instanceId_;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
55 }
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
56
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
57 unsigned int GetFrame() const
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
58 {
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
59 return frame_;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
60 }
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
61
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
62 void SetDicomTags(const OrthancPlugins::FullOrthancDataset& dataset);
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
63
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
64 void SetSourceImage(Orthanc::ImageAccessor* image); // Takes ownership
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
65
553
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 503
diff changeset
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
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 503
diff changeset
67
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 503
diff changeset
68 const DicomFrameConverter& GetDicomFrameConverter() const {return *converter_;} // currently need this access to serialize scene in plain old data to send to a WASM worker
649
f1bfe3d1759f Moved RadiographyDicomLayer::SetDicomFrameConverter to cpp file to prevent
Benjamin Golinvaux <bgo@osimis.io>
parents: 553
diff changeset
69
f1bfe3d1759f Moved RadiographyDicomLayer::SetDicomFrameConverter to cpp file to prevent
Benjamin Golinvaux <bgo@osimis.io>
parents: 553
diff changeset
70 // Takes ownership
f1bfe3d1759f Moved RadiographyDicomLayer::SetDicomFrameConverter to cpp file to prevent
Benjamin Golinvaux <bgo@osimis.io>
parents: 553
diff changeset
71 void SetDicomFrameConverter(DicomFrameConverter* converter);
553
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 503
diff changeset
72
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
73 virtual void Render(Orthanc::ImageAccessor& buffer,
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
74 const AffineTransform2D& viewTransform,
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
75 ImageInterpolation interpolation) const;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
76
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
77 virtual bool GetDefaultWindowing(float& center,
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
78 float& width) const;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
79
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
80 virtual bool GetRange(float& minValue,
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
81 float& maxValue) const;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
82 };
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
83 }