Mercurial > hg > orthanc-stone

annotate Framework/Radiography/RadiographyLayer.h @ 476:a95090305dd4 am-touch-events

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
author am@osimis.io
date Wed, 13 Feb 2019 12:04:02 +0100
parents 3c28542229a3
children 2f6ecb5037ea
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
410
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 /**
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2 * Stone of Orthanc
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4 * Department, University Hospital of Liege, Belgium
439
b70e9be013e4 preparing for 2019
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 410
diff changeset
5 * Copyright (C) 2017-2019 Osimis S.A., Belgium
410
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 *
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 * This program is free software: you can redistribute it and/or
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 * modify it under the terms of the GNU Affero General Public License
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 * as published by the Free Software Foundation, either version 3 of
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 * the License, or (at your option) any later version.
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 *
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 * This program is distributed in the hope that it will be useful, but
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 * WITHOUT ANY WARRANTY; without even the implied warranty of
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
15 * Affero General Public License for more details.
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16 *
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
17 * You should have received a copy of the GNU Affero General Public License
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
18 * along with this program. If not, see <http://www.gnu.org/licenses/>.
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
19 **/
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22 #pragma once
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24 #include "../Toolbox/AffineTransform2D.h"
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
25 #include "../Toolbox/Extent2D.h"
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
26 #include "../Viewport/CairoContext.h"
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
27
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
28 namespace OrthancStone
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
29 {
476
a95090305dd4 Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents: 475
diff changeset
30 struct ControlPoint
a95090305dd4 Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents: 475
diff changeset
31 {
a95090305dd4 Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents: 475
diff changeset
32 double x;
a95090305dd4 Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents: 475
diff changeset
33 double y;
a95090305dd4 Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents: 475
diff changeset
34 size_t index;
a95090305dd4 Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents: 475
diff changeset
35
a95090305dd4 Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents: 475
diff changeset
36 ControlPoint(double x, double y, size_t index)
a95090305dd4 Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents: 475
diff changeset
37 : x(x),
a95090305dd4 Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents: 475
diff changeset
38 y(y),
a95090305dd4 Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents: 475
diff changeset
39 index(index)
a95090305dd4 Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents: 475
diff changeset
40 {}
a95090305dd4 Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents: 475
diff changeset
41
a95090305dd4 Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents: 475
diff changeset
42 ControlPoint()
a95090305dd4 Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents: 475
diff changeset
43 : x(0),
a95090305dd4 Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents: 475
diff changeset
44 y(0),
a95090305dd4 Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents: 475
diff changeset
45 index(std::numeric_limits<size_t>::max())
a95090305dd4 Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents: 475
diff changeset
46 {}
a95090305dd4 Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents: 475
diff changeset
47 };
a95090305dd4 Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents: 475
diff changeset
48
410
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
49 class RadiographyLayer : public boost::noncopyable
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
50 {
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
51 friend class RadiographyScene;
432
4eb96c6b4e96 improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents: 430
diff changeset
52
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
53 public:
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
54 class Geometry
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
55 {
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
56 bool hasCrop_;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
57 unsigned int cropX_;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
58 unsigned int cropY_;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
59 unsigned int cropWidth_;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
60 unsigned int cropHeight_;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
61 double panX_;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
62 double panY_;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
63 double angle_;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
64 bool resizeable_;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
65 double pixelSpacingX_;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
66 double pixelSpacingY_;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
67
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
68 public:
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
69 Geometry();
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
70
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
71 void ResetCrop()
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
72 {
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
73 hasCrop_ = false;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
74 }
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
75
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
76 void SetCrop(unsigned int x,
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
77 unsigned int y,
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
78 unsigned int width,
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
79 unsigned int height)
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
80 {
436
04711a2e12cd fix crop + export photometric interpretation correctly
am@osimis.io
parents: 432
diff changeset
81 hasCrop_ = true;
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
82 cropX_ = x;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
83 cropY_ = y;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
84 cropWidth_ = width;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
85 cropHeight_ = height;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
86 }
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
87
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
88 bool HasCrop() const
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
89 {
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
90 return hasCrop_;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
91 }
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
92
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
93 void GetCrop(unsigned int& x,
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
94 unsigned int& y,
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
95 unsigned int& width,
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
96 unsigned int& height) const;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
97
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
98 void SetAngle(double angle)
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
99 {
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
100 angle_ = angle;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
101 }
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
102
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
103 double GetAngle() const
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
104 {
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
105 return angle_;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
106 }
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
107
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
108 void SetPan(double x,
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
109 double y)
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
110 {
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
111 panX_ = x;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
112 panY_ = y;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
113 }
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
114
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
115 double GetPanX() const
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
116 {
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
117 return panX_;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
118 }
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
119
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
120 double GetPanY() const
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
121 {
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
122 return panY_;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
123 }
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
124
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
125 bool IsResizeable() const
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
126 {
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
127 return resizeable_;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
128 }
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
129
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
130 void SetResizeable(bool resizeable)
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
131 {
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
132 resizeable_ = resizeable;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
133 }
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
134
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
135 void SetPixelSpacing(double x,
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
136 double y)
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
137 {
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
138 pixelSpacingX_ = x;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
139 pixelSpacingY_ = y;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
140 }
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
141
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
142 double GetPixelSpacingX() const
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
143 {
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
144 return pixelSpacingX_;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
145 }
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
146
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
147 double GetPixelSpacingY() const
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
148 {
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
149 return pixelSpacingY_;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
150 }
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
151
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
152 };
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
153
410
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
154 private:
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
155 size_t index_;
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
156 bool hasSize_;
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
157 unsigned int width_;
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
158 unsigned int height_;
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
159 AffineTransform2D transform_;
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
160 AffineTransform2D transformInverse_;
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
161 Geometry geometry_;
432
4eb96c6b4e96 improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents: 430
diff changeset
162 PhotometricDisplayMode prefferedPhotometricDisplayMode_;
4eb96c6b4e96 improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents: 430
diff changeset
163
410
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
164
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
165 protected:
476
a95090305dd4 Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents: 475
diff changeset
166 virtual const AffineTransform2D& GetTransform() const
410
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
167 {
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
168 return transform_;
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
169 }
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
170
476
a95090305dd4 Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents: 475
diff changeset
171 virtual const AffineTransform2D& GetTransformInverse() const
a95090305dd4 Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents: 475
diff changeset
172 {
a95090305dd4 Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents: 475
diff changeset
173 return transformInverse_;
a95090305dd4 Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents: 475
diff changeset
174 }
a95090305dd4 Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents: 475
diff changeset
175
432
4eb96c6b4e96 improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents: 430
diff changeset
176 void SetPreferredPhotomotricDisplayMode(PhotometricDisplayMode prefferedPhotometricDisplayMode)
4eb96c6b4e96 improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents: 430
diff changeset
177 {
4eb96c6b4e96 improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents: 430
diff changeset
178 prefferedPhotometricDisplayMode_ = prefferedPhotometricDisplayMode;
4eb96c6b4e96 improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents: 430
diff changeset
179 }
4eb96c6b4e96 improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents: 430
diff changeset
180
476
a95090305dd4 Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents: 475
diff changeset
181 virtual void GetControlPointInternal(ControlPoint& controlPoint,
a95090305dd4 Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents: 475
diff changeset
182 size_t index) const;
a95090305dd4 Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents: 475
diff changeset
183
410
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
184 private:
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
185 void UpdateTransform();
476
a95090305dd4 Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents: 475
diff changeset
186
410
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
187 void AddToExtent(Extent2D& extent,
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
188 double x,
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
189 double y) const;
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
190
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
191 void SetIndex(size_t index)
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
192 {
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
193 index_ = index;
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
194 }
476
a95090305dd4 Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents: 475
diff changeset
195
410
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
196 bool Contains(double x,
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
197 double y) const;
476
a95090305dd4 Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents: 475
diff changeset
198
410
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
199 void DrawBorders(CairoContext& context,
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
200 double zoom);
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
201
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
202 public:
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
203 RadiographyLayer();
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
204
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
205 virtual ~RadiographyLayer()
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
206 {
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
207 }
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
208
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
209 size_t GetIndex() const
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
210 {
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
211 return index_;
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
212 }
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
213
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
214 const Geometry& GetGeometry() const
410
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
215 {
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
216 return geometry_;
410
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
217 }
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
218
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
219 void SetGeometry(const Geometry& geometry);
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
220
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
221 void ResetCrop();
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
222
410
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
223 void SetCrop(unsigned int x,
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
224 unsigned int y,
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
225 unsigned int width,
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
226 unsigned int height);
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
227
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
228 void GetCrop(unsigned int& x,
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
229 unsigned int& y,
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
230 unsigned int& width,
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
231 unsigned int& height) const;
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
232
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
233 void SetAngle(double angle);
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
234
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
235 void SetPan(double x,
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
236 double y);
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
237
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
238 void SetResizeable(bool resizeable)
410
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
239 {
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
240 geometry_.SetResizeable(resizeable);
410
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
241 }
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
242
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
243 void SetSize(unsigned int width,
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
244 unsigned int height);
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
245
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
246 bool HasSize() const
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
247 {
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
248 return hasSize_;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
249 }
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 410
diff changeset
250
410
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
251 unsigned int GetWidth() const
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
252 {
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
253 return width_;
476
a95090305dd4 Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents: 475
diff changeset
254 }
410
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
255
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
256 unsigned int GetHeight() const
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
257 {
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
258 return height_;
476
a95090305dd4 Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents: 475
diff changeset
259 }
410
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
260
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
261 Extent2D GetExtent() const;
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
262
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
263 bool GetPixel(unsigned int& imageX,
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
264 unsigned int& imageY,
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
265 double sceneX,
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
266 double sceneY) const;
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
267
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
268 void SetPixelSpacing(double x,
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
269 double y);
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
270
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
271 void GetCenter(double& centerX,
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
272 double& centerY) const;
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
273
476
a95090305dd4 Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents: 475
diff changeset
274 void GetControlPoint(ControlPoint& controlPoint,
a95090305dd4 Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents: 475
diff changeset
275 size_t index) const;
a95090305dd4 Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents: 475
diff changeset
276
a95090305dd4 Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents: 475
diff changeset
277 virtual size_t GetControlPointCount() const;
a95090305dd4 Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents: 475
diff changeset
278
a95090305dd4 Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents: 475
diff changeset
279 bool LookupControlPoint(ControlPoint& controlPoint /* out */,
a95090305dd4 Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents: 475
diff changeset
280 double x,
a95090305dd4 Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents: 475
diff changeset
281 double y,
a95090305dd4 Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents: 475
diff changeset
282 double zoom,
a95090305dd4 Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents: 475
diff changeset
283 double viewportDistance) const;
410
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
284
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
285 virtual bool GetDefaultWindowing(float& center,
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
286 float& width) const = 0;
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
287
432
4eb96c6b4e96 improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents: 430
diff changeset
288 PhotometricDisplayMode GetPreferredPhotomotricDisplayMode() const
4eb96c6b4e96 improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents: 430
diff changeset
289 {
4eb96c6b4e96 improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents: 430
diff changeset
290 return prefferedPhotometricDisplayMode_;
4eb96c6b4e96 improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents: 430
diff changeset
291 }
4eb96c6b4e96 improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents: 430
diff changeset
292
410
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
293 virtual void Render(Orthanc::ImageAccessor& buffer,
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
294 const AffineTransform2D& viewTransform,
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
295 ImageInterpolation interpolation) const = 0;
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
296
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
297 virtual bool GetRange(float& minValue,
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
298 float& maxValue) const = 0;
475
3c28542229a3 added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents: 440
diff changeset
299
3c28542229a3 added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents: 440
diff changeset
300 friend class RadiographyMaskLayer; // because it needs to GetTransform on the dicomLayer it relates to
3c28542229a3 added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents: 440
diff changeset
301 };
410
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
302 }