Mercurial > hg > orthanc-stone
annotate OrthancStone/Sources/Scene2D/AnnotationsSceneLayer.cpp @ 2000:3e9ced39cd1b
simplification
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Wed, 02 Nov 2022 13:52:14 +0100 |
| parents | 709b90ae0f89 |
| children | e943a84da9ac |
| rev | line source |
|---|---|
| 1804 | 1 /** |
| 2 * Stone of Orthanc | |
| 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics | |
| 4 * Department, University Hospital of Liege, Belgium | |
|
1871
7053b8a0aaec
upgrade to year 2022
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1870
diff
changeset
|
5 * Copyright (C) 2017-2022 Osimis S.A., Belgium |
|
7053b8a0aaec
upgrade to year 2022
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1870
diff
changeset
|
6 * Copyright (C) 2021-2022 Sebastien Jodogne, ICTEAM UCLouvain, Belgium |
| 1804 | 7 * |
| 8 * This program is free software: you can redistribute it and/or | |
| 9 * modify it under the terms of the GNU Lesser General Public License | |
| 10 * as published by the Free Software Foundation, either version 3 of | |
| 11 * the License, or (at your option) any later version. | |
| 12 * | |
| 13 * This program is distributed in the hope that it will be useful, but | |
| 14 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 16 * Lesser General Public License for more details. | |
| 17 * | |
| 18 * You should have received a copy of the GNU Lesser General Public | |
| 19 * License along with this program. If not, see | |
| 20 * <http://www.gnu.org/licenses/>. | |
| 21 **/ | |
| 22 | |
| 23 | |
| 24 #include "AnnotationsSceneLayer.h" | |
| 25 | |
| 26 #include "MacroSceneLayer.h" | |
| 27 #include "PolylineSceneLayer.h" | |
| 28 #include "TextSceneLayer.h" | |
|
1987
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
29 #include "TextureBaseSceneLayer.h" |
| 1804 | 30 |
|
1978
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
31 #include <Images/ImageTraits.h> |
| 1804 | 32 #include <OrthancException.h> |
| 33 | |
| 34 #include <boost/math/constants/constants.hpp> | |
| 35 #include <list> | |
| 36 | |
|
1998
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
37 static const double PI = boost::math::constants::pi<double>(); |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
38 |
| 1804 | 39 static const double HANDLE_SIZE = 10.0; |
|
1998
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
40 static const double ARROW_LENGTH = 1.5 * HANDLE_SIZE; |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
41 static const double ARROW_ANGLE = 20.0 * PI / 180.0; |
| 1804 | 42 |
| 43 static const char* const KEY_ANNOTATIONS = "annotations"; | |
| 44 static const char* const KEY_TYPE = "type"; | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
45 static const char* const KEY_X = "x"; |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
46 static const char* const KEY_Y = "y"; |
| 1804 | 47 static const char* const KEY_X1 = "x1"; |
| 48 static const char* const KEY_Y1 = "y1"; | |
| 49 static const char* const KEY_X2 = "x2"; | |
| 50 static const char* const KEY_Y2 = "y2"; | |
| 51 static const char* const KEY_X3 = "x3"; | |
| 52 static const char* const KEY_Y3 = "y3"; | |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
53 static const char* const KEY_UNITS = "units"; |
|
1999
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
54 static const char* const KEY_LABEL = "label"; |
| 1804 | 55 |
| 56 static const char* const VALUE_ANGLE = "angle"; | |
| 57 static const char* const VALUE_CIRCLE = "circle"; | |
|
1998
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
58 static const char* const VALUE_LENGTH = "length"; |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
59 static const char* const VALUE_MILLIMETERS = "millimeters"; |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
60 static const char* const VALUE_PIXELS = "pixels"; |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
61 static const char* const VALUE_PIXEL_PROBE = "pixel-probe"; |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
62 static const char* const VALUE_RECTANGLE_PROBE = "rectangle-probe"; |
|
1987
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
63 static const char* const VALUE_ELLIPSE_PROBE = "ellipse-probe"; |
|
1998
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
64 static const char* const VALUE_TEXT_ANNOTATION = "text"; |
| 1804 | 65 |
|
1819
fe402c678d18
improved color theme for annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1817
diff
changeset
|
66 #if 0 |
|
fe402c678d18
improved color theme for annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1817
diff
changeset
|
67 static OrthancStone::Color COLOR_PRIMITIVES(192, 192, 192); |
|
fe402c678d18
improved color theme for annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1817
diff
changeset
|
68 static OrthancStone::Color COLOR_HOVER(0, 255, 0); |
|
fe402c678d18
improved color theme for annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1817
diff
changeset
|
69 static OrthancStone::Color COLOR_TEXT(255, 0, 0); |
|
fe402c678d18
improved color theme for annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1817
diff
changeset
|
70 #else |
|
fe402c678d18
improved color theme for annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1817
diff
changeset
|
71 static OrthancStone::Color COLOR_PRIMITIVES(0x40, 0x82, 0xad); |
|
fe402c678d18
improved color theme for annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1817
diff
changeset
|
72 static OrthancStone::Color COLOR_HOVER(0x40, 0xad, 0x79); |
|
fe402c678d18
improved color theme for annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1817
diff
changeset
|
73 static OrthancStone::Color COLOR_TEXT(0x4e, 0xde, 0x99); |
|
fe402c678d18
improved color theme for annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1817
diff
changeset
|
74 #endif |
|
fe402c678d18
improved color theme for annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1817
diff
changeset
|
75 |
| 1804 | 76 |
| 77 namespace OrthancStone | |
| 78 { | |
| 79 class AnnotationsSceneLayer::GeometricPrimitive : public boost::noncopyable | |
| 80 { | |
| 81 private: | |
| 82 bool modified_; | |
| 83 Annotation& parentAnnotation_; | |
| 84 Color color_; | |
| 85 Color hoverColor_; | |
| 86 bool isHover_; | |
| 87 int depth_; | |
| 88 | |
| 89 public: | |
| 90 GeometricPrimitive(Annotation& parentAnnotation, | |
| 91 int depth) : | |
| 92 modified_(true), | |
| 93 parentAnnotation_(parentAnnotation), | |
|
1819
fe402c678d18
improved color theme for annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1817
diff
changeset
|
94 color_(COLOR_PRIMITIVES), |
|
fe402c678d18
improved color theme for annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1817
diff
changeset
|
95 hoverColor_(COLOR_HOVER), |
| 1804 | 96 isHover_(false), |
| 97 depth_(depth) | |
| 98 { | |
| 99 } | |
| 100 | |
| 101 virtual ~GeometricPrimitive() | |
| 102 { | |
| 103 } | |
| 104 | |
| 105 Annotation& GetParentAnnotation() const | |
| 106 { | |
| 107 return parentAnnotation_; | |
| 108 } | |
| 109 | |
| 110 int GetDepth() const | |
| 111 { | |
| 112 return depth_; | |
| 113 } | |
| 114 | |
| 115 void SetHover(bool hover) | |
| 116 { | |
| 117 if (hover != isHover_) | |
| 118 { | |
| 119 isHover_ = hover; | |
| 120 modified_ = true; | |
| 121 } | |
| 122 } | |
| 123 | |
| 124 bool IsHover() const | |
| 125 { | |
| 126 return isHover_; | |
| 127 } | |
| 128 | |
| 129 void SetModified(bool modified) | |
| 130 { | |
| 131 modified_ = modified; | |
| 132 } | |
| 133 | |
| 134 bool IsModified() const | |
| 135 { | |
| 136 return modified_; | |
| 137 } | |
| 138 | |
| 139 void SetColor(const Color& color) | |
| 140 { | |
| 141 SetModified(true); | |
| 142 color_ = color; | |
| 143 } | |
| 144 | |
| 145 void SetHoverColor(const Color& color) | |
| 146 { | |
| 147 SetModified(true); | |
| 148 hoverColor_ = color; | |
| 149 } | |
| 150 | |
| 151 const Color& GetColor() const | |
| 152 { | |
| 153 return color_; | |
| 154 } | |
| 155 | |
| 156 const Color& GetHoverColor() const | |
| 157 { | |
| 158 return hoverColor_; | |
| 159 } | |
|
1981
c074c75cf416
moved drawing primitives from AnnotationsSceneLayer to PolylineSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
160 |
|
c074c75cf416
moved drawing primitives from AnnotationsSceneLayer to PolylineSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
161 Color GetActiveColor() const |
|
c074c75cf416
moved drawing primitives from AnnotationsSceneLayer to PolylineSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
162 { |
|
c074c75cf416
moved drawing primitives from AnnotationsSceneLayer to PolylineSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
163 return (IsHover() ? GetHoverColor() : GetColor()); |
|
c074c75cf416
moved drawing primitives from AnnotationsSceneLayer to PolylineSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
164 } |
| 1804 | 165 |
| 166 virtual bool IsHit(const ScenePoint2D& p, | |
| 167 const Scene2D& scene) const = 0; | |
| 168 | |
| 169 // Always called, even if not modified | |
| 170 virtual void RenderPolylineLayer(PolylineSceneLayer& polyline, | |
| 171 const Scene2D& scene) = 0; | |
| 172 | |
| 173 // Only called if modified | |
| 174 virtual void RenderOtherLayers(MacroSceneLayer& macro, | |
| 175 const Scene2D& scene) = 0; | |
| 176 | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
177 virtual void MovePreview(const ScenePoint2D& delta, |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
178 const Scene2D& scene) = 0; |
| 1804 | 179 |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
180 virtual void MoveDone(const ScenePoint2D& delta, |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
181 const Scene2D& scene) = 0; |
| 1804 | 182 }; |
| 183 | |
| 184 | |
| 185 class AnnotationsSceneLayer::Annotation : public boost::noncopyable | |
| 186 { | |
| 187 private: | |
| 188 typedef std::list<GeometricPrimitive*> GeometricPrimitives; | |
| 189 | |
| 190 AnnotationsSceneLayer& that_; | |
| 191 GeometricPrimitives primitives_; | |
| 192 | |
| 193 public: | |
| 2000 | 194 explicit Annotation(AnnotationsSceneLayer& that) : |
| 195 that_(that) | |
| 1804 | 196 { |
| 197 that.AddAnnotation(this); | |
| 198 } | |
| 199 | |
| 200 virtual ~Annotation() | |
| 201 { | |
| 202 for (GeometricPrimitives::iterator it = primitives_.begin(); it != primitives_.end(); ++it) | |
| 203 { | |
| 204 that_.DeletePrimitive(*it); | |
| 205 } | |
| 206 } | |
| 207 | |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
208 AnnotationsSceneLayer& GetParentLayer() const |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
209 { |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
210 return that_; |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
211 } |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
212 |
| 1804 | 213 GeometricPrimitive* AddPrimitive(GeometricPrimitive* primitive) |
| 214 { | |
| 215 if (primitive == NULL) | |
| 216 { | |
| 217 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer); | |
| 218 } | |
| 219 else | |
| 220 { | |
| 221 assert(that_.primitives_.find(primitive) == that_.primitives_.end()); | |
| 222 primitives_.push_back(primitive); // For automated deallocation | |
| 223 that_.primitives_.insert(primitive); | |
| 224 return primitive; | |
| 225 } | |
| 226 } | |
| 227 | |
| 228 template <typename T> | |
| 229 T& AddTypedPrimitive(T* primitive) | |
| 230 { | |
| 231 AddPrimitive(primitive); | |
| 232 return *primitive; | |
| 233 } | |
| 234 | |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
235 virtual unsigned int GetHandlesCount() const = 0; |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
236 |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
237 virtual Handle& GetHandle(unsigned int index) const = 0; |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
238 |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
239 virtual void SignalMove(GeometricPrimitive& primitive, |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
240 const Scene2D& scene) = 0; |
| 1804 | 241 |
|
1976
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
242 virtual void UpdateProbe(const Scene2D& scene) = 0; |
|
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
243 |
| 1804 | 244 virtual void Serialize(Json::Value& target) = 0; |
| 245 }; | |
| 246 | |
| 247 | |
| 248 class AnnotationsSceneLayer::Handle : public GeometricPrimitive | |
| 249 { | |
|
1980
0aac8f552d89
added pixel probe to the Stone Web viewer toolbar
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1979
diff
changeset
|
250 public: |
|
0aac8f552d89
added pixel probe to the Stone Web viewer toolbar
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1979
diff
changeset
|
251 enum Shape { |
|
0aac8f552d89
added pixel probe to the Stone Web viewer toolbar
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1979
diff
changeset
|
252 Shape_Square, |
|
1981
c074c75cf416
moved drawing primitives from AnnotationsSceneLayer to PolylineSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
253 Shape_CrossedSquare, |
|
c074c75cf416
moved drawing primitives from AnnotationsSceneLayer to PolylineSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
254 Shape_Circle, |
|
1999
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
255 Shape_CrossedCircle, |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
256 Shape_Invisible /* to use in conjunction with arrows */ |
|
1980
0aac8f552d89
added pixel probe to the Stone Web viewer toolbar
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1979
diff
changeset
|
257 }; |
|
0aac8f552d89
added pixel probe to the Stone Web viewer toolbar
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1979
diff
changeset
|
258 |
| 1804 | 259 private: |
|
1980
0aac8f552d89
added pixel probe to the Stone Web viewer toolbar
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1979
diff
changeset
|
260 Shape shape_; |
| 1804 | 261 ScenePoint2D center_; |
| 262 ScenePoint2D delta_; | |
| 263 | |
|
1980
0aac8f552d89
added pixel probe to the Stone Web viewer toolbar
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1979
diff
changeset
|
264 void AddCross(PolylineSceneLayer& polyline, |
|
0aac8f552d89
added pixel probe to the Stone Web viewer toolbar
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1979
diff
changeset
|
265 double x1, |
|
0aac8f552d89
added pixel probe to the Stone Web viewer toolbar
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1979
diff
changeset
|
266 double y1, |
|
0aac8f552d89
added pixel probe to the Stone Web viewer toolbar
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1979
diff
changeset
|
267 double x2, |
|
0aac8f552d89
added pixel probe to the Stone Web viewer toolbar
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1979
diff
changeset
|
268 double y2) |
|
0aac8f552d89
added pixel probe to the Stone Web viewer toolbar
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1979
diff
changeset
|
269 { |
|
0aac8f552d89
added pixel probe to the Stone Web viewer toolbar
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1979
diff
changeset
|
270 const double halfX = (x1 + x2) / 2.0; |
|
0aac8f552d89
added pixel probe to the Stone Web viewer toolbar
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1979
diff
changeset
|
271 const double halfY = (y1 + y2) / 2.0; |
|
1981
c074c75cf416
moved drawing primitives from AnnotationsSceneLayer to PolylineSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
272 polyline.AddSegment(x1, halfY, x2, halfY, GetActiveColor()); |
|
c074c75cf416
moved drawing primitives from AnnotationsSceneLayer to PolylineSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
273 polyline.AddSegment(halfX, y1, halfX, y2, GetActiveColor()); |
|
1980
0aac8f552d89
added pixel probe to the Stone Web viewer toolbar
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1979
diff
changeset
|
274 } |
|
0aac8f552d89
added pixel probe to the Stone Web viewer toolbar
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1979
diff
changeset
|
275 |
| 1804 | 276 public: |
| 277 explicit Handle(Annotation& parentAnnotation, | |
|
1980
0aac8f552d89
added pixel probe to the Stone Web viewer toolbar
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1979
diff
changeset
|
278 Shape shape, |
| 1804 | 279 const ScenePoint2D& center) : |
| 280 GeometricPrimitive(parentAnnotation, 0), // Highest priority | |
|
1980
0aac8f552d89
added pixel probe to the Stone Web viewer toolbar
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1979
diff
changeset
|
281 shape_(shape), |
| 1804 | 282 center_(center), |
| 283 delta_(0, 0) | |
| 284 { | |
| 285 } | |
| 286 | |
| 287 void SetSize(unsigned int size) | |
| 288 { | |
| 289 SetModified(true); | |
| 290 } | |
| 291 | |
| 292 void SetCenter(const ScenePoint2D& center) | |
| 293 { | |
| 294 SetModified(true); | |
| 295 center_ = center; | |
| 296 delta_ = ScenePoint2D(0, 0); | |
| 297 } | |
| 298 | |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
299 void SetCenter(double x, |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
300 double y) |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
301 { |
|
1998
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
302 SetCenter(ScenePoint2D(x, y)); |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
303 } |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
304 |
| 1804 | 305 ScenePoint2D GetCenter() const |
| 306 { | |
| 307 return center_ + delta_; | |
| 308 } | |
| 309 | |
| 310 virtual bool IsHit(const ScenePoint2D& p, | |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1806
diff
changeset
|
311 const Scene2D& scene) const ORTHANC_OVERRIDE |
| 1804 | 312 { |
| 313 const double zoom = scene.GetSceneToCanvasTransform().ComputeZoom(); | |
| 314 | |
| 315 double dx = (center_.GetX() + delta_.GetX() - p.GetX()) * zoom; | |
| 316 double dy = (center_.GetY() + delta_.GetY() - p.GetY()) * zoom; | |
| 317 | |
|
1981
c074c75cf416
moved drawing primitives from AnnotationsSceneLayer to PolylineSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
318 return (std::abs(dx) <= HANDLE_SIZE / 2.0 && |
|
c074c75cf416
moved drawing primitives from AnnotationsSceneLayer to PolylineSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
319 std::abs(dy) <= HANDLE_SIZE / 2.0); |
| 1804 | 320 } |
| 321 | |
| 322 virtual void RenderPolylineLayer(PolylineSceneLayer& polyline, | |
| 323 const Scene2D& scene) ORTHANC_OVERRIDE | |
| 324 { | |
|
1981
c074c75cf416
moved drawing primitives from AnnotationsSceneLayer to PolylineSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
325 static unsigned int NUM_SEGMENTS = 16; |
|
c074c75cf416
moved drawing primitives from AnnotationsSceneLayer to PolylineSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
326 |
| 1804 | 327 const double zoom = scene.GetSceneToCanvasTransform().ComputeZoom(); |
| 328 | |
|
1981
c074c75cf416
moved drawing primitives from AnnotationsSceneLayer to PolylineSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
329 // TODO: take DPI into account |
|
c074c75cf416
moved drawing primitives from AnnotationsSceneLayer to PolylineSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
330 const double unzoomedHandleSize = (HANDLE_SIZE / 2.0) / zoom; |
|
c074c75cf416
moved drawing primitives from AnnotationsSceneLayer to PolylineSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
331 const double x = center_.GetX() + delta_.GetX(); |
|
c074c75cf416
moved drawing primitives from AnnotationsSceneLayer to PolylineSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
332 const double y = center_.GetY() + delta_.GetY(); |
|
c074c75cf416
moved drawing primitives from AnnotationsSceneLayer to PolylineSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
333 const double x1 = x - unzoomedHandleSize; |
|
c074c75cf416
moved drawing primitives from AnnotationsSceneLayer to PolylineSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
334 const double y1 = y - unzoomedHandleSize; |
|
c074c75cf416
moved drawing primitives from AnnotationsSceneLayer to PolylineSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
335 const double x2 = x + unzoomedHandleSize; |
|
c074c75cf416
moved drawing primitives from AnnotationsSceneLayer to PolylineSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
336 const double y2 = y + unzoomedHandleSize; |
| 1804 | 337 |
|
1980
0aac8f552d89
added pixel probe to the Stone Web viewer toolbar
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1979
diff
changeset
|
338 switch (shape_) |
|
0aac8f552d89
added pixel probe to the Stone Web viewer toolbar
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1979
diff
changeset
|
339 { |
|
0aac8f552d89
added pixel probe to the Stone Web viewer toolbar
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1979
diff
changeset
|
340 case Shape_Square: |
|
1981
c074c75cf416
moved drawing primitives from AnnotationsSceneLayer to PolylineSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
341 polyline.AddRectangle(x1, y1, x2, y2, GetActiveColor()); |
|
1980
0aac8f552d89
added pixel probe to the Stone Web viewer toolbar
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1979
diff
changeset
|
342 break; |
|
0aac8f552d89
added pixel probe to the Stone Web viewer toolbar
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1979
diff
changeset
|
343 |
|
0aac8f552d89
added pixel probe to the Stone Web viewer toolbar
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1979
diff
changeset
|
344 case Shape_CrossedSquare: |
|
1981
c074c75cf416
moved drawing primitives from AnnotationsSceneLayer to PolylineSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
345 polyline.AddRectangle(x1, y1, x2, y2, GetActiveColor()); |
|
c074c75cf416
moved drawing primitives from AnnotationsSceneLayer to PolylineSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
346 AddCross(polyline, x1, y1, x2, y2); |
|
c074c75cf416
moved drawing primitives from AnnotationsSceneLayer to PolylineSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
347 break; |
|
c074c75cf416
moved drawing primitives from AnnotationsSceneLayer to PolylineSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
348 |
|
c074c75cf416
moved drawing primitives from AnnotationsSceneLayer to PolylineSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
349 case Shape_Circle: |
|
c074c75cf416
moved drawing primitives from AnnotationsSceneLayer to PolylineSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
350 polyline.AddCircle(x, y, unzoomedHandleSize, GetActiveColor(), NUM_SEGMENTS); |
|
c074c75cf416
moved drawing primitives from AnnotationsSceneLayer to PolylineSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
351 break; |
|
c074c75cf416
moved drawing primitives from AnnotationsSceneLayer to PolylineSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
352 |
|
c074c75cf416
moved drawing primitives from AnnotationsSceneLayer to PolylineSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
353 case Shape_CrossedCircle: |
|
c074c75cf416
moved drawing primitives from AnnotationsSceneLayer to PolylineSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
354 polyline.AddCircle(x, y, unzoomedHandleSize, GetActiveColor(), NUM_SEGMENTS); |
|
1980
0aac8f552d89
added pixel probe to the Stone Web viewer toolbar
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1979
diff
changeset
|
355 AddCross(polyline, x1, y1, x2, y2); |
|
0aac8f552d89
added pixel probe to the Stone Web viewer toolbar
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1979
diff
changeset
|
356 break; |
| 1804 | 357 |
|
1999
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
358 case Shape_Invisible: |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
359 break; |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
360 |
|
1980
0aac8f552d89
added pixel probe to the Stone Web viewer toolbar
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1979
diff
changeset
|
361 default: |
|
0aac8f552d89
added pixel probe to the Stone Web viewer toolbar
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1979
diff
changeset
|
362 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); |
| 1804 | 363 } |
| 364 } | |
| 365 | |
| 366 virtual void RenderOtherLayers(MacroSceneLayer& macro, | |
| 367 const Scene2D& scene) ORTHANC_OVERRIDE | |
| 368 { | |
| 369 } | |
| 370 | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
371 virtual void MovePreview(const ScenePoint2D& delta, |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
372 const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 373 { |
| 374 SetModified(true); | |
| 375 delta_ = delta; | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
376 GetParentAnnotation().SignalMove(*this, scene); |
| 1804 | 377 } |
| 378 | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
379 virtual void MoveDone(const ScenePoint2D& delta, |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
380 const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 381 { |
| 382 SetModified(true); | |
| 383 center_ = center_ + delta; | |
| 384 delta_ = ScenePoint2D(0, 0); | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
385 GetParentAnnotation().SignalMove(*this, scene); |
| 1804 | 386 } |
| 387 }; | |
| 388 | |
| 389 | |
| 390 class AnnotationsSceneLayer::Segment : public GeometricPrimitive | |
| 391 { | |
| 392 private: | |
| 393 ScenePoint2D p1_; | |
| 394 ScenePoint2D p2_; | |
| 395 ScenePoint2D delta_; | |
|
1998
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
396 bool hasStartArrow_; |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
397 bool hasEndArrow_; |
| 1804 | 398 |
| 399 public: | |
| 400 Segment(Annotation& parentAnnotation, | |
| 401 const ScenePoint2D& p1, | |
| 402 const ScenePoint2D& p2) : | |
| 403 GeometricPrimitive(parentAnnotation, 1), // Can only be selected if no handle matches | |
| 404 p1_(p1), | |
| 405 p2_(p2), | |
|
1998
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
406 delta_(0, 0), |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
407 hasStartArrow_(false), |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
408 hasEndArrow_(false) |
| 1804 | 409 { |
| 410 } | |
| 411 | |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
412 Segment(Annotation& parentAnnotation, |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
413 double x1, |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
414 double y1, |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
415 double x2, |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
416 double y2) : |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
417 GeometricPrimitive(parentAnnotation, 1), // Can only be selected if no handle matches |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
418 p1_(x1, y1), |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
419 p2_(x2, y2), |
|
1998
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
420 delta_(0, 0), |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
421 hasStartArrow_(false), |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
422 hasEndArrow_(false) |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
423 { |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
424 } |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
425 |
| 1804 | 426 void SetPosition(const ScenePoint2D& p1, |
| 427 const ScenePoint2D& p2) | |
| 428 { | |
| 429 SetModified(true); | |
| 430 p1_ = p1; | |
| 431 p2_ = p2; | |
| 432 delta_ = ScenePoint2D(0, 0); | |
| 433 } | |
| 434 | |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
435 void SetPosition(double x1, |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
436 double y1, |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
437 double x2, |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
438 double y2) |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
439 { |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
440 SetModified(true); |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
441 p1_ = ScenePoint2D(x1, y1); |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
442 p2_ = ScenePoint2D(x2, y2); |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
443 delta_ = ScenePoint2D(0, 0); |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
444 } |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
445 |
| 1804 | 446 ScenePoint2D GetPosition1() const |
| 447 { | |
| 448 return p1_ + delta_; | |
| 449 } | |
| 450 | |
| 451 ScenePoint2D GetPosition2() const | |
| 452 { | |
| 453 return p2_ + delta_; | |
| 454 } | |
| 455 | |
|
1998
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
456 void SetStartArrow(bool enabled) |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
457 { |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
458 SetModified(true); |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
459 hasStartArrow_ = enabled; |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
460 } |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
461 |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
462 bool HasStartArrow() const |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
463 { |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
464 return hasStartArrow_; |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
465 } |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
466 |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
467 void SetEndArrow(bool enabled) |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
468 { |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
469 SetModified(true); |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
470 hasEndArrow_ = enabled; |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
471 } |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
472 |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
473 bool HasEndArrow() const |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
474 { |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
475 return hasEndArrow_; |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
476 } |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
477 |
| 1804 | 478 virtual bool IsHit(const ScenePoint2D& p, |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1806
diff
changeset
|
479 const Scene2D& scene) const ORTHANC_OVERRIDE |
| 1804 | 480 { |
| 481 const double zoom = scene.GetSceneToCanvasTransform().ComputeZoom(); | |
| 482 return (ScenePoint2D::SquaredDistancePtSegment(p1_ + delta_, p2_ + delta_, p) * zoom * zoom <= | |
| 483 (HANDLE_SIZE / 2.0) * (HANDLE_SIZE / 2.0)); | |
| 484 } | |
| 485 | |
| 486 virtual void RenderPolylineLayer(PolylineSceneLayer& polyline, | |
| 487 const Scene2D& scene) ORTHANC_OVERRIDE | |
| 488 { | |
|
1998
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
489 const Color color = GetActiveColor(); |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
490 const ScenePoint2D a(p1_ + delta_); |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
491 const ScenePoint2D b(p2_ + delta_); |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
492 |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
493 polyline.AddSegment(a, b, color); |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
494 |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
495 if (hasStartArrow_ || |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
496 hasEndArrow_) |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
497 { |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
498 const double length = ARROW_LENGTH / scene.GetSceneToCanvasTransform().ComputeZoom(); |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
499 const double angle = atan2(b.GetY() - a.GetY(), b.GetX() - a.GetX()); |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
500 |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
501 if (hasStartArrow_) |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
502 { |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
503 polyline.AddSegment(a, a + ScenePoint2D( |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
504 length * cos(angle + ARROW_ANGLE), |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
505 length * sin(angle + ARROW_ANGLE)), color); |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
506 polyline.AddSegment(a, a + ScenePoint2D( |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
507 length * cos(angle - ARROW_ANGLE), |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
508 length * sin(angle - ARROW_ANGLE)), color); |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
509 } |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
510 |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
511 if (hasEndArrow_) |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
512 { |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
513 polyline.AddSegment(b, b + ScenePoint2D( |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
514 length * cos(angle + ARROW_ANGLE + PI), |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
515 length * sin(angle + ARROW_ANGLE + PI)), color); |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
516 polyline.AddSegment(b, b + ScenePoint2D( |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
517 length * cos(angle - ARROW_ANGLE + PI), |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
518 length * sin(angle - ARROW_ANGLE + PI)), color); |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
519 } |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
520 } |
| 1804 | 521 } |
| 522 | |
| 523 virtual void RenderOtherLayers(MacroSceneLayer& macro, | |
| 524 const Scene2D& scene) ORTHANC_OVERRIDE | |
| 525 { | |
| 526 } | |
| 527 | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
528 virtual void MovePreview(const ScenePoint2D& delta, |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
529 const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 530 { |
| 531 SetModified(true); | |
| 532 delta_ = delta; | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
533 GetParentAnnotation().SignalMove(*this, scene); |
| 1804 | 534 } |
| 535 | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
536 virtual void MoveDone(const ScenePoint2D& delta, |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
537 const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 538 { |
| 539 SetModified(true); | |
| 540 p1_ = p1_ + delta; | |
| 541 p2_ = p2_ + delta; | |
| 542 delta_ = ScenePoint2D(0, 0); | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
543 GetParentAnnotation().SignalMove(*this, scene); |
| 1804 | 544 } |
| 545 }; | |
| 546 | |
| 547 | |
| 548 class AnnotationsSceneLayer::Circle : public GeometricPrimitive | |
| 549 { | |
| 550 private: | |
| 551 ScenePoint2D p1_; | |
| 552 ScenePoint2D p2_; | |
|
1823
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
553 ScenePoint2D delta_; |
| 1804 | 554 |
| 555 public: | |
| 556 Circle(Annotation& parentAnnotation, | |
| 557 const ScenePoint2D& p1, | |
| 558 const ScenePoint2D& p2) : | |
| 559 GeometricPrimitive(parentAnnotation, 2), | |
| 560 p1_(p1), | |
|
1823
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
561 p2_(p2), |
|
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
562 delta_(0, 0) |
| 1804 | 563 { |
| 564 } | |
| 565 | |
| 566 void SetPosition(const ScenePoint2D& p1, | |
| 567 const ScenePoint2D& p2) | |
| 568 { | |
| 569 SetModified(true); | |
| 570 p1_ = p1; | |
| 571 p2_ = p2; | |
|
1823
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
572 delta_ = ScenePoint2D(0, 0); |
| 1804 | 573 } |
| 574 | |
| 575 ScenePoint2D GetPosition1() const | |
| 576 { | |
|
1823
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
577 return p1_ + delta_; |
| 1804 | 578 } |
| 579 | |
| 580 ScenePoint2D GetPosition2() const | |
| 581 { | |
|
1823
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
582 return p2_ + delta_; |
| 1804 | 583 } |
| 584 | |
| 585 virtual bool IsHit(const ScenePoint2D& p, | |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1806
diff
changeset
|
586 const Scene2D& scene) const ORTHANC_OVERRIDE |
| 1804 | 587 { |
|
1823
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
588 const double zoom = scene.GetSceneToCanvasTransform().ComputeZoom(); |
|
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
589 |
|
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
590 ScenePoint2D middle((p1_.GetX() + p2_.GetX()) / 2.0, |
|
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
591 (p1_.GetY() + p2_.GetY()) / 2.0); |
|
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
592 |
|
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
593 const double radius = ScenePoint2D::DistancePtPt(middle, p1_); |
|
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
594 const double distance = ScenePoint2D::DistancePtPt(middle, p - delta_); |
|
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
595 |
|
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
596 return std::abs(radius - distance) * zoom <= HANDLE_SIZE / 2.0; |
| 1804 | 597 } |
| 598 | |
| 599 virtual void RenderPolylineLayer(PolylineSceneLayer& polyline, | |
| 600 const Scene2D& scene) ORTHANC_OVERRIDE | |
| 601 { | |
| 602 static unsigned int NUM_SEGMENTS = 128; | |
| 603 | |
|
1981
c074c75cf416
moved drawing primitives from AnnotationsSceneLayer to PolylineSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
604 ScenePoint2D center((p1_.GetX() + p2_.GetX()) / 2.0, |
| 1804 | 605 (p1_.GetY() + p2_.GetY()) / 2.0); |
| 606 | |
|
1981
c074c75cf416
moved drawing primitives from AnnotationsSceneLayer to PolylineSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
607 const double radius = ScenePoint2D::DistancePtPt(center, p1_); |
| 1804 | 608 |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
609 polyline.AddCircle(center.GetX() + delta_.GetX(), center.GetY() + delta_.GetY(), |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
610 radius, GetActiveColor(), NUM_SEGMENTS); |
| 1804 | 611 } |
| 612 | |
| 613 virtual void RenderOtherLayers(MacroSceneLayer& macro, | |
| 614 const Scene2D& scene) ORTHANC_OVERRIDE | |
| 615 { | |
| 616 } | |
| 617 | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
618 virtual void MovePreview(const ScenePoint2D& delta, |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
619 const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 620 { |
|
1823
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
621 SetModified(true); |
|
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
622 delta_ = delta; |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
623 GetParentAnnotation().SignalMove(*this, scene); |
| 1804 | 624 } |
| 625 | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
626 virtual void MoveDone(const ScenePoint2D& delta, |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
627 const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 628 { |
|
1823
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
629 SetModified(true); |
|
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
630 p1_ = p1_ + delta; |
|
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
631 p2_ = p2_ + delta; |
|
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
632 delta_ = ScenePoint2D(0, 0); |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
633 GetParentAnnotation().SignalMove(*this, scene); |
| 1804 | 634 } |
| 635 }; | |
| 636 | |
| 637 | |
| 638 class AnnotationsSceneLayer::Arc : public GeometricPrimitive | |
| 639 { | |
| 640 private: | |
| 641 ScenePoint2D start_; | |
| 642 ScenePoint2D middle_; | |
| 643 ScenePoint2D end_; | |
| 644 double radius_; // in pixels | |
| 645 | |
| 646 void ComputeAngles(double& fullAngle, | |
| 647 double& startAngle, | |
| 648 double& endAngle) const | |
| 649 { | |
| 650 const double x1 = start_.GetX(); | |
| 651 const double y1 = start_.GetY(); | |
| 652 const double xc = middle_.GetX(); | |
| 653 const double yc = middle_.GetY(); | |
| 654 const double x2 = end_.GetX(); | |
| 655 const double y2 = end_.GetY(); | |
| 656 | |
| 657 startAngle = atan2(y1 - yc, x1 - xc); | |
| 658 endAngle = atan2(y2 - yc, x2 - xc); | |
| 659 | |
| 660 fullAngle = endAngle - startAngle; | |
| 661 | |
| 662 while (fullAngle < -PI) | |
| 663 { | |
| 664 fullAngle += 2.0 * PI; | |
| 665 } | |
| 666 | |
| 667 while (fullAngle >= PI) | |
| 668 { | |
| 669 fullAngle -= 2.0 * PI; | |
| 670 } | |
| 671 } | |
| 672 | |
| 673 public: | |
| 674 Arc(Annotation& parentAnnotation, | |
| 675 const ScenePoint2D& start, | |
| 676 const ScenePoint2D& middle, | |
| 677 const ScenePoint2D& end) : | |
| 678 GeometricPrimitive(parentAnnotation, 2), | |
| 679 start_(start), | |
| 680 middle_(middle), | |
| 681 end_(end), | |
| 682 radius_(20) | |
| 683 { | |
| 684 } | |
| 685 | |
| 686 double GetAngle() const | |
| 687 { | |
| 688 double fullAngle, startAngle, endAngle; | |
| 689 ComputeAngles(fullAngle, startAngle, endAngle); | |
| 690 return fullAngle; | |
| 691 } | |
| 692 | |
| 693 void SetStart(const ScenePoint2D& p) | |
| 694 { | |
| 695 SetModified(true); | |
| 696 start_ = p; | |
| 697 } | |
| 698 | |
| 699 void SetMiddle(const ScenePoint2D& p) | |
| 700 { | |
| 701 SetModified(true); | |
| 702 middle_ = p; | |
| 703 } | |
| 704 | |
| 705 void SetEnd(const ScenePoint2D& p) | |
| 706 { | |
| 707 SetModified(true); | |
| 708 end_ = p; | |
| 709 } | |
| 710 | |
| 711 virtual bool IsHit(const ScenePoint2D& p, | |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1806
diff
changeset
|
712 const Scene2D& scene) const ORTHANC_OVERRIDE |
| 1804 | 713 { |
| 714 return false; | |
| 715 } | |
| 716 | |
| 717 virtual void RenderPolylineLayer(PolylineSceneLayer& polyline, | |
| 718 const Scene2D& scene) ORTHANC_OVERRIDE | |
| 719 { | |
| 720 static unsigned int NUM_SEGMENTS = 64; | |
| 721 | |
| 722 const double radius = radius_ / scene.GetSceneToCanvasTransform().ComputeZoom(); | |
| 723 | |
| 724 double fullAngle, startAngle, endAngle; | |
| 725 ComputeAngles(fullAngle, startAngle, endAngle); | |
| 726 | |
|
1981
c074c75cf416
moved drawing primitives from AnnotationsSceneLayer to PolylineSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
727 polyline.AddArc(middle_, radius, radius, startAngle, endAngle, GetActiveColor(), NUM_SEGMENTS); |
| 1804 | 728 } |
| 729 | |
| 730 virtual void RenderOtherLayers(MacroSceneLayer& macro, | |
| 731 const Scene2D& scene) ORTHANC_OVERRIDE | |
| 732 { | |
| 733 } | |
| 734 | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
735 virtual void MovePreview(const ScenePoint2D& delta, |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
736 const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 737 { |
| 738 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); // No hit is possible | |
| 739 } | |
| 740 | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
741 virtual void MoveDone(const ScenePoint2D& delta, |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
742 const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 743 { |
| 744 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); // No hit is possible | |
| 745 } | |
| 746 }; | |
| 747 | |
| 748 | |
| 749 class AnnotationsSceneLayer::Text : public GeometricPrimitive | |
| 750 { | |
| 751 private: | |
| 752 AnnotationsSceneLayer& that_; | |
| 753 bool first_; | |
| 754 size_t subLayer_; | |
| 755 std::unique_ptr<TextSceneLayer> content_; | |
| 756 | |
| 757 public: | |
| 758 Text(AnnotationsSceneLayer& that, | |
| 759 Annotation& parentAnnotation) : | |
| 760 GeometricPrimitive(parentAnnotation, 2), | |
| 761 that_(that), | |
| 1817 | 762 first_(true), |
| 763 subLayer_(0) // dummy initialization | |
| 1804 | 764 { |
| 765 } | |
| 766 | |
| 767 virtual ~Text() | |
| 768 { | |
| 769 if (!first_) | |
| 770 { | |
| 771 that_.TagSubLayerToRemove(subLayer_); | |
| 772 } | |
| 773 } | |
| 774 | |
| 775 void SetContent(const TextSceneLayer& content) | |
| 776 { | |
| 777 SetModified(true); | |
| 778 content_.reset(dynamic_cast<TextSceneLayer*>(content.Clone())); | |
| 1977 | 779 } |
| 780 | |
| 781 void SetText(const std::string& text) | |
| 782 { | |
| 783 if (content_.get() == NULL) | |
| 784 { | |
| 785 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); | |
| 786 } | |
| 787 else | |
| 788 { | |
| 789 SetModified(true); | |
| 790 content_->SetText(text); | |
| 791 } | |
| 792 } | |
| 793 | |
|
1999
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
794 std::string GetText() const |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
795 { |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
796 return content_->GetText(); |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
797 } |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
798 |
| 1977 | 799 void SetPosition(double x, |
| 800 double y) | |
| 801 { | |
| 802 if (content_.get() == NULL) | |
| 803 { | |
| 804 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); | |
| 805 } | |
| 806 else | |
| 807 { | |
| 808 SetModified(true); | |
| 809 content_->SetPosition(x, y); | |
| 810 } | |
| 811 } | |
| 1804 | 812 |
| 813 virtual bool IsHit(const ScenePoint2D& p, | |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1806
diff
changeset
|
814 const Scene2D& scene) const ORTHANC_OVERRIDE |
| 1804 | 815 { |
| 816 return false; | |
| 817 } | |
| 818 | |
| 819 virtual void RenderPolylineLayer(PolylineSceneLayer& polyline, | |
| 820 const Scene2D& scene) ORTHANC_OVERRIDE | |
| 821 { | |
| 822 } | |
| 823 | |
| 824 virtual void RenderOtherLayers(MacroSceneLayer& macro, | |
| 825 const Scene2D& scene) ORTHANC_OVERRIDE | |
| 826 { | |
| 827 if (content_.get() != NULL) | |
| 828 { | |
| 829 std::unique_ptr<TextSceneLayer> layer(reinterpret_cast<TextSceneLayer*>(content_->Clone())); | |
| 830 | |
|
1981
c074c75cf416
moved drawing primitives from AnnotationsSceneLayer to PolylineSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
831 layer->SetColor(GetActiveColor()); |
| 1804 | 832 |
| 833 if (first_) | |
| 834 { | |
| 835 subLayer_ = macro.AddLayer(layer.release()); | |
| 836 first_ = false; | |
| 837 } | |
| 838 else | |
| 839 { | |
| 840 macro.UpdateLayer(subLayer_, layer.release()); | |
| 841 } | |
| 842 } | |
| 843 } | |
| 844 | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
845 virtual void MovePreview(const ScenePoint2D& delta, |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
846 const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 847 { |
| 848 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); // No hit is possible | |
| 849 } | |
| 850 | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
851 virtual void MoveDone(const ScenePoint2D& delta, |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
852 const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 853 { |
| 854 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); // No hit is possible | |
| 855 } | |
| 856 }; | |
| 857 | |
| 858 | |
|
1987
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
859 class AnnotationsSceneLayer::Ellipse : public GeometricPrimitive |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
860 { |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
861 private: |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
862 ScenePoint2D p1_; |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
863 ScenePoint2D p2_; |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
864 ScenePoint2D delta_; |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
865 |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
866 double GetCenterX() const |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
867 { |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
868 return (p1_.GetX() + p2_.GetX()) / 2.0 + delta_.GetX(); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
869 } |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
870 |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
871 double GetCenterY() const |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
872 { |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
873 return (p1_.GetY() + p2_.GetY()) / 2.0 + delta_.GetY(); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
874 } |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
875 |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
876 double GetRadiusX() const |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
877 { |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
878 return std::abs(p1_.GetX() - p2_.GetX()) / 2.0; |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
879 } |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
880 |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
881 double GetRadiusY() const |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
882 { |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
883 return std::abs(p1_.GetY() - p2_.GetY()) / 2.0; |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
884 } |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
885 |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
886 public: |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
887 Ellipse(Annotation& parentAnnotation, |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
888 const ScenePoint2D& p1, |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
889 const ScenePoint2D& p2) : |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
890 GeometricPrimitive(parentAnnotation, 2), |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
891 p1_(p1), |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
892 p2_(p2), |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
893 delta_(0, 0) |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
894 { |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
895 } |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
896 |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
897 void SetPosition(const ScenePoint2D& p1, |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
898 const ScenePoint2D& p2) |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
899 { |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
900 SetModified(true); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
901 p1_ = p1; |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
902 p2_ = p2; |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
903 delta_ = ScenePoint2D(0, 0); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
904 } |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
905 |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
906 ScenePoint2D GetPosition1() const |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
907 { |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
908 return p1_ + delta_; |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
909 } |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
910 |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
911 ScenePoint2D GetPosition2() const |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
912 { |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
913 return p2_ + delta_; |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
914 } |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
915 |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
916 double GetArea() const |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
917 { |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
918 return PI * GetRadiusX() * GetRadiusY(); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
919 } |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
920 |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
921 bool IsPointInside(const ScenePoint2D& p) const |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
922 { |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
923 const double radiusX = GetRadiusX(); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
924 const double radiusY = GetRadiusY(); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
925 |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
926 double a, b, x, y; |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
927 |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
928 if (radiusX > radiusY) |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
929 { |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
930 // The ellipse is horizontal => we are in the case described |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
931 // on Wikipedia: |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
932 // https://en.wikipedia.org/wiki/Ellipse#Standard_equation |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
933 |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
934 a = radiusX; |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
935 b = radiusY; |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
936 x = p.GetX() - GetCenterX(); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
937 y = p.GetY() - GetCenterY(); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
938 } |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
939 else |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
940 { |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
941 a = radiusY; |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
942 b = radiusX; |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
943 x = p.GetY() - GetCenterY(); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
944 y = p.GetX() - GetCenterX(); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
945 } |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
946 |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
947 const double c = sqrt(a * a - b * b); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
948 |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
949 return (sqrt((x - c) * (x - c) + y * y) + |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
950 sqrt((x + c) * (x + c) + y * y)) <= 2.0 * a; |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
951 } |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
952 |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
953 virtual bool IsHit(const ScenePoint2D& p, |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
954 const Scene2D& scene) const ORTHANC_OVERRIDE |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
955 { |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
956 const double zoom = scene.GetSceneToCanvasTransform().ComputeZoom(); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
957 |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
958 const double radiusX = GetRadiusX(); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
959 const double radiusY = GetRadiusY(); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
960 |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
961 // Warning: This is only an approximation of the |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
962 // point-to-ellipse distance, as explained here: |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
963 // https://blog.chatfield.io/simple-method-for-distance-to-ellipse/ |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
964 |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
965 const double x = (p.GetX() - GetCenterX()) / radiusX; |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
966 const double y = (p.GetY() - GetCenterY()) / radiusY; |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
967 const double t = atan2(y, x); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
968 const double xx = cos(t) - x; |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
969 const double yy = sin(t) - y; |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
970 |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
971 const double approximateDistance = sqrt(xx * xx + yy * yy) * (radiusX + radiusY) / 2.0; |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
972 return std::abs(approximateDistance) * zoom <= HANDLE_SIZE / 2.0; |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
973 } |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
974 |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
975 virtual void RenderPolylineLayer(PolylineSceneLayer& polyline, |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
976 const Scene2D& scene) ORTHANC_OVERRIDE |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
977 { |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
978 static unsigned int NUM_SEGMENTS = 128; |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
979 polyline.AddArc(GetCenterX(), GetCenterY(), GetRadiusX(), GetRadiusY(), 0, 2.0 * PI, GetActiveColor(), NUM_SEGMENTS); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
980 } |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
981 |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
982 virtual void RenderOtherLayers(MacroSceneLayer& macro, |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
983 const Scene2D& scene) ORTHANC_OVERRIDE |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
984 { |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
985 } |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
986 |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
987 virtual void MovePreview(const ScenePoint2D& delta, |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
988 const Scene2D& scene) ORTHANC_OVERRIDE |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
989 { |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
990 SetModified(true); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
991 delta_ = delta; |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
992 GetParentAnnotation().SignalMove(*this, scene); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
993 } |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
994 |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
995 virtual void MoveDone(const ScenePoint2D& delta, |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
996 const Scene2D& scene) ORTHANC_OVERRIDE |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
997 { |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
998 SetModified(true); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
999 p1_ = p1_ + delta; |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
1000 p2_ = p2_ + delta; |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
1001 delta_ = ScenePoint2D(0, 0); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
1002 GetParentAnnotation().SignalMove(*this, scene); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
1003 } |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
1004 }; |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
1005 |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
1006 |
| 1804 | 1007 class AnnotationsSceneLayer::EditPrimitiveTracker : public IFlexiblePointerTracker |
| 1008 { | |
| 1009 private: | |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1806
diff
changeset
|
1010 AnnotationsSceneLayer& that_; |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1806
diff
changeset
|
1011 GeometricPrimitive& primitive_; |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1806
diff
changeset
|
1012 ScenePoint2D sceneClick_; |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1806
diff
changeset
|
1013 AffineTransform2D canvasToScene_; |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1806
diff
changeset
|
1014 bool alive_; |
| 1804 | 1015 |
| 1016 public: | |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1806
diff
changeset
|
1017 EditPrimitiveTracker(AnnotationsSceneLayer& that, |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1806
diff
changeset
|
1018 GeometricPrimitive& primitive, |
| 1804 | 1019 const ScenePoint2D& sceneClick, |
| 1020 const AffineTransform2D& canvasToScene) : | |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1806
diff
changeset
|
1021 that_(that), |
| 1804 | 1022 primitive_(primitive), |
| 1023 sceneClick_(sceneClick), | |
| 1024 canvasToScene_(canvasToScene), | |
| 1025 alive_(true) | |
| 1026 { | |
| 1027 } | |
| 1028 | |
|
1972
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
1029 virtual void PointerMove(const PointerEvent& event, |
|
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
1030 const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 1031 { |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1032 primitive_.MovePreview(event.GetMainPosition().Apply(canvasToScene_) - sceneClick_, scene); |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1806
diff
changeset
|
1033 that_.BroadcastMessage(AnnotationChangedMessage(that_)); |
| 1804 | 1034 } |
| 1035 | |
|
1972
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
1036 virtual void PointerUp(const PointerEvent& event, |
|
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
1037 const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 1038 { |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1039 primitive_.MoveDone(event.GetMainPosition().Apply(canvasToScene_) - sceneClick_, scene); |
| 1804 | 1040 alive_ = false; |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1806
diff
changeset
|
1041 that_.BroadcastMessage(AnnotationChangedMessage(that_)); |
| 1804 | 1042 } |
| 1043 | |
|
1972
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
1044 virtual void PointerDown(const PointerEvent& event, |
|
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
1045 const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 1046 { |
| 1047 } | |
| 1048 | |
| 1049 virtual bool IsAlive() const ORTHANC_OVERRIDE | |
| 1050 { | |
| 1051 return alive_; | |
| 1052 } | |
| 1053 | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1054 virtual void Cancel(const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 1055 { |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1056 //primitive_.MoveDone(ScenePoint2D(0, 0), scene); |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1057 primitive_.MoveDone(sceneClick_, scene); // TODO Check this |
| 1804 | 1058 } |
| 1059 }; | |
| 1060 | |
| 1061 | |
|
1999
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1062 class AnnotationsSceneLayer::SegmentAnnotation : public Annotation |
| 1804 | 1063 { |
| 1064 private: | |
| 1065 Handle& handle1_; | |
| 1066 Handle& handle2_; | |
| 1067 Segment& segment_; | |
| 1068 Text& label_; | |
| 1069 | |
|
1999
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1070 protected: |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1071 void SetLabelContent(const TextSceneLayer& content) |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1072 { |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1073 label_.SetContent(content); |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1074 } |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1075 |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1076 std::string GetCurrentLabel() const |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1077 { |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1078 return label_.GetText(); |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1079 } |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1080 |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1081 const Handle& GetHandle1() const |
| 1804 | 1082 { |
|
1999
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1083 return handle1_; |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1084 } |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1085 |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1086 const Handle& GetHandle2() const |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1087 { |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1088 return handle2_; |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1089 } |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1090 |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1091 void SetStartArrow(bool enabled) |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1092 { |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1093 segment_.SetStartArrow(enabled); |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1094 } |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1095 |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1096 void SetEndArrow(bool enabled) |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1097 { |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1098 segment_.SetEndArrow(enabled); |
| 1804 | 1099 } |
| 1100 | |
| 1101 public: | |
|
1999
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1102 SegmentAnnotation(AnnotationsSceneLayer& that, |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1103 Handle::Shape shape1, |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1104 const ScenePoint2D& p1, |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1105 Handle::Shape shape2, |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1106 const ScenePoint2D& p2) : |
| 2000 | 1107 Annotation(that), |
|
1999
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1108 handle1_(AddTypedPrimitive<Handle>(new Handle(*this, shape1, p1))), |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1109 handle2_(AddTypedPrimitive<Handle>(new Handle(*this, shape2, p2))), |
| 1804 | 1110 segment_(AddTypedPrimitive<Segment>(new Segment(*this, p1, p2))), |
| 1111 label_(AddTypedPrimitive<Text>(new Text(that, *this))) | |
| 1112 { | |
|
1819
fe402c678d18
improved color theme for annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1817
diff
changeset
|
1113 label_.SetColor(COLOR_TEXT); |
| 1804 | 1114 } |
| 1115 | |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1116 virtual unsigned int GetHandlesCount() const ORTHANC_OVERRIDE |
| 1804 | 1117 { |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1118 return 2; |
| 1804 | 1119 } |
| 1120 | |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1121 virtual Handle& GetHandle(unsigned int index) const ORTHANC_OVERRIDE |
| 1804 | 1122 { |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1123 switch (index) |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1124 { |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1125 case 0: |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1126 return handle1_; |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1127 |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1128 case 1: |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1129 return handle2_; |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1130 |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1131 default: |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1132 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1133 } |
| 1804 | 1134 } |
| 1135 | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1136 virtual void SignalMove(GeometricPrimitive& primitive, |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1137 const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 1138 { |
| 1139 if (&primitive == &handle1_ || | |
| 1140 &primitive == &handle2_) | |
| 1141 { | |
| 1142 segment_.SetPosition(handle1_.GetCenter(), handle2_.GetCenter()); | |
| 1143 } | |
| 1144 else if (&primitive == &segment_) | |
| 1145 { | |
| 1146 handle1_.SetCenter(segment_.GetPosition1()); | |
| 1147 handle2_.SetCenter(segment_.GetPosition2()); | |
| 1148 } | |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1149 else |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1150 { |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1151 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1152 } |
| 1804 | 1153 } |
| 1154 | |
|
1976
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
1155 virtual void UpdateProbe(const Scene2D& scene) ORTHANC_OVERRIDE |
|
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
1156 { |
|
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
1157 } |
|
1999
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1158 }; |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1159 |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1160 |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1161 class AnnotationsSceneLayer::LengthAnnotation : public SegmentAnnotation |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1162 { |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1163 private: |
| 2000 | 1164 Units units_; |
| 1165 bool showLabel_; | |
|
1999
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1166 |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1167 void UpdateLabel() |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1168 { |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1169 if (showLabel_) |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1170 { |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1171 TextSceneLayer content; |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1172 |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1173 double x1 = GetHandle1().GetCenter().GetX(); |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1174 double y1 = GetHandle1().GetCenter().GetY(); |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1175 double x2 = GetHandle2().GetCenter().GetX(); |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1176 double y2 = GetHandle2().GetCenter().GetY(); |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1177 |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1178 // Put the label to the right of the right-most handle |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1179 if (x1 < x2) |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1180 { |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1181 content.SetPosition(x2, y2); |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1182 } |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1183 else |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1184 { |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1185 content.SetPosition(x1, y1); |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1186 } |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1187 |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1188 content.SetAnchor(BitmapAnchor_CenterLeft); |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1189 content.SetBorder(10); |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1190 |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1191 double dx = x1 - x2; |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1192 double dy = y1 - y2; |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1193 char buf[32]; |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1194 |
| 2000 | 1195 switch (units_) |
|
1999
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1196 { |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1197 case Units_Millimeters: |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1198 sprintf(buf, "%0.2f cm", sqrt(dx * dx + dy * dy) / 10.0); |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1199 break; |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1200 |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1201 case Units_Pixels: |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1202 sprintf(buf, "%0.1f px", sqrt(dx * dx + dy * dy)); |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1203 break; |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1204 |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1205 default: |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1206 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1207 } |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1208 |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1209 content.SetText(buf); |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1210 |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1211 SetLabelContent(content); |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1212 } |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1213 } |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1214 |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1215 public: |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1216 LengthAnnotation(AnnotationsSceneLayer& that, |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1217 Units units, |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1218 bool showLabel, |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1219 const ScenePoint2D& p1, |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1220 const ScenePoint2D& p2) : |
| 2000 | 1221 SegmentAnnotation(that, Handle::Shape_Square, p1, Handle::Shape_Square, p2), |
| 1222 units_(units), | |
|
1999
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1223 showLabel_(showLabel) |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1224 { |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1225 UpdateLabel(); |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1226 } |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1227 |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1228 virtual void SignalMove(GeometricPrimitive& primitive, |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1229 const Scene2D& scene) ORTHANC_OVERRIDE |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1230 { |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1231 SegmentAnnotation::SignalMove(primitive, scene); |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1232 UpdateLabel(); |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1233 } |
|
1976
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
1234 |
| 1804 | 1235 virtual void Serialize(Json::Value& target) ORTHANC_OVERRIDE |
| 1236 { | |
| 1237 target = Json::objectValue; | |
|
1998
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
1238 target[KEY_TYPE] = VALUE_LENGTH; |
|
1999
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1239 target[KEY_X1] = GetHandle1().GetCenter().GetX(); |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1240 target[KEY_Y1] = GetHandle1().GetCenter().GetY(); |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1241 target[KEY_X2] = GetHandle2().GetCenter().GetX(); |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1242 target[KEY_Y2] = GetHandle2().GetCenter().GetY(); |
| 1804 | 1243 } |
| 1244 | |
| 1245 static void Unserialize(AnnotationsSceneLayer& target, | |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1246 Units units, |
| 1804 | 1247 const Json::Value& source) |
| 1248 { | |
| 1249 if (source.isMember(KEY_X1) && | |
| 1250 source.isMember(KEY_Y1) && | |
| 1251 source.isMember(KEY_X2) && | |
| 1252 source.isMember(KEY_Y2) && | |
| 1253 source[KEY_X1].isNumeric() && | |
| 1254 source[KEY_Y1].isNumeric() && | |
| 1255 source[KEY_X2].isNumeric() && | |
| 1256 source[KEY_Y2].isNumeric()) | |
| 1257 { | |
|
1998
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
1258 new LengthAnnotation(target, units, true, |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
1259 ScenePoint2D(source[KEY_X1].asDouble(), source[KEY_Y1].asDouble()), |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
1260 ScenePoint2D(source[KEY_X2].asDouble(), source[KEY_Y2].asDouble())); |
| 1804 | 1261 } |
| 1262 else | |
| 1263 { | |
|
1998
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
1264 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat, "Cannot unserialize a length annotation"); |
| 1804 | 1265 } |
| 1266 } | |
| 1267 }; | |
| 1268 | |
| 1977 | 1269 |
|
1999
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1270 class AnnotationsSceneLayer::TextAnnotation : public SegmentAnnotation |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1271 { |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1272 public: |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1273 TextAnnotation(AnnotationsSceneLayer& that, |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1274 const std::string& label, |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1275 const ScenePoint2D& p1, |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1276 const ScenePoint2D& p2) : |
| 2000 | 1277 SegmentAnnotation(that, Handle::Shape_Invisible, p1, Handle::Shape_Square, p2) |
|
1999
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1278 { |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1279 SetStartArrow(true); |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1280 UpdateLabel(label); |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1281 } |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1282 |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1283 void UpdateLabel(const std::string& label) |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1284 { |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1285 TextSceneLayer content; |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1286 |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1287 double x1 = GetHandle1().GetCenter().GetX(); |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1288 double x2 = GetHandle2().GetCenter().GetX(); |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1289 double y2 = GetHandle2().GetCenter().GetY(); |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1290 |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1291 if (x1 < x2) |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1292 { |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1293 content.SetAnchor(BitmapAnchor_CenterLeft); |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1294 } |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1295 else |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1296 { |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1297 content.SetAnchor(BitmapAnchor_CenterRight); |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1298 } |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1299 |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1300 content.SetPosition(x2, y2); |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1301 content.SetBorder(10); |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1302 content.SetText(label); |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1303 |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1304 SetLabelContent(content); |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1305 } |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1306 |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1307 void UpdateLabel() |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1308 { |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1309 UpdateLabel(GetCurrentLabel()); |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1310 } |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1311 |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1312 virtual void SignalMove(GeometricPrimitive& primitive, |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1313 const Scene2D& scene) ORTHANC_OVERRIDE |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1314 { |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1315 SegmentAnnotation::SignalMove(primitive, scene); |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1316 UpdateLabel(); |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1317 } |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1318 |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1319 virtual void Serialize(Json::Value& target) ORTHANC_OVERRIDE |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1320 { |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1321 target = Json::objectValue; |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1322 target[KEY_TYPE] = VALUE_TEXT_ANNOTATION; |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1323 target[KEY_X1] = GetHandle1().GetCenter().GetX(); |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1324 target[KEY_Y1] = GetHandle1().GetCenter().GetY(); |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1325 target[KEY_X2] = GetHandle2().GetCenter().GetX(); |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1326 target[KEY_Y2] = GetHandle2().GetCenter().GetY(); |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1327 target[KEY_LABEL] = GetCurrentLabel(); |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1328 } |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1329 |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1330 static void Unserialize(AnnotationsSceneLayer& target, |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1331 const Json::Value& source) |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1332 { |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1333 if (source.isMember(KEY_X1) && |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1334 source.isMember(KEY_Y1) && |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1335 source.isMember(KEY_X2) && |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1336 source.isMember(KEY_Y2) && |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1337 source.isMember(KEY_LABEL) && |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1338 source[KEY_X1].isNumeric() && |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1339 source[KEY_Y1].isNumeric() && |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1340 source[KEY_X2].isNumeric() && |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1341 source[KEY_Y2].isNumeric() && |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1342 source[KEY_LABEL].isString()) |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1343 { |
| 2000 | 1344 new TextAnnotation(target, source[KEY_LABEL].asString(), |
|
1999
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1345 ScenePoint2D(source[KEY_X1].asDouble(), source[KEY_Y1].asDouble()), |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1346 ScenePoint2D(source[KEY_X2].asDouble(), source[KEY_Y2].asDouble())); |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1347 } |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1348 else |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1349 { |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1350 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat, "Cannot unserialize a text annotation"); |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1351 } |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1352 } |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1353 }; |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1354 |
|
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
1355 |
|
1978
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1356 // Use this class to avoid unnecessary probing if neither the scene, |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1357 // nor the probe, has changed |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1358 class AnnotationsSceneLayer::ProbingAnnotation : public Annotation |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1359 { |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1360 private: |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1361 int probedLayer_; |
|
1978
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1362 bool probeChanged_; |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1363 uint64_t lastLayerRevision_; |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1364 |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1365 protected: |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1366 virtual void UpdateProbeForLayer(const ISceneLayer& layer) = 0; |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1367 |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1368 void TagProbeAsChanged() |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1369 { |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1370 probeChanged_ = true; |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1371 } |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1372 |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1373 public: |
| 2000 | 1374 ProbingAnnotation(AnnotationsSceneLayer& that) : |
| 1375 Annotation(that), | |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1376 probedLayer_(that.GetProbedLayer()), |
|
1978
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1377 probeChanged_(true), |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1378 lastLayerRevision_(0) |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1379 { |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1380 } |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1381 |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1382 virtual void UpdateProbe(const Scene2D& scene) ORTHANC_OVERRIDE |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1383 { |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1384 if (scene.HasLayer(probedLayer_)) |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1385 { |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1386 const ISceneLayer& layer = scene.GetLayer(probedLayer_); |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1387 if (probeChanged_ || |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1388 layer.GetRevision() != lastLayerRevision_) |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1389 { |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1390 UpdateProbeForLayer(layer); |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1391 probeChanged_ = false; |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1392 lastLayerRevision_ = layer.GetRevision(); |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1393 } |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1394 } |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1395 } |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1396 }; |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1397 |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1398 |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1399 class AnnotationsSceneLayer::PixelProbeAnnotation : public ProbingAnnotation |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1400 { |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1401 private: |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1402 Handle& handle_; |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1403 Text& label_; |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1404 |
|
1978
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1405 protected: |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1406 virtual void UpdateProbeForLayer(const ISceneLayer& layer) ORTHANC_OVERRIDE |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1407 { |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1408 if (layer.GetType() == ISceneLayer::Type_FloatTexture || |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1409 layer.GetType() == ISceneLayer::Type_ColorTexture) |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1410 { |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1411 const TextureBaseSceneLayer& texture = dynamic_cast<const TextureBaseSceneLayer&>(layer); |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1412 const AffineTransform2D sceneToTexture = AffineTransform2D::Invert(texture.GetTransform()); |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1413 |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1414 double sceneX = handle_.GetCenter().GetX(); |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1415 double sceneY = handle_.GetCenter().GetY(); |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1416 sceneToTexture.Apply(sceneX, sceneY); |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1417 |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1418 int x = static_cast<int>(std::floor(sceneX)); |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1419 int y = static_cast<int>(std::floor(sceneY)); |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1420 |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1421 const Orthanc::ImageAccessor& image = texture.GetTexture(); |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1422 |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1423 if (x >= 0 && |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1424 y >= 0 && |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1425 x < static_cast<int>(image.GetWidth()) && |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1426 y < static_cast<int>(image.GetHeight())) |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1427 { |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1428 char buf[64]; |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1429 |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1430 switch (image.GetFormat()) |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1431 { |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1432 case Orthanc::PixelFormat_Float32: |
|
1980
0aac8f552d89
added pixel probe to the Stone Web viewer toolbar
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1979
diff
changeset
|
1433 sprintf(buf, "(%d,%d): %.01f", x, y, Orthanc::ImageTraits<Orthanc::PixelFormat_Float32>::GetFloatPixel( |
|
1978
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1434 image, static_cast<unsigned int>(x), static_cast<unsigned int>(y))); |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1435 break; |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1436 |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1437 case Orthanc::PixelFormat_RGB24: |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1438 { |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1439 Orthanc::PixelTraits<Orthanc::PixelFormat_RGB24>::PixelType pixel; |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1440 Orthanc::ImageTraits<Orthanc::PixelFormat_RGB24>::GetPixel( |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1441 pixel, image, static_cast<unsigned int>(x), static_cast<unsigned int>(y)); |
|
1980
0aac8f552d89
added pixel probe to the Stone Web viewer toolbar
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1979
diff
changeset
|
1442 sprintf(buf, "(%d,%d): (%d,%d,%d)", x, y, pixel.red_, pixel.green_, pixel.blue_); |
|
1978
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1443 break; |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1444 } |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1445 |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1446 default: |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1447 break; |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1448 } |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1449 |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1450 label_.SetText(buf); |
| 1979 | 1451 } |
| 1452 else | |
| 1453 { | |
| 1454 label_.SetText("?"); | |
| 1455 } | |
|
1978
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1456 } |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1457 } |
|
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1458 |
|
1976
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
1459 public: |
|
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
1460 PixelProbeAnnotation(AnnotationsSceneLayer& that, |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1461 const ScenePoint2D& p) : |
| 2000 | 1462 ProbingAnnotation(that), |
|
1980
0aac8f552d89
added pixel probe to the Stone Web viewer toolbar
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1979
diff
changeset
|
1463 handle_(AddTypedPrimitive<Handle>(new Handle(*this, Handle::Shape_CrossedSquare, p))), |
|
1976
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
1464 label_(AddTypedPrimitive<Text>(new Text(that, *this))) |
|
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
1465 { |
| 1977 | 1466 TextSceneLayer content; |
| 1467 content.SetPosition(handle_.GetCenter().GetX(), handle_.GetCenter().GetY()); | |
| 1468 content.SetAnchor(BitmapAnchor_CenterLeft); | |
| 1469 content.SetBorder(10); | |
| 1470 content.SetText("?"); | |
| 1471 | |
| 1472 label_.SetContent(content); | |
|
1976
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
1473 label_.SetColor(COLOR_TEXT); |
|
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
1474 } |
|
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
1475 |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1476 virtual unsigned int GetHandlesCount() const ORTHANC_OVERRIDE |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1477 { |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1478 return 1; |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1479 } |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1480 |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1481 virtual Handle& GetHandle(unsigned int index) const ORTHANC_OVERRIDE |
|
1976
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
1482 { |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1483 if (index == 0) |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1484 { |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1485 return handle_; |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1486 } |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1487 else |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1488 { |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1489 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1490 } |
|
1976
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
1491 } |
|
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
1492 |
|
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
1493 virtual void SignalMove(GeometricPrimitive& primitive, |
|
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
1494 const Scene2D& scene) ORTHANC_OVERRIDE |
|
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
1495 { |
| 1977 | 1496 label_.SetPosition(handle_.GetCenter().GetX(), handle_.GetCenter().GetY()); |
|
1978
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
1497 TagProbeAsChanged(); |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1498 } |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1499 |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1500 virtual void Serialize(Json::Value& target) ORTHANC_OVERRIDE |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1501 { |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1502 target = Json::objectValue; |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1503 target[KEY_TYPE] = VALUE_PIXEL_PROBE; |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1504 target[KEY_X] = handle_.GetCenter().GetX(); |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1505 target[KEY_Y] = handle_.GetCenter().GetY(); |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1506 } |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1507 |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1508 static void Unserialize(AnnotationsSceneLayer& target, |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1509 const Json::Value& source) |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1510 { |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1511 if (source.isMember(KEY_X) && |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1512 source.isMember(KEY_Y) && |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1513 source[KEY_X].isNumeric() && |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1514 source[KEY_Y].isNumeric()) |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1515 { |
| 2000 | 1516 new PixelProbeAnnotation(target, ScenePoint2D(source[KEY_X].asDouble(), source[KEY_Y].asDouble())); |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1517 } |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1518 else |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1519 { |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1520 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat, "Cannot unserialize a pixel probe"); |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1521 } |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1522 } |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1523 }; |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1524 |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1525 |
| 1804 | 1526 class AnnotationsSceneLayer::AngleAnnotation : public Annotation |
| 1527 { | |
| 1528 private: | |
| 1529 Handle& startHandle_; | |
| 1530 Handle& middleHandle_; | |
| 1531 Handle& endHandle_; | |
| 1532 Segment& segment1_; | |
| 1533 Segment& segment2_; | |
| 1534 Arc& arc_; | |
| 1535 Text& label_; | |
| 1536 | |
| 1537 void UpdateLabel() | |
| 1538 { | |
| 1539 TextSceneLayer content; | |
| 1540 | |
| 1541 const double x1 = startHandle_.GetCenter().GetX(); | |
| 1542 const double x2 = middleHandle_.GetCenter().GetX(); | |
| 1543 const double y2 = middleHandle_.GetCenter().GetY(); | |
| 1544 const double x3 = endHandle_.GetCenter().GetX(); | |
| 1545 | |
| 1546 if (x2 < x1 && | |
| 1547 x2 < x3) | |
| 1548 { | |
| 1549 content.SetAnchor(BitmapAnchor_CenterRight); | |
| 1550 } | |
| 1551 else | |
| 1552 { | |
| 1553 content.SetAnchor(BitmapAnchor_CenterLeft); | |
| 1554 } | |
| 1555 | |
| 1556 content.SetPosition(x2, y2); | |
| 1557 content.SetBorder(10); | |
| 1558 | |
| 1559 char buf[32]; | |
| 1560 sprintf(buf, "%.01f%c%c", std::abs(arc_.GetAngle()) / PI * 180.0, | |
| 1561 0xc2, 0xb0 /* two bytes corresponding to degree symbol in UTF-8 */); | |
| 1562 content.SetText(buf); | |
| 1563 | |
| 1564 label_.SetContent(content); | |
| 1565 } | |
| 1566 | |
| 1567 public: | |
| 1568 AngleAnnotation(AnnotationsSceneLayer& that, | |
| 1569 const ScenePoint2D& start, | |
| 1570 const ScenePoint2D& middle, | |
| 1571 const ScenePoint2D& end) : | |
| 2000 | 1572 Annotation(that), |
|
1980
0aac8f552d89
added pixel probe to the Stone Web viewer toolbar
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1979
diff
changeset
|
1573 startHandle_(AddTypedPrimitive<Handle>(new Handle(*this, Handle::Shape_Square, start))), |
|
0aac8f552d89
added pixel probe to the Stone Web viewer toolbar
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1979
diff
changeset
|
1574 middleHandle_(AddTypedPrimitive<Handle>(new Handle(*this, Handle::Shape_Square, middle))), |
|
0aac8f552d89
added pixel probe to the Stone Web viewer toolbar
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1979
diff
changeset
|
1575 endHandle_(AddTypedPrimitive<Handle>(new Handle(*this, Handle::Shape_Square, end))), |
| 1804 | 1576 segment1_(AddTypedPrimitive<Segment>(new Segment(*this, start, middle))), |
| 1577 segment2_(AddTypedPrimitive<Segment>(new Segment(*this, middle, end))), | |
| 1578 arc_(AddTypedPrimitive<Arc>(new Arc(*this, start, middle, end))), | |
| 1579 label_(AddTypedPrimitive<Text>(new Text(that, *this))) | |
| 1580 { | |
|
1819
fe402c678d18
improved color theme for annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1817
diff
changeset
|
1581 label_.SetColor(COLOR_TEXT); |
| 1804 | 1582 UpdateLabel(); |
| 1583 } | |
| 1584 | |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1585 virtual unsigned int GetHandlesCount() const ORTHANC_OVERRIDE |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1586 { |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1587 return 3; |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1588 } |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1589 |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1590 virtual Handle& GetHandle(unsigned int index) const ORTHANC_OVERRIDE |
| 1804 | 1591 { |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1592 switch (index) |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1593 { |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1594 case 0: |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1595 return startHandle_; |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1596 |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1597 case 1: |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1598 return middleHandle_; |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1599 |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1600 case 2: |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1601 return endHandle_; |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1602 |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1603 default: |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1604 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1605 } |
| 1804 | 1606 } |
| 1607 | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1608 virtual void SignalMove(GeometricPrimitive& primitive, |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1609 const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 1610 { |
| 1611 if (&primitive == &startHandle_) | |
| 1612 { | |
| 1613 segment1_.SetPosition(startHandle_.GetCenter(), middleHandle_.GetCenter()); | |
| 1614 arc_.SetStart(startHandle_.GetCenter()); | |
| 1615 } | |
| 1616 else if (&primitive == &middleHandle_) | |
| 1617 { | |
| 1618 segment1_.SetPosition(startHandle_.GetCenter(), middleHandle_.GetCenter()); | |
| 1619 segment2_.SetPosition(middleHandle_.GetCenter(), endHandle_.GetCenter()); | |
| 1620 arc_.SetMiddle(middleHandle_.GetCenter()); | |
| 1621 } | |
| 1622 else if (&primitive == &endHandle_) | |
| 1623 { | |
| 1624 segment2_.SetPosition(middleHandle_.GetCenter(), endHandle_.GetCenter()); | |
| 1625 arc_.SetEnd(endHandle_.GetCenter()); | |
| 1626 } | |
| 1627 else if (&primitive == &segment1_) | |
| 1628 { | |
| 1629 startHandle_.SetCenter(segment1_.GetPosition1()); | |
| 1630 middleHandle_.SetCenter(segment1_.GetPosition2()); | |
| 1631 segment2_.SetPosition(segment1_.GetPosition2(), segment2_.GetPosition2()); | |
| 1632 arc_.SetStart(segment1_.GetPosition1()); | |
| 1633 arc_.SetMiddle(segment1_.GetPosition2()); | |
| 1634 } | |
| 1635 else if (&primitive == &segment2_) | |
| 1636 { | |
| 1637 middleHandle_.SetCenter(segment2_.GetPosition1()); | |
| 1638 endHandle_.SetCenter(segment2_.GetPosition2()); | |
| 1639 segment1_.SetPosition(segment1_.GetPosition1(), segment2_.GetPosition1()); | |
| 1640 arc_.SetMiddle(segment2_.GetPosition1()); | |
| 1641 arc_.SetEnd(segment2_.GetPosition2()); | |
| 1642 } | |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1643 else |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1644 { |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1645 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1646 } |
| 1804 | 1647 |
| 1648 UpdateLabel(); | |
| 1649 } | |
| 1650 | |
|
1976
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
1651 virtual void UpdateProbe(const Scene2D& scene) ORTHANC_OVERRIDE |
|
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
1652 { |
|
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
1653 } |
|
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
1654 |
| 1804 | 1655 virtual void Serialize(Json::Value& target) ORTHANC_OVERRIDE |
| 1656 { | |
| 1657 target = Json::objectValue; | |
| 1658 target[KEY_TYPE] = VALUE_ANGLE; | |
| 1659 target[KEY_X1] = startHandle_.GetCenter().GetX(); | |
| 1660 target[KEY_Y1] = startHandle_.GetCenter().GetY(); | |
| 1661 target[KEY_X2] = middleHandle_.GetCenter().GetX(); | |
| 1662 target[KEY_Y2] = middleHandle_.GetCenter().GetY(); | |
| 1663 target[KEY_X3] = endHandle_.GetCenter().GetX(); | |
| 1664 target[KEY_Y3] = endHandle_.GetCenter().GetY(); | |
| 1665 } | |
| 1666 | |
| 1667 static void Unserialize(AnnotationsSceneLayer& target, | |
| 1668 const Json::Value& source) | |
| 1669 { | |
| 1670 if (source.isMember(KEY_X1) && | |
| 1671 source.isMember(KEY_Y1) && | |
| 1672 source.isMember(KEY_X2) && | |
| 1673 source.isMember(KEY_Y2) && | |
| 1674 source.isMember(KEY_X3) && | |
| 1675 source.isMember(KEY_Y3) && | |
| 1676 source[KEY_X1].isNumeric() && | |
| 1677 source[KEY_Y1].isNumeric() && | |
| 1678 source[KEY_X2].isNumeric() && | |
| 1679 source[KEY_Y2].isNumeric() && | |
| 1680 source[KEY_X3].isNumeric() && | |
| 1681 source[KEY_Y3].isNumeric()) | |
| 1682 { | |
| 2000 | 1683 new AngleAnnotation(target, |
| 1804 | 1684 ScenePoint2D(source[KEY_X1].asDouble(), source[KEY_Y1].asDouble()), |
| 1685 ScenePoint2D(source[KEY_X2].asDouble(), source[KEY_Y2].asDouble()), | |
| 1686 ScenePoint2D(source[KEY_X3].asDouble(), source[KEY_Y3].asDouble())); | |
| 1687 } | |
| 1688 else | |
| 1689 { | |
| 1690 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat, "Cannot unserialize an angle annotation"); | |
| 1691 } | |
| 1692 } | |
| 1693 }; | |
| 1694 | |
| 1695 | |
| 1696 class AnnotationsSceneLayer::CircleAnnotation : public Annotation | |
| 1697 { | |
| 1698 private: | |
| 2000 | 1699 Units units_; |
| 1804 | 1700 Handle& handle1_; |
| 1701 Handle& handle2_; | |
| 1702 Segment& segment_; | |
| 1703 Circle& circle_; | |
| 1704 Text& label_; | |
| 1705 | |
| 1706 void UpdateLabel() | |
| 1707 { | |
| 1708 TextSceneLayer content; | |
| 1709 | |
| 1710 double x1 = handle1_.GetCenter().GetX(); | |
| 1711 double y1 = handle1_.GetCenter().GetY(); | |
| 1712 double x2 = handle2_.GetCenter().GetX(); | |
| 1713 double y2 = handle2_.GetCenter().GetY(); | |
| 1714 | |
| 1715 // Put the label to the right of the right-most handle | |
| 1716 if (x1 < x2) | |
| 1717 { | |
| 1718 content.SetPosition(x2, y2); | |
| 1719 } | |
| 1720 else | |
| 1721 { | |
| 1722 content.SetPosition(x1, y1); | |
| 1723 } | |
| 1724 | |
| 1725 content.SetAnchor(BitmapAnchor_CenterLeft); | |
| 1726 content.SetBorder(10); | |
| 1727 | |
| 1728 double dx = x1 - x2; | |
| 1729 double dy = y1 - y2; | |
| 1730 double diameter = sqrt(dx * dx + dy * dy); // in millimeters | |
| 1731 | |
| 1732 double area = PI * diameter * diameter / 4.0; | |
| 1733 | |
| 1734 char buf[32]; | |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1735 |
| 2000 | 1736 switch (units_) |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1737 { |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1738 case Units_Millimeters: |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1739 sprintf(buf, "%0.2f cm\n%0.2f cm%c%c", |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1740 diameter / 10.0, |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1741 area / 100.0, |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1742 0xc2, 0xb2 /* two bytes corresponding to two power in UTF-8 */); |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1743 break; |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1744 |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1745 case Units_Pixels: |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1746 // Don't report area (pixel-times-pixel is a strange unit) |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1747 sprintf(buf, "%0.1f px", diameter); |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1748 break; |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1749 |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1750 default: |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1751 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1752 } |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1753 |
| 1804 | 1754 content.SetText(buf); |
| 1755 | |
| 1756 label_.SetContent(content); | |
| 1757 } | |
| 1758 | |
| 1759 public: | |
| 1760 CircleAnnotation(AnnotationsSceneLayer& that, | |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1761 Units units, |
| 1804 | 1762 const ScenePoint2D& p1, |
| 1763 const ScenePoint2D& p2) : | |
| 2000 | 1764 Annotation(that), |
| 1765 units_(units), | |
|
1980
0aac8f552d89
added pixel probe to the Stone Web viewer toolbar
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1979
diff
changeset
|
1766 handle1_(AddTypedPrimitive<Handle>(new Handle(*this, Handle::Shape_Square, p1))), |
|
0aac8f552d89
added pixel probe to the Stone Web viewer toolbar
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1979
diff
changeset
|
1767 handle2_(AddTypedPrimitive<Handle>(new Handle(*this, Handle::Shape_Square, p2))), |
| 1804 | 1768 segment_(AddTypedPrimitive<Segment>(new Segment(*this, p1, p2))), |
| 1769 circle_(AddTypedPrimitive<Circle>(new Circle(*this, p1, p2))), | |
| 1770 label_(AddTypedPrimitive<Text>(new Text(that, *this))) | |
| 1771 { | |
|
1819
fe402c678d18
improved color theme for annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1817
diff
changeset
|
1772 label_.SetColor(COLOR_TEXT); |
| 1804 | 1773 UpdateLabel(); |
| 1774 } | |
| 1775 | |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1776 virtual unsigned int GetHandlesCount() const ORTHANC_OVERRIDE |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1777 { |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1778 return 2; |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1779 } |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1780 |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1781 virtual Handle& GetHandle(unsigned int index) const ORTHANC_OVERRIDE |
| 1804 | 1782 { |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1783 switch (index) |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1784 { |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1785 case 0: |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1786 return handle1_; |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1787 |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1788 case 1: |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1789 return handle2_; |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1790 |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1791 default: |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1792 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1793 } |
| 1804 | 1794 } |
| 1795 | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1796 virtual void SignalMove(GeometricPrimitive& primitive, |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1797 const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 1798 { |
| 1799 if (&primitive == &handle1_ || | |
| 1800 &primitive == &handle2_) | |
| 1801 { | |
| 1802 segment_.SetPosition(handle1_.GetCenter(), handle2_.GetCenter()); | |
| 1803 circle_.SetPosition(handle1_.GetCenter(), handle2_.GetCenter()); | |
| 1804 } | |
| 1805 else if (&primitive == &segment_) | |
| 1806 { | |
| 1807 handle1_.SetCenter(segment_.GetPosition1()); | |
| 1808 handle2_.SetCenter(segment_.GetPosition2()); | |
| 1809 circle_.SetPosition(segment_.GetPosition1(), segment_.GetPosition2()); | |
| 1810 } | |
|
1823
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
1811 else if (&primitive == &circle_) |
|
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
1812 { |
|
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
1813 handle1_.SetCenter(circle_.GetPosition1()); |
|
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
1814 handle2_.SetCenter(circle_.GetPosition2()); |
|
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
1815 segment_.SetPosition(circle_.GetPosition1(), circle_.GetPosition2()); |
|
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
1816 } |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1817 else |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1818 { |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1819 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1820 } |
| 1804 | 1821 |
| 1822 UpdateLabel(); | |
| 1823 } | |
| 1824 | |
|
1976
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
1825 virtual void UpdateProbe(const Scene2D& scene) ORTHANC_OVERRIDE |
|
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
1826 { |
|
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
1827 } |
|
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
1828 |
| 1804 | 1829 virtual void Serialize(Json::Value& target) ORTHANC_OVERRIDE |
| 1830 { | |
| 1831 target = Json::objectValue; | |
| 1832 target[KEY_TYPE] = VALUE_CIRCLE; | |
| 1833 target[KEY_X1] = handle1_.GetCenter().GetX(); | |
| 1834 target[KEY_Y1] = handle1_.GetCenter().GetY(); | |
| 1835 target[KEY_X2] = handle2_.GetCenter().GetX(); | |
| 1836 target[KEY_Y2] = handle2_.GetCenter().GetY(); | |
| 1837 } | |
| 1838 | |
| 1839 static void Unserialize(AnnotationsSceneLayer& target, | |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1840 Units units, |
| 1804 | 1841 const Json::Value& source) |
| 1842 { | |
| 1843 if (source.isMember(KEY_X1) && | |
| 1844 source.isMember(KEY_Y1) && | |
| 1845 source.isMember(KEY_X2) && | |
| 1846 source.isMember(KEY_Y2) && | |
| 1847 source[KEY_X1].isNumeric() && | |
| 1848 source[KEY_Y1].isNumeric() && | |
| 1849 source[KEY_X2].isNumeric() && | |
| 1850 source[KEY_Y2].isNumeric()) | |
| 1851 { | |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1852 new CircleAnnotation(target, units, |
| 1804 | 1853 ScenePoint2D(source[KEY_X1].asDouble(), source[KEY_Y1].asDouble()), |
| 1854 ScenePoint2D(source[KEY_X2].asDouble(), source[KEY_Y2].asDouble())); | |
| 1855 } | |
| 1856 else | |
| 1857 { | |
| 1858 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat, "Cannot unserialize an circle annotation"); | |
| 1859 } | |
| 1860 } | |
| 1861 }; | |
| 1862 | |
| 1863 | |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1864 class AnnotationsSceneLayer::RectangleProbeAnnotation : public ProbingAnnotation |
| 1804 | 1865 { |
| 1866 private: | |
| 2000 | 1867 Units units_; |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1868 Handle& handle1_; |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1869 Handle& handle2_; |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1870 Segment& segment1_; |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1871 Segment& segment2_; |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1872 Segment& segment3_; |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1873 Segment& segment4_; |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1874 Text& label_; |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1875 |
|
1984
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1876 protected: |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1877 virtual void UpdateProbeForLayer(const ISceneLayer& layer) ORTHANC_OVERRIDE |
| 1804 | 1878 { |
|
1984
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1879 double x1 = handle1_.GetCenter().GetX(); |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1880 double y1 = handle1_.GetCenter().GetY(); |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1881 double x2 = handle2_.GetCenter().GetX(); |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1882 double y2 = handle2_.GetCenter().GetY(); |
| 1990 | 1883 |
| 1804 | 1884 { |
| 1990 | 1885 // Put the label to the right of the right-most handle |
| 1886 //const double y = std::min(y1, y2); | |
| 1887 const double y = (y1 + y2) / 2.0; | |
| 1888 if (x1 < x2) | |
| 1889 { | |
| 1890 label_.SetPosition(x2, y); | |
| 1891 } | |
| 1892 else | |
| 1893 { | |
| 1894 label_.SetPosition(x1, y); | |
| 1895 } | |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1896 } |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1897 |
|
1984
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1898 std::string text; |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1899 |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1900 char buf[32]; |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1901 |
| 2000 | 1902 if (units_ == Units_Millimeters) |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1903 { |
|
1984
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1904 const double area = std::abs(x1 - x2) * std::abs(y1 - y2); |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1905 |
|
1987
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
1906 sprintf(buf, "Area: %0.2f cm%c%c", |
|
1984
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1907 area / 100.0, |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1908 0xc2, 0xb2 /* two bytes corresponding to two power in UTF-8 */); |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1909 text = buf; |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1910 } |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1911 |
|
1984
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1912 if (layer.GetType() == ISceneLayer::Type_FloatTexture) |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1913 { |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1914 const TextureBaseSceneLayer& texture = dynamic_cast<const TextureBaseSceneLayer&>(layer); |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1915 const AffineTransform2D sceneToTexture = AffineTransform2D::Invert(texture.GetTransform()); |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1916 |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1917 const Orthanc::ImageAccessor& image = texture.GetTexture(); |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1918 assert(image.GetFormat() == Orthanc::PixelFormat_Float32); |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1919 |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1920 sceneToTexture.Apply(x1, y1); |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1921 sceneToTexture.Apply(x2, y2); |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1922 int ix1 = static_cast<int>(std::floor(x1)); |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1923 int iy1 = static_cast<int>(std::floor(y1)); |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1924 int ix2 = static_cast<int>(std::floor(x2)); |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1925 int iy2 = static_cast<int>(std::floor(y2)); |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1926 |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1927 if (ix1 > ix2) |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1928 { |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1929 std::swap(ix1, ix2); |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1930 } |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1931 |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1932 if (iy1 > iy2) |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1933 { |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1934 std::swap(iy1, iy2); |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1935 } |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1936 |
|
1984
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1937 LinearAlgebra::OnlineVarianceEstimator estimator; |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1938 |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1939 for (int y = std::max(0, iy1); y <= std::min(static_cast<int>(image.GetHeight()) - 1, iy2); y++) |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1940 { |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1941 int x = std::max(0, ix1); |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1942 |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1943 const float* p = reinterpret_cast<const float*>(image.GetConstRow(y)) + x; |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1944 |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1945 for (; x <= std::min(static_cast<int>(image.GetWidth()) - 1, ix2); x++, p++) |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1946 { |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1947 estimator.AddSample(*p); |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1948 } |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1949 } |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1950 |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1951 if (estimator.GetCount() > 0) |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1952 { |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1953 if (!text.empty()) |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1954 { |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1955 text += "\n"; |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1956 } |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1957 sprintf(buf, "Mean: %0.1f\nStdDev: %0.1f", estimator.GetMean(), estimator.GetStandardDeviation()); |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1958 text += buf; |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1959 } |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1960 } |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1961 |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1962 label_.SetText(text); |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1963 } |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1964 |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1965 public: |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1966 RectangleProbeAnnotation(AnnotationsSceneLayer& that, |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1967 Units units, |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1968 const ScenePoint2D& p1, |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1969 const ScenePoint2D& p2) : |
| 2000 | 1970 ProbingAnnotation(that), |
| 1971 units_(units), | |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1972 handle1_(AddTypedPrimitive<Handle>(new Handle(*this, Handle::Shape_Square, p1))), |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1973 handle2_(AddTypedPrimitive<Handle>(new Handle(*this, Handle::Shape_Square, p2))), |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1974 segment1_(AddTypedPrimitive<Segment>(new Segment(*this, p1.GetX(), p1.GetY(), p2.GetX(), p1.GetY()))), |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1975 segment2_(AddTypedPrimitive<Segment>(new Segment(*this, p2.GetX(), p1.GetY(), p2.GetX(), p2.GetY()))), |
| 1986 | 1976 segment3_(AddTypedPrimitive<Segment>(new Segment(*this, p1.GetX(), p2.GetY(), p2.GetX(), p2.GetY()))), |
| 1977 segment4_(AddTypedPrimitive<Segment>(new Segment(*this, p1.GetX(), p1.GetY(), p1.GetX(), p2.GetY()))), | |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1978 label_(AddTypedPrimitive<Text>(new Text(that, *this))) |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1979 { |
|
1984
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1980 TextSceneLayer content; |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1981 content.SetAnchor(BitmapAnchor_CenterLeft); |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1982 content.SetBorder(10); |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1983 content.SetText("?"); |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1984 |
|
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
1985 label_.SetContent(content); |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1986 label_.SetColor(COLOR_TEXT); |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1987 } |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1988 |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1989 virtual unsigned int GetHandlesCount() const ORTHANC_OVERRIDE |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1990 { |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1991 return 2; |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1992 } |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1993 |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1994 virtual Handle& GetHandle(unsigned int index) const ORTHANC_OVERRIDE |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1995 { |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1996 switch (index) |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1997 { |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1998 case 0: |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
1999 return handle1_; |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2000 |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2001 case 1: |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2002 return handle2_; |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2003 |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2004 default: |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2005 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2006 } |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2007 } |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2008 |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2009 virtual void SignalMove(GeometricPrimitive& primitive, |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2010 const Scene2D& scene) ORTHANC_OVERRIDE |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2011 { |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2012 if (&primitive == &handle1_ || |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2013 &primitive == &handle2_) |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2014 { |
| 1986 | 2015 double x1 = handle1_.GetCenter().GetX(); |
| 2016 double y1 = handle1_.GetCenter().GetY(); | |
| 2017 double x2 = handle2_.GetCenter().GetX(); | |
| 2018 double y2 = handle2_.GetCenter().GetY(); | |
| 2019 | |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2020 segment1_.SetPosition(x1, y1, x2, y1); |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2021 segment2_.SetPosition(x2, y1, x2, y2); |
| 1986 | 2022 segment3_.SetPosition(x1, y2, x2, y2); |
| 2023 segment4_.SetPosition(x1, y1, x1, y2); | |
| 1804 | 2024 } |
| 1986 | 2025 else if (&primitive == &segment1_ || |
| 2026 &primitive == &segment2_ || | |
| 2027 &primitive == &segment3_ || | |
| 2028 &primitive == &segment4_) | |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2029 { |
| 1986 | 2030 const Segment& segment = dynamic_cast<const Segment&>(primitive); |
| 2031 double x1 = segment.GetPosition1().GetX(); | |
| 2032 double y1 = segment.GetPosition1().GetY(); | |
| 2033 double x2 = segment.GetPosition2().GetX(); | |
| 2034 double y2 = segment.GetPosition2().GetY(); | |
|
1985
bb307007f8e2
improved interaction with rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1984
diff
changeset
|
2035 |
| 1986 | 2036 if (&primitive == &segment1_) |
| 2037 { | |
| 2038 y2 = y1 + handle2_.GetCenter().GetY() - handle1_.GetCenter().GetY(); | |
| 2039 } | |
| 2040 else if (&primitive == &segment2_) | |
| 2041 { | |
| 2042 x1 = x2 + handle1_.GetCenter().GetX() - handle2_.GetCenter().GetX(); | |
| 2043 } | |
| 2044 else if (&primitive == &segment3_) | |
| 2045 { | |
| 2046 y1 = y2 + handle1_.GetCenter().GetY() - handle2_.GetCenter().GetY(); | |
| 2047 } | |
| 2048 else if (&primitive == &segment4_) | |
| 2049 { | |
| 2050 x2 = x1 + handle2_.GetCenter().GetX() - handle1_.GetCenter().GetX(); | |
| 2051 } | |
| 2052 else | |
| 2053 { | |
| 2054 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); | |
| 2055 } | |
|
1985
bb307007f8e2
improved interaction with rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1984
diff
changeset
|
2056 |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2057 handle1_.SetCenter(x1, y1); |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2058 handle2_.SetCenter(x2, y2); |
|
1985
bb307007f8e2
improved interaction with rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1984
diff
changeset
|
2059 |
| 1986 | 2060 if (&primitive != &segment1_) |
| 2061 { | |
| 2062 segment1_.SetPosition(x1, y1, x2, y1); | |
| 2063 } | |
| 2064 | |
| 2065 if (&primitive != &segment2_) | |
| 2066 { | |
| 2067 segment2_.SetPosition(x2, y1, x2, y2); | |
| 2068 } | |
|
1985
bb307007f8e2
improved interaction with rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1984
diff
changeset
|
2069 |
| 1986 | 2070 if (&primitive != &segment3_) |
| 2071 { | |
| 2072 segment3_.SetPosition(x1, y2, x2, y2); | |
| 2073 } | |
|
1985
bb307007f8e2
improved interaction with rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1984
diff
changeset
|
2074 |
| 1986 | 2075 if (&primitive != &segment4_) |
| 2076 { | |
| 2077 segment4_.SetPosition(x1, y1, x1, y2); | |
| 2078 } | |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2079 } |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2080 else |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2081 { |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2082 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2083 } |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2084 |
|
1984
187a261d7ae2
computation of mean and stddev in rectangle probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1983
diff
changeset
|
2085 TagProbeAsChanged(); |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2086 } |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2087 |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2088 virtual void Serialize(Json::Value& target) ORTHANC_OVERRIDE |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2089 { |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2090 target = Json::objectValue; |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2091 target[KEY_TYPE] = VALUE_RECTANGLE_PROBE; |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2092 target[KEY_X1] = handle1_.GetCenter().GetX(); |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2093 target[KEY_Y1] = handle1_.GetCenter().GetY(); |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2094 target[KEY_X2] = handle2_.GetCenter().GetX(); |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2095 target[KEY_Y2] = handle2_.GetCenter().GetY(); |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2096 } |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2097 |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2098 static void Unserialize(AnnotationsSceneLayer& target, |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2099 Units units, |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2100 const Json::Value& source) |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2101 { |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2102 if (source.isMember(KEY_X1) && |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2103 source.isMember(KEY_Y1) && |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2104 source.isMember(KEY_X2) && |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2105 source.isMember(KEY_Y2) && |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2106 source[KEY_X1].isNumeric() && |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2107 source[KEY_Y1].isNumeric() && |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2108 source[KEY_X2].isNumeric() && |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2109 source[KEY_Y2].isNumeric()) |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2110 { |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2111 new RectangleProbeAnnotation(target, units, |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2112 ScenePoint2D(source[KEY_X1].asDouble(), source[KEY_Y1].asDouble()), |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2113 ScenePoint2D(source[KEY_X2].asDouble(), source[KEY_Y2].asDouble())); |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2114 } |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2115 else |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2116 { |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2117 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat, "Cannot unserialize a rectangle probe annotation"); |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2118 } |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2119 } |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2120 }; |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2121 |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2122 |
|
1987
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2123 class AnnotationsSceneLayer::EllipseProbeAnnotation : public ProbingAnnotation |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2124 { |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2125 private: |
| 2000 | 2126 Units units_; |
|
1987
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2127 Handle& handle1_; |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2128 Handle& handle2_; |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2129 Ellipse& ellipse_; |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2130 Text& label_; |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2131 |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2132 protected: |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2133 virtual void UpdateProbeForLayer(const ISceneLayer& layer) ORTHANC_OVERRIDE |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2134 { |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2135 double x1 = handle1_.GetCenter().GetX(); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2136 double y1 = handle1_.GetCenter().GetY(); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2137 double x2 = handle2_.GetCenter().GetX(); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2138 double y2 = handle2_.GetCenter().GetY(); |
| 1990 | 2139 |
|
1987
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2140 { |
| 1990 | 2141 // Put the label to the right of the right-most handle |
| 2142 //const double y = std::min(y1, y2); | |
| 2143 const double y = (y1 + y2) / 2.0; | |
| 2144 if (x1 < x2) | |
| 2145 { | |
| 2146 label_.SetPosition(x2, y); | |
| 2147 } | |
| 2148 else | |
| 2149 { | |
| 2150 label_.SetPosition(x1, y); | |
| 2151 } | |
|
1987
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2152 } |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2153 |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2154 std::string text; |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2155 |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2156 char buf[32]; |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2157 |
| 2000 | 2158 if (units_ == Units_Millimeters) |
|
1987
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2159 { |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2160 sprintf(buf, "Area: %0.2f cm%c%c", |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2161 ellipse_.GetArea() / 100.0, |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2162 0xc2, 0xb2 /* two bytes corresponding to two power in UTF-8 */); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2163 text = buf; |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2164 } |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2165 |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2166 if (layer.GetType() == ISceneLayer::Type_FloatTexture) |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2167 { |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2168 const TextureBaseSceneLayer& texture = dynamic_cast<const TextureBaseSceneLayer&>(layer); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2169 const AffineTransform2D& textureToScene = texture.GetTransform(); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2170 const AffineTransform2D sceneToTexture = AffineTransform2D::Invert(textureToScene); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2171 |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2172 const Orthanc::ImageAccessor& image = texture.GetTexture(); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2173 assert(image.GetFormat() == Orthanc::PixelFormat_Float32); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2174 |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2175 sceneToTexture.Apply(x1, y1); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2176 sceneToTexture.Apply(x2, y2); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2177 int ix1 = static_cast<int>(std::floor(x1)); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2178 int iy1 = static_cast<int>(std::floor(y1)); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2179 int ix2 = static_cast<int>(std::floor(x2)); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2180 int iy2 = static_cast<int>(std::floor(y2)); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2181 |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2182 if (ix1 > ix2) |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2183 { |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2184 std::swap(ix1, ix2); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2185 } |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2186 |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2187 if (iy1 > iy2) |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2188 { |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2189 std::swap(iy1, iy2); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2190 } |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2191 |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2192 LinearAlgebra::OnlineVarianceEstimator estimator; |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2193 |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2194 for (int y = std::max(0, iy1); y <= std::min(static_cast<int>(image.GetHeight()) - 1, iy2); y++) |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2195 { |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2196 int x = std::max(0, ix1); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2197 const float* p = reinterpret_cast<const float*>(image.GetConstRow(y)) + x; |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2198 |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2199 for (; x <= std::min(static_cast<int>(image.GetWidth()) - 1, ix2); x++, p++) |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2200 { |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2201 double yy = static_cast<double>(y) + 0.5; |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2202 double xx = static_cast<double>(x) + 0.5; |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2203 textureToScene.Apply(xx, yy); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2204 if (ellipse_.IsPointInside(ScenePoint2D(xx, yy))) |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2205 { |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2206 estimator.AddSample(*p); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2207 } |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2208 } |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2209 } |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2210 |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2211 if (estimator.GetCount() > 0) |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2212 { |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2213 if (!text.empty()) |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2214 { |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2215 text += "\n"; |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2216 } |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2217 sprintf(buf, "Mean: %0.1f\nStdDev: %0.1f", estimator.GetMean(), estimator.GetStandardDeviation()); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2218 text += buf; |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2219 } |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2220 } |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2221 |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2222 label_.SetText(text); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2223 } |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2224 |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2225 public: |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2226 EllipseProbeAnnotation(AnnotationsSceneLayer& that, |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2227 Units units, |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2228 const ScenePoint2D& p1, |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2229 const ScenePoint2D& p2) : |
| 2000 | 2230 ProbingAnnotation(that), |
| 2231 units_(units), | |
|
1987
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2232 handle1_(AddTypedPrimitive<Handle>(new Handle(*this, Handle::Shape_Square, p1))), |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2233 handle2_(AddTypedPrimitive<Handle>(new Handle(*this, Handle::Shape_Square, p2))), |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2234 ellipse_(AddTypedPrimitive<Ellipse>(new Ellipse(*this, p1, p2))), |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2235 label_(AddTypedPrimitive<Text>(new Text(that, *this))) |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2236 { |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2237 TextSceneLayer content; |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2238 content.SetAnchor(BitmapAnchor_CenterLeft); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2239 content.SetBorder(10); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2240 content.SetText("?"); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2241 |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2242 label_.SetContent(content); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2243 label_.SetColor(COLOR_TEXT); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2244 } |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2245 |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2246 virtual unsigned int GetHandlesCount() const ORTHANC_OVERRIDE |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2247 { |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2248 return 2; |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2249 } |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2250 |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2251 virtual Handle& GetHandle(unsigned int index) const ORTHANC_OVERRIDE |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2252 { |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2253 switch (index) |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2254 { |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2255 case 0: |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2256 return handle1_; |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2257 |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2258 case 1: |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2259 return handle2_; |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2260 |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2261 default: |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2262 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2263 } |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2264 } |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2265 |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2266 virtual void SignalMove(GeometricPrimitive& primitive, |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2267 const Scene2D& scene) ORTHANC_OVERRIDE |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2268 { |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2269 if (&primitive == &handle1_ || |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2270 &primitive == &handle2_) |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2271 { |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2272 ellipse_.SetPosition(handle1_.GetCenter(), handle2_.GetCenter()); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2273 } |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2274 else if (&primitive == &ellipse_) |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2275 { |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2276 handle1_.SetCenter(ellipse_.GetPosition1()); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2277 handle2_.SetCenter(ellipse_.GetPosition2()); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2278 } |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2279 else |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2280 { |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2281 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2282 } |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2283 |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2284 TagProbeAsChanged(); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2285 } |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2286 |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2287 virtual void Serialize(Json::Value& target) ORTHANC_OVERRIDE |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2288 { |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2289 target = Json::objectValue; |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2290 target[KEY_TYPE] = VALUE_ELLIPSE_PROBE; |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2291 target[KEY_X1] = handle1_.GetCenter().GetX(); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2292 target[KEY_Y1] = handle1_.GetCenter().GetY(); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2293 target[KEY_X2] = handle2_.GetCenter().GetX(); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2294 target[KEY_Y2] = handle2_.GetCenter().GetY(); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2295 } |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2296 |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2297 static void Unserialize(AnnotationsSceneLayer& target, |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2298 Units units, |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2299 const Json::Value& source) |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2300 { |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2301 if (source.isMember(KEY_X1) && |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2302 source.isMember(KEY_Y1) && |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2303 source.isMember(KEY_X2) && |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2304 source.isMember(KEY_Y2) && |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2305 source[KEY_X1].isNumeric() && |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2306 source[KEY_Y1].isNumeric() && |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2307 source[KEY_X2].isNumeric() && |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2308 source[KEY_Y2].isNumeric()) |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2309 { |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2310 new EllipseProbeAnnotation(target, units, |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2311 ScenePoint2D(source[KEY_X1].asDouble(), source[KEY_Y1].asDouble()), |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2312 ScenePoint2D(source[KEY_X2].asDouble(), source[KEY_Y2].asDouble())); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2313 } |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2314 else |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2315 { |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2316 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat, "Cannot unserialize an ellipse probe annotation"); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2317 } |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2318 } |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2319 }; |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2320 |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2321 |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2322 class AnnotationsSceneLayer::CreateTwoHandlesTracker : public IFlexiblePointerTracker |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2323 { |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2324 private: |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2325 AnnotationsSceneLayer& layer_; |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2326 Annotation* annotation_; |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2327 AffineTransform2D canvasToScene_; |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2328 |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2329 public: |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2330 CreateTwoHandlesTracker(Annotation& annotation, |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2331 const AffineTransform2D& canvasToScene) : |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2332 layer_(annotation.GetParentLayer()), |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2333 annotation_(&annotation), |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2334 canvasToScene_(canvasToScene) |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2335 { |
| 1804 | 2336 assert(annotation_ != NULL && |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2337 annotation_->GetHandlesCount() >= 2); |
| 1804 | 2338 } |
| 2339 | |
|
1972
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
2340 virtual void PointerMove(const PointerEvent& event, |
|
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
2341 const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 2342 { |
| 2343 if (annotation_ != NULL) | |
| 2344 { | |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2345 annotation_->GetHandle(1).SetCenter(event.GetMainPosition().Apply(canvasToScene_)); |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2346 annotation_->SignalMove(annotation_->GetHandle(1), scene); |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1806
diff
changeset
|
2347 |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2348 layer_.BroadcastMessage(AnnotationChangedMessage(layer_)); |
| 1804 | 2349 } |
| 2350 } | |
| 2351 | |
|
1972
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
2352 virtual void PointerUp(const PointerEvent& event, |
|
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
2353 const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 2354 { |
| 2355 annotation_ = NULL; // IsAlive() becomes false | |
| 2356 | |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2357 layer_.BroadcastMessage(AnnotationAddedMessage(layer_)); |
| 1804 | 2358 } |
| 2359 | |
|
1972
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
2360 virtual void PointerDown(const PointerEvent& event, |
|
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
2361 const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 2362 { |
| 2363 } | |
| 2364 | |
| 2365 virtual bool IsAlive() const ORTHANC_OVERRIDE | |
| 2366 { | |
| 2367 return (annotation_ != NULL); | |
| 2368 } | |
| 2369 | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
2370 virtual void Cancel(const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 2371 { |
| 2372 if (annotation_ != NULL) | |
| 2373 { | |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2374 layer_.DeleteAnnotation(annotation_); |
| 1804 | 2375 annotation_ = NULL; |
| 2376 } | |
| 2377 } | |
| 2378 }; | |
| 2379 | |
| 2380 | |
| 2381 class AnnotationsSceneLayer::CreateAngleTracker : public IFlexiblePointerTracker | |
| 2382 { | |
| 2383 private: | |
| 2384 AnnotationsSceneLayer& that_; | |
|
1998
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
2385 LengthAnnotation* length_; |
| 1804 | 2386 AngleAnnotation* angle_; |
| 2387 AffineTransform2D canvasToScene_; | |
| 2388 | |
| 2389 public: | |
| 2390 CreateAngleTracker(AnnotationsSceneLayer& that, | |
| 2391 const ScenePoint2D& sceneClick, | |
| 2392 const AffineTransform2D& canvasToScene) : | |
| 2393 that_(that), | |
|
1998
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
2394 length_(NULL), |
| 1804 | 2395 angle_(NULL), |
| 2396 canvasToScene_(canvasToScene) | |
| 2397 { | |
| 2000 | 2398 length_ = new LengthAnnotation(that, that.GetUnits(), false /* no length label */, sceneClick, sceneClick); |
| 1804 | 2399 } |
| 2400 | |
|
1972
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
2401 virtual void PointerMove(const PointerEvent& event, |
|
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
2402 const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 2403 { |
|
1998
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
2404 if (length_ != NULL) |
| 1804 | 2405 { |
|
1998
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
2406 length_->GetHandle(1).SetCenter(event.GetMainPosition().Apply(canvasToScene_)); |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
2407 length_->SignalMove(length_->GetHandle(1), scene); |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1806
diff
changeset
|
2408 that_.BroadcastMessage(AnnotationChangedMessage(that_)); |
| 1804 | 2409 } |
| 2410 | |
| 2411 if (angle_ != NULL) | |
| 2412 { | |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2413 angle_->GetHandle(2).SetCenter(event.GetMainPosition().Apply(canvasToScene_)); |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2414 angle_->SignalMove(angle_->GetHandle(2), scene); |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1806
diff
changeset
|
2415 that_.BroadcastMessage(AnnotationChangedMessage(that_)); |
| 1804 | 2416 } |
| 2417 } | |
| 2418 | |
|
1972
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
2419 virtual void PointerUp(const PointerEvent& event, |
|
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
2420 const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 2421 { |
|
1998
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
2422 if (length_ != NULL) |
| 1804 | 2423 { |
| 2424 // End of first step: The first segment is available, now create the angle | |
| 2425 | |
| 2000 | 2426 angle_ = new AngleAnnotation(that_, length_->GetHandle(0).GetCenter(), |
|
1998
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
2427 length_->GetHandle(1).GetCenter(), |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
2428 length_->GetHandle(1).GetCenter()); |
| 1804 | 2429 |
|
1998
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
2430 that_.DeleteAnnotation(length_); |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
2431 length_ = NULL; |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1806
diff
changeset
|
2432 |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1806
diff
changeset
|
2433 that_.BroadcastMessage(AnnotationChangedMessage(that_)); |
| 1804 | 2434 } |
| 2435 else | |
| 2436 { | |
| 2437 angle_ = NULL; // IsAlive() becomes false | |
| 2438 | |
| 2439 that_.BroadcastMessage(AnnotationAddedMessage(that_)); | |
| 2440 } | |
| 2441 } | |
| 2442 | |
|
1972
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
2443 virtual void PointerDown(const PointerEvent& event, |
|
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
2444 const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 2445 { |
| 2446 } | |
| 2447 | |
| 2448 virtual bool IsAlive() const ORTHANC_OVERRIDE | |
| 2449 { | |
|
1998
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
2450 return (length_ != NULL || |
| 1804 | 2451 angle_ != NULL); |
| 2452 } | |
| 2453 | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
2454 virtual void Cancel(const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 2455 { |
|
1998
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
2456 if (length_ != NULL) |
| 1804 | 2457 { |
|
1998
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
2458 that_.DeleteAnnotation(length_); |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
2459 length_ = NULL; |
| 1804 | 2460 } |
| 2461 | |
| 2462 if (angle_ != NULL) | |
| 2463 { | |
| 2464 that_.DeleteAnnotation(angle_); | |
| 2465 angle_ = NULL; | |
| 2466 } | |
| 2467 } | |
| 2468 }; | |
| 2469 | |
| 2470 | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
2471 class AnnotationsSceneLayer::CreatePixelProbeTracker : public IFlexiblePointerTracker |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
2472 { |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
2473 public: |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
2474 CreatePixelProbeTracker(AnnotationsSceneLayer& that, |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
2475 const ScenePoint2D& sceneClick, |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2476 const Scene2D& scene) |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
2477 { |
| 2000 | 2478 PixelProbeAnnotation* annotation = new PixelProbeAnnotation(that, sceneClick); |
|
1976
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
2479 annotation->UpdateProbe(scene); |
|
1978
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
2480 that.BroadcastMessage(AnnotationAddedMessage(that)); |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
2481 } |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
2482 |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
2483 virtual void PointerMove(const PointerEvent& event, |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
2484 const Scene2D& scene) ORTHANC_OVERRIDE |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
2485 { |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
2486 } |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
2487 |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
2488 virtual void PointerUp(const PointerEvent& event, |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
2489 const Scene2D& scene) ORTHANC_OVERRIDE |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
2490 { |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
2491 } |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
2492 |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
2493 virtual void PointerDown(const PointerEvent& event, |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
2494 const Scene2D& scene) ORTHANC_OVERRIDE |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
2495 { |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
2496 } |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
2497 |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
2498 virtual bool IsAlive() const ORTHANC_OVERRIDE |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
2499 { |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
2500 return false; |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
2501 } |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
2502 |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
2503 virtual void Cancel(const Scene2D& scene) ORTHANC_OVERRIDE |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
2504 { |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
2505 } |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
2506 }; |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
2507 |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
2508 |
| 1804 | 2509 // Dummy tracker that is only used for deletion, in order to warn |
| 2510 // the caller that the mouse action was taken into consideration | |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1806
diff
changeset
|
2511 class AnnotationsSceneLayer::RemoveTracker : public IFlexiblePointerTracker |
| 1804 | 2512 { |
| 2513 public: | |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1806
diff
changeset
|
2514 RemoveTracker() |
| 1804 | 2515 { |
| 2516 } | |
| 2517 | |
|
1972
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
2518 virtual void PointerMove(const PointerEvent& event, |
|
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
2519 const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 2520 { |
| 2521 } | |
| 2522 | |
|
1972
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
2523 virtual void PointerUp(const PointerEvent& event, |
|
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
2524 const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 2525 { |
| 2526 } | |
| 2527 | |
|
1972
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
2528 virtual void PointerDown(const PointerEvent& event, |
|
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
2529 const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 2530 { |
| 2531 } | |
| 2532 | |
| 2533 virtual bool IsAlive() const ORTHANC_OVERRIDE | |
| 2534 { | |
| 2535 return false; | |
| 2536 } | |
| 2537 | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
2538 virtual void Cancel(const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 2539 { |
| 2540 } | |
| 2541 }; | |
| 2542 | |
| 2543 | |
| 2544 void AnnotationsSceneLayer::AddAnnotation(Annotation* annotation) | |
| 2545 { | |
| 2546 assert(annotation != NULL); | |
| 2547 assert(annotations_.find(annotation) == annotations_.end()); | |
| 2548 annotations_.insert(annotation); | |
| 2549 } | |
| 2550 | |
| 2551 | |
| 2552 void AnnotationsSceneLayer::DeleteAnnotation(Annotation* annotation) | |
| 2553 { | |
| 2554 if (annotation != NULL) | |
| 2555 { | |
| 2556 assert(annotations_.find(annotation) != annotations_.end()); | |
| 2557 annotations_.erase(annotation); | |
| 2558 delete annotation; | |
| 2559 } | |
| 2560 } | |
| 2561 | |
| 2562 | |
| 2563 void AnnotationsSceneLayer::DeletePrimitive(GeometricPrimitive* primitive) | |
| 2564 { | |
| 2565 if (primitive != NULL) | |
| 2566 { | |
| 2567 assert(primitives_.find(primitive) != primitives_.end()); | |
| 2568 primitives_.erase(primitive); | |
| 2569 delete primitive; | |
| 2570 } | |
| 2571 } | |
| 2572 | |
| 2573 | |
| 2574 void AnnotationsSceneLayer::TagSubLayerToRemove(size_t subLayerIndex) | |
| 2575 { | |
| 2576 assert(subLayersToRemove_.find(subLayerIndex) == subLayersToRemove_.end()); | |
| 2577 subLayersToRemove_.insert(subLayerIndex); | |
| 2578 } | |
| 2579 | |
| 2580 | |
| 2581 AnnotationsSceneLayer::AnnotationsSceneLayer(size_t macroLayerIndex) : | |
| 2582 activeTool_(Tool_Edit), | |
| 2583 macroLayerIndex_(macroLayerIndex), | |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
2584 polylineSubLayer_(0), // dummy initialization |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
2585 units_(Units_Pixels), |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
2586 probedLayer_(0) |
| 1804 | 2587 { |
| 2588 } | |
| 2589 | |
| 2590 | |
| 2591 void AnnotationsSceneLayer::Clear() | |
| 2592 { | |
| 2593 for (Annotations::iterator it = annotations_.begin(); it != annotations_.end(); ++it) | |
| 2594 { | |
| 2595 assert(*it != NULL); | |
| 2596 delete *it; | |
| 2597 } | |
| 2598 | |
| 2599 annotations_.clear(); | |
|
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1809
diff
changeset
|
2600 |
|
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1809
diff
changeset
|
2601 ClearHover(); |
| 1804 | 2602 } |
| 2603 | |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
2604 |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
2605 void AnnotationsSceneLayer::SetUnits(Units units) |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
2606 { |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
2607 if (units_ != units) |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
2608 { |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
2609 Clear(); |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
2610 units_ = units; |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
2611 } |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
2612 } |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
2613 |
| 1804 | 2614 |
|
1998
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
2615 void AnnotationsSceneLayer::AddLengthAnnotation(const ScenePoint2D& p1, |
|
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
2616 const ScenePoint2D& p2) |
|
1806
0840a25c6d41
removed hard-coded test in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1804
diff
changeset
|
2617 { |
|
1998
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
2618 annotations_.insert(new LengthAnnotation(*this, units_, true /* show label */, p1, p2)); |
|
1806
0840a25c6d41
removed hard-coded test in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1804
diff
changeset
|
2619 } |
|
0840a25c6d41
removed hard-coded test in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1804
diff
changeset
|
2620 |
|
0840a25c6d41
removed hard-coded test in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1804
diff
changeset
|
2621 |
|
0840a25c6d41
removed hard-coded test in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1804
diff
changeset
|
2622 void AnnotationsSceneLayer::AddCircleAnnotation(const ScenePoint2D& p1, |
|
0840a25c6d41
removed hard-coded test in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1804
diff
changeset
|
2623 const ScenePoint2D& p2) |
|
0840a25c6d41
removed hard-coded test in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1804
diff
changeset
|
2624 { |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
2625 annotations_.insert(new CircleAnnotation(*this, units_, p1, p2)); |
|
1806
0840a25c6d41
removed hard-coded test in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1804
diff
changeset
|
2626 } |
|
0840a25c6d41
removed hard-coded test in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1804
diff
changeset
|
2627 |
|
0840a25c6d41
removed hard-coded test in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1804
diff
changeset
|
2628 |
|
0840a25c6d41
removed hard-coded test in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1804
diff
changeset
|
2629 void AnnotationsSceneLayer::AddAngleAnnotation(const ScenePoint2D& p1, |
|
0840a25c6d41
removed hard-coded test in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1804
diff
changeset
|
2630 const ScenePoint2D& p2, |
|
0840a25c6d41
removed hard-coded test in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1804
diff
changeset
|
2631 const ScenePoint2D& p3) |
|
0840a25c6d41
removed hard-coded test in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1804
diff
changeset
|
2632 { |
| 2000 | 2633 annotations_.insert(new AngleAnnotation(*this, p1, p2, p3)); |
|
1806
0840a25c6d41
removed hard-coded test in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1804
diff
changeset
|
2634 } |
|
0840a25c6d41
removed hard-coded test in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1804
diff
changeset
|
2635 |
|
0840a25c6d41
removed hard-coded test in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1804
diff
changeset
|
2636 |
| 1804 | 2637 void AnnotationsSceneLayer::Render(Scene2D& scene) |
| 2638 { | |
| 1977 | 2639 // First, update the probes |
| 2640 for (Annotations::const_iterator it = annotations_.begin(); it != annotations_.end(); ++it) | |
| 2641 { | |
| 2642 assert(*it != NULL); | |
| 2643 (*it)->UpdateProbe(scene); | |
| 2644 } | |
| 2645 | |
| 1804 | 2646 MacroSceneLayer* macro = NULL; |
| 2647 | |
| 2648 if (scene.HasLayer(macroLayerIndex_)) | |
| 2649 { | |
| 2650 macro = &dynamic_cast<MacroSceneLayer&>(scene.GetLayer(macroLayerIndex_)); | |
| 2651 } | |
| 2652 else | |
| 2653 { | |
| 2654 macro = &dynamic_cast<MacroSceneLayer&>(scene.SetLayer(macroLayerIndex_, new MacroSceneLayer)); | |
| 2655 polylineSubLayer_ = macro->AddLayer(new PolylineSceneLayer); | |
| 2656 } | |
| 2657 | |
| 2658 for (SubLayers::const_iterator it = subLayersToRemove_.begin(); it != subLayersToRemove_.end(); ++it) | |
| 2659 { | |
| 2660 assert(macro->HasLayer(*it)); | |
| 2661 macro->DeleteLayer(*it); | |
| 2662 } | |
| 2663 | |
| 2664 subLayersToRemove_.clear(); | |
| 2665 | |
| 2666 std::unique_ptr<PolylineSceneLayer> polyline(new PolylineSceneLayer); | |
| 2667 | |
| 2668 for (GeometricPrimitives::iterator it = primitives_.begin(); it != primitives_.end(); ++it) | |
| 2669 { | |
| 2670 assert(*it != NULL); | |
| 2671 GeometricPrimitive& primitive = **it; | |
| 2672 | |
| 2673 primitive.RenderPolylineLayer(*polyline, scene); | |
| 2674 | |
| 2675 if (primitive.IsModified()) | |
| 2676 { | |
| 2677 primitive.RenderOtherLayers(*macro, scene); | |
| 2678 primitive.SetModified(false); | |
| 2679 } | |
| 2680 } | |
| 2681 | |
| 2682 macro->UpdateLayer(polylineSubLayer_, polyline.release()); | |
| 2683 } | |
| 2684 | |
| 2685 | |
| 2686 bool AnnotationsSceneLayer::ClearHover() | |
| 2687 { | |
| 2688 bool needsRefresh = false; | |
| 2689 | |
| 2690 for (GeometricPrimitives::iterator it = primitives_.begin(); it != primitives_.end(); ++it) | |
| 2691 { | |
| 2692 assert(*it != NULL); | |
| 2693 if ((*it)->IsHover()) | |
| 2694 { | |
| 2695 (*it)->SetHover(false); | |
| 2696 needsRefresh = true; | |
| 2697 } | |
| 2698 } | |
| 2699 | |
| 2700 return needsRefresh; | |
| 2701 } | |
| 2702 | |
| 2703 | |
| 2704 bool AnnotationsSceneLayer::SetMouseHover(const ScenePoint2D& p, | |
| 2705 const Scene2D& scene) | |
| 2706 { | |
| 2707 if (activeTool_ == Tool_None) | |
| 2708 { | |
| 2709 return ClearHover(); | |
| 2710 } | |
| 2711 else | |
| 2712 { | |
| 2713 bool needsRefresh = false; | |
| 2714 | |
| 2715 const ScenePoint2D s = p.Apply(scene.GetCanvasToSceneTransform()); | |
| 2716 | |
| 2717 for (GeometricPrimitives::iterator it = primitives_.begin(); it != primitives_.end(); ++it) | |
| 2718 { | |
| 2719 assert(*it != NULL); | |
| 2720 bool hover = (*it)->IsHit(s, scene); | |
| 2721 | |
| 2722 if ((*it)->IsHover() != hover) | |
| 2723 { | |
| 2724 needsRefresh = true; | |
| 2725 } | |
| 2726 | |
| 2727 (*it)->SetHover(hover); | |
| 2728 } | |
| 2729 | |
| 2730 return needsRefresh; | |
| 2731 } | |
| 2732 } | |
| 2733 | |
| 2734 | |
| 2735 IFlexiblePointerTracker* AnnotationsSceneLayer::CreateTracker(const ScenePoint2D& p, | |
| 2736 const Scene2D& scene) | |
| 2737 { | |
|
1972
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
2738 /** |
|
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
2739 * WARNING: The created trackers must NOT keep a reference to "scene"! |
|
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
2740 **/ |
|
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
2741 |
| 1804 | 2742 if (activeTool_ == Tool_None) |
| 2743 { | |
| 2744 return NULL; | |
| 2745 } | |
| 2746 else | |
| 2747 { | |
| 2748 const ScenePoint2D s = p.Apply(scene.GetCanvasToSceneTransform()); | |
| 2749 | |
| 2750 GeometricPrimitive* bestHit = NULL; | |
| 2751 | |
| 2752 for (GeometricPrimitives::iterator it = primitives_.begin(); it != primitives_.end(); ++it) | |
| 2753 { | |
| 2754 assert(*it != NULL); | |
| 2755 if ((*it)->IsHit(s, scene)) | |
| 2756 { | |
| 2757 if (bestHit == NULL || | |
| 2758 bestHit->GetDepth() > (*it)->GetDepth()) | |
| 2759 { | |
| 2760 bestHit = *it; | |
| 2761 } | |
| 2762 } | |
| 2763 } | |
| 2764 | |
| 2765 if (bestHit != NULL) | |
| 2766 { | |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1806
diff
changeset
|
2767 if (activeTool_ == Tool_Remove) |
| 1804 | 2768 { |
| 2769 DeleteAnnotation(&bestHit->GetParentAnnotation()); | |
| 2770 BroadcastMessage(AnnotationRemovedMessage(*this)); | |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1806
diff
changeset
|
2771 return new RemoveTracker; |
| 1804 | 2772 } |
| 2773 else | |
| 2774 { | |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1806
diff
changeset
|
2775 return new EditPrimitiveTracker(*this, *bestHit, s, scene.GetCanvasToSceneTransform()); |
| 1804 | 2776 } |
| 2777 } | |
| 2778 else | |
| 2779 { | |
| 2780 switch (activeTool_) | |
| 2781 { | |
|
1998
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
2782 case Tool_Length: |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2783 { |
|
1998
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
2784 Annotation* annotation = new LengthAnnotation(*this, units_, true /* show label */, s, s); |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2785 return new CreateTwoHandlesTracker(*annotation, scene.GetCanvasToSceneTransform()); |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2786 } |
| 1804 | 2787 |
| 2788 case Tool_Circle: | |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2789 { |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2790 Annotation* annotation = new CircleAnnotation(*this, units_, s, s); |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2791 return new CreateTwoHandlesTracker(*annotation, scene.GetCanvasToSceneTransform()); |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2792 } |
| 1804 | 2793 |
| 2794 case Tool_Angle: | |
| 2000 | 2795 return new CreateAngleTracker(*this, s, scene.GetCanvasToSceneTransform()); |
| 1804 | 2796 |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
2797 case Tool_PixelProbe: |
| 2000 | 2798 return new CreatePixelProbeTracker(*this, s, scene); |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2799 |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2800 case Tool_RectangleProbe: |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2801 { |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2802 Annotation* annotation = new RectangleProbeAnnotation(*this, units_, s, s); |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2803 return new CreateTwoHandlesTracker(*annotation, scene.GetCanvasToSceneTransform()); |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2804 } |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
2805 |
|
1987
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2806 case Tool_EllipseProbe: |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2807 { |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2808 Annotation* annotation = new EllipseProbeAnnotation(*this, units_, s, s); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2809 return new CreateTwoHandlesTracker(*annotation, scene.GetCanvasToSceneTransform()); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2810 } |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2811 |
|
1999
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
2812 case Tool_TextAnnotation: |
|
1998
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
2813 { |
| 2000 | 2814 Annotation* annotation = new TextAnnotation(*this, "" /* empty label */, s, s); |
|
1998
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
2815 return new CreateTwoHandlesTracker(*annotation, scene.GetCanvasToSceneTransform()); |
|
1999
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
2816 } |
|
1998
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
2817 |
| 1804 | 2818 default: |
| 2819 return NULL; | |
| 2820 } | |
| 2821 } | |
| 2822 } | |
| 2823 } | |
| 2824 | |
| 2825 | |
| 2826 void AnnotationsSceneLayer::Serialize(Json::Value& target) const | |
| 2827 { | |
| 2828 Json::Value annotations = Json::arrayValue; | |
| 2829 | |
| 2830 for (Annotations::const_iterator it = annotations_.begin(); it != annotations_.end(); ++it) | |
| 2831 { | |
| 2832 assert(*it != NULL); | |
| 2833 | |
| 2834 Json::Value item; | |
| 2835 (*it)->Serialize(item); | |
| 2836 annotations.append(item); | |
| 2837 } | |
| 2838 | |
| 2839 target = Json::objectValue; | |
| 2840 target[KEY_ANNOTATIONS] = annotations; | |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
2841 |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
2842 switch (units_) |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
2843 { |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
2844 case Units_Millimeters: |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
2845 target[KEY_UNITS] = VALUE_MILLIMETERS; |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
2846 break; |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
2847 |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
2848 case Units_Pixels: |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
2849 target[KEY_UNITS] = VALUE_PIXELS; |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
2850 break; |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
2851 |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
2852 default: |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
2853 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
2854 } |
| 1804 | 2855 } |
| 2856 | |
| 2857 | |
| 2858 void AnnotationsSceneLayer::Unserialize(const Json::Value& serialized) | |
| 2859 { | |
| 2860 Clear(); | |
| 2861 | |
| 2862 if (serialized.type() != Json::objectValue || | |
| 2863 !serialized.isMember(KEY_ANNOTATIONS) || | |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
2864 !serialized.isMember(KEY_UNITS) || |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
2865 serialized[KEY_ANNOTATIONS].type() != Json::arrayValue || |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
2866 serialized[KEY_UNITS].type() != Json::stringValue) |
| 1804 | 2867 { |
| 2868 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat, "Cannot unserialize a set of annotations"); | |
| 2869 } | |
| 2870 | |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
2871 const std::string& u = serialized[KEY_UNITS].asString(); |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
2872 |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
2873 if (u == VALUE_MILLIMETERS) |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
2874 { |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
2875 units_ = Units_Millimeters; |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
2876 } |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
2877 else if (u == VALUE_PIXELS) |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
2878 { |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
2879 units_ = Units_Pixels; |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
2880 } |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
2881 else |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
2882 { |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
2883 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat, "Unknown units: " + u); |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
2884 } |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
2885 |
| 1804 | 2886 const Json::Value& annotations = serialized[KEY_ANNOTATIONS]; |
| 2887 | |
| 2888 for (Json::Value::ArrayIndex i = 0; i < annotations.size(); i++) | |
| 2889 { | |
| 2890 if (annotations[i].type() != Json::objectValue || | |
| 2891 !annotations[i].isMember(KEY_TYPE) || | |
| 2892 annotations[i][KEY_TYPE].type() != Json::stringValue) | |
| 2893 { | |
| 2894 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat); | |
| 2895 } | |
| 2896 | |
| 2897 const std::string& type = annotations[i][KEY_TYPE].asString(); | |
| 2898 | |
| 2899 if (type == VALUE_ANGLE) | |
| 2900 { | |
| 2000 | 2901 AngleAnnotation::Unserialize(*this, annotations[i]); |
| 1804 | 2902 } |
| 2903 else if (type == VALUE_CIRCLE) | |
| 2904 { | |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
2905 CircleAnnotation::Unserialize(*this, units_, annotations[i]); |
| 1804 | 2906 } |
|
1998
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
2907 else if (type == VALUE_LENGTH) |
| 1804 | 2908 { |
|
1998
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
2909 LengthAnnotation::Unserialize(*this, units_, annotations[i]); |
| 1804 | 2910 } |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
2911 else if (type == VALUE_PIXEL_PROBE) |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
2912 { |
| 2000 | 2913 PixelProbeAnnotation::Unserialize(*this, annotations[i]); |
|
1983
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2914 } |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2915 else if (type == VALUE_RECTANGLE_PROBE) |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2916 { |
|
20fa913272b7
drawing rectangle probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1981
diff
changeset
|
2917 RectangleProbeAnnotation::Unserialize(*this, units_, annotations[i]); |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
2918 } |
|
1987
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2919 else if (type == VALUE_ELLIPSE_PROBE) |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2920 { |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2921 EllipseProbeAnnotation::Unserialize(*this, units_, annotations[i]); |
|
a595776232bb
added ellipse probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1986
diff
changeset
|
2922 } |
|
1999
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
2923 else if (type == VALUE_TEXT_ANNOTATION) |
|
1998
1fa3f484008e
added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1990
diff
changeset
|
2924 { |
| 2000 | 2925 TextAnnotation::Unserialize(*this, annotations[i]); |
|
1999
709b90ae0f89
starting text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1998
diff
changeset
|
2926 } |
| 1804 | 2927 else |
| 2928 { | |
| 2929 LOG(ERROR) << "Cannot unserialize unknown type of annotation: " << type; | |
| 2930 } | |
| 2931 } | |
| 2932 } | |
| 2933 } |