Mercurial > hg > orthanc-stone
annotate OrthancStone/Sources/Scene2D/AnnotationsSceneLayer.cpp @ 1977:ba971d9082d3
cont pixel probe
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Sat, 29 Oct 2022 16:31:09 +0200 |
| parents | d71acf30970a |
| children | 95449b0e064a |
| 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" | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
29 #include "TextureBaseSceneLayer.h" // TODO REMOVE |
| 1804 | 30 |
| 31 #include <OrthancException.h> | |
| 32 | |
| 33 #include <boost/math/constants/constants.hpp> | |
| 34 #include <list> | |
| 35 | |
| 36 static const double HANDLE_SIZE = 10.0; | |
| 37 static const double PI = boost::math::constants::pi<double>(); | |
| 38 | |
| 39 static const char* const KEY_ANNOTATIONS = "annotations"; | |
| 40 static const char* const KEY_TYPE = "type"; | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
41 static const char* const KEY_X = "x"; |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
42 static const char* const KEY_Y = "y"; |
| 1804 | 43 static const char* const KEY_X1 = "x1"; |
| 44 static const char* const KEY_Y1 = "y1"; | |
| 45 static const char* const KEY_X2 = "x2"; | |
| 46 static const char* const KEY_Y2 = "y2"; | |
| 47 static const char* const KEY_X3 = "x3"; | |
| 48 static const char* const KEY_Y3 = "y3"; | |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
49 static const char* const KEY_UNITS = "units"; |
| 1804 | 50 |
| 51 static const char* const VALUE_ANGLE = "angle"; | |
| 52 static const char* const VALUE_CIRCLE = "circle"; | |
| 53 static const char* const VALUE_SEGMENT = "segment"; | |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
54 static const char* const VALUE_MILLIMETERS = "millimeters"; |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
55 static const char* const VALUE_PIXELS = "pixels"; |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
56 static const char* const VALUE_PIXEL_PROBE = "pixel-probe"; |
| 1804 | 57 |
|
1819
fe402c678d18
improved color theme for annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1817
diff
changeset
|
58 #if 0 |
|
fe402c678d18
improved color theme for annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1817
diff
changeset
|
59 static OrthancStone::Color COLOR_PRIMITIVES(192, 192, 192); |
|
fe402c678d18
improved color theme for annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1817
diff
changeset
|
60 static OrthancStone::Color COLOR_HOVER(0, 255, 0); |
|
fe402c678d18
improved color theme for annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1817
diff
changeset
|
61 static OrthancStone::Color COLOR_TEXT(255, 0, 0); |
|
fe402c678d18
improved color theme for annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1817
diff
changeset
|
62 #else |
|
fe402c678d18
improved color theme for annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1817
diff
changeset
|
63 static OrthancStone::Color COLOR_PRIMITIVES(0x40, 0x82, 0xad); |
|
fe402c678d18
improved color theme for annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1817
diff
changeset
|
64 static OrthancStone::Color COLOR_HOVER(0x40, 0xad, 0x79); |
|
fe402c678d18
improved color theme for annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1817
diff
changeset
|
65 static OrthancStone::Color COLOR_TEXT(0x4e, 0xde, 0x99); |
|
fe402c678d18
improved color theme for annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1817
diff
changeset
|
66 #endif |
|
fe402c678d18
improved color theme for annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1817
diff
changeset
|
67 |
| 1804 | 68 |
| 69 namespace OrthancStone | |
| 70 { | |
| 71 class AnnotationsSceneLayer::GeometricPrimitive : public boost::noncopyable | |
| 72 { | |
| 73 private: | |
| 74 bool modified_; | |
| 75 Annotation& parentAnnotation_; | |
| 76 Color color_; | |
| 77 Color hoverColor_; | |
| 78 bool isHover_; | |
| 79 int depth_; | |
| 80 | |
| 81 public: | |
| 82 GeometricPrimitive(Annotation& parentAnnotation, | |
| 83 int depth) : | |
| 84 modified_(true), | |
| 85 parentAnnotation_(parentAnnotation), | |
|
1819
fe402c678d18
improved color theme for annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1817
diff
changeset
|
86 color_(COLOR_PRIMITIVES), |
|
fe402c678d18
improved color theme for annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1817
diff
changeset
|
87 hoverColor_(COLOR_HOVER), |
| 1804 | 88 isHover_(false), |
| 89 depth_(depth) | |
| 90 { | |
| 91 } | |
| 92 | |
| 93 virtual ~GeometricPrimitive() | |
| 94 { | |
| 95 } | |
| 96 | |
| 97 Annotation& GetParentAnnotation() const | |
| 98 { | |
| 99 return parentAnnotation_; | |
| 100 } | |
| 101 | |
| 102 int GetDepth() const | |
| 103 { | |
| 104 return depth_; | |
| 105 } | |
| 106 | |
| 107 void SetHover(bool hover) | |
| 108 { | |
| 109 if (hover != isHover_) | |
| 110 { | |
| 111 isHover_ = hover; | |
| 112 modified_ = true; | |
| 113 } | |
| 114 } | |
| 115 | |
| 116 bool IsHover() const | |
| 117 { | |
| 118 return isHover_; | |
| 119 } | |
| 120 | |
| 121 void SetModified(bool modified) | |
| 122 { | |
| 123 modified_ = modified; | |
| 124 } | |
| 125 | |
| 126 bool IsModified() const | |
| 127 { | |
| 128 return modified_; | |
| 129 } | |
| 130 | |
| 131 void SetColor(const Color& color) | |
| 132 { | |
| 133 SetModified(true); | |
| 134 color_ = color; | |
| 135 } | |
| 136 | |
| 137 void SetHoverColor(const Color& color) | |
| 138 { | |
| 139 SetModified(true); | |
| 140 hoverColor_ = color; | |
| 141 } | |
| 142 | |
| 143 const Color& GetColor() const | |
| 144 { | |
| 145 return color_; | |
| 146 } | |
| 147 | |
| 148 const Color& GetHoverColor() const | |
| 149 { | |
| 150 return hoverColor_; | |
| 151 } | |
| 152 | |
| 153 virtual bool IsHit(const ScenePoint2D& p, | |
| 154 const Scene2D& scene) const = 0; | |
| 155 | |
| 156 // Always called, even if not modified | |
| 157 virtual void RenderPolylineLayer(PolylineSceneLayer& polyline, | |
| 158 const Scene2D& scene) = 0; | |
| 159 | |
| 160 // Only called if modified | |
| 161 virtual void RenderOtherLayers(MacroSceneLayer& macro, | |
| 162 const Scene2D& scene) = 0; | |
| 163 | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
164 virtual void MovePreview(const ScenePoint2D& delta, |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
165 const Scene2D& scene) = 0; |
| 1804 | 166 |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
167 virtual void MoveDone(const ScenePoint2D& delta, |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
168 const Scene2D& scene) = 0; |
| 1804 | 169 }; |
| 170 | |
| 171 | |
| 172 class AnnotationsSceneLayer::Annotation : public boost::noncopyable | |
| 173 { | |
| 174 private: | |
| 175 typedef std::list<GeometricPrimitive*> GeometricPrimitives; | |
| 176 | |
| 177 AnnotationsSceneLayer& that_; | |
| 178 GeometricPrimitives primitives_; | |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
179 Units units_; |
| 1804 | 180 |
| 181 public: | |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
182 explicit Annotation(AnnotationsSceneLayer& that, |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
183 Units units) : |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
184 that_(that), |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
185 units_(units) |
| 1804 | 186 { |
| 187 that.AddAnnotation(this); | |
| 188 } | |
| 189 | |
| 190 virtual ~Annotation() | |
| 191 { | |
| 192 for (GeometricPrimitives::iterator it = primitives_.begin(); it != primitives_.end(); ++it) | |
| 193 { | |
| 194 that_.DeletePrimitive(*it); | |
| 195 } | |
| 196 } | |
| 197 | |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
198 Units GetUnits() const |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
199 { |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
200 return units_; |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
201 } |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
202 |
| 1804 | 203 GeometricPrimitive* AddPrimitive(GeometricPrimitive* primitive) |
| 204 { | |
| 205 if (primitive == NULL) | |
| 206 { | |
| 207 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer); | |
| 208 } | |
| 209 else | |
| 210 { | |
| 211 assert(that_.primitives_.find(primitive) == that_.primitives_.end()); | |
| 212 primitives_.push_back(primitive); // For automated deallocation | |
| 213 that_.primitives_.insert(primitive); | |
| 214 return primitive; | |
| 215 } | |
| 216 } | |
| 217 | |
| 218 template <typename T> | |
| 219 T& AddTypedPrimitive(T* primitive) | |
| 220 { | |
| 221 AddPrimitive(primitive); | |
| 222 return *primitive; | |
| 223 } | |
| 224 | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
225 virtual void SignalMove(GeometricPrimitive& primitive, |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
226 const Scene2D& scene) = 0; |
| 1804 | 227 |
|
1976
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
228 virtual void UpdateProbe(const Scene2D& scene) = 0; |
|
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
229 |
| 1804 | 230 virtual void Serialize(Json::Value& target) = 0; |
| 231 }; | |
| 232 | |
| 233 | |
| 234 class AnnotationsSceneLayer::Handle : public GeometricPrimitive | |
| 235 { | |
| 236 private: | |
| 237 ScenePoint2D center_; | |
| 238 ScenePoint2D delta_; | |
| 239 | |
| 240 public: | |
| 241 explicit Handle(Annotation& parentAnnotation, | |
| 242 const ScenePoint2D& center) : | |
| 243 GeometricPrimitive(parentAnnotation, 0), // Highest priority | |
| 244 center_(center), | |
| 245 delta_(0, 0) | |
| 246 { | |
| 247 } | |
| 248 | |
| 249 void SetSize(unsigned int size) | |
| 250 { | |
| 251 SetModified(true); | |
| 252 } | |
| 253 | |
| 254 void SetCenter(const ScenePoint2D& center) | |
| 255 { | |
| 256 SetModified(true); | |
| 257 center_ = center; | |
| 258 delta_ = ScenePoint2D(0, 0); | |
| 259 } | |
| 260 | |
| 261 ScenePoint2D GetCenter() const | |
| 262 { | |
| 263 return center_ + delta_; | |
| 264 } | |
| 265 | |
| 266 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
|
267 const Scene2D& scene) const ORTHANC_OVERRIDE |
| 1804 | 268 { |
| 269 const double zoom = scene.GetSceneToCanvasTransform().ComputeZoom(); | |
| 270 | |
| 271 double dx = (center_.GetX() + delta_.GetX() - p.GetX()) * zoom; | |
| 272 double dy = (center_.GetY() + delta_.GetY() - p.GetY()) * zoom; | |
| 273 | |
| 274 return (std::abs(dx) <= HANDLE_SIZE / 2.0 && | |
| 275 std::abs(dy) <= HANDLE_SIZE / 2.0); | |
| 276 } | |
| 277 | |
| 278 virtual void RenderPolylineLayer(PolylineSceneLayer& polyline, | |
| 279 const Scene2D& scene) ORTHANC_OVERRIDE | |
| 280 { | |
| 281 const double zoom = scene.GetSceneToCanvasTransform().ComputeZoom(); | |
| 282 | |
| 283 // TODO: take DPI into account | |
| 284 double x1 = center_.GetX() + delta_.GetX() - (HANDLE_SIZE / 2.0) / zoom; | |
| 285 double y1 = center_.GetY() + delta_.GetY() - (HANDLE_SIZE / 2.0) / zoom; | |
| 286 double x2 = center_.GetX() + delta_.GetX() + (HANDLE_SIZE / 2.0) / zoom; | |
| 287 double y2 = center_.GetY() + delta_.GetY() + (HANDLE_SIZE / 2.0) / zoom; | |
| 288 | |
| 289 PolylineSceneLayer::Chain chain; | |
| 290 chain.reserve(4); | |
| 291 chain.push_back(ScenePoint2D(x1, y1)); | |
| 292 chain.push_back(ScenePoint2D(x2, y1)); | |
| 293 chain.push_back(ScenePoint2D(x2, y2)); | |
| 294 chain.push_back(ScenePoint2D(x1, y2)); | |
| 295 | |
| 296 if (IsHover()) | |
| 297 { | |
| 298 polyline.AddChain(chain, true /* closed */, GetHoverColor()); | |
| 299 } | |
| 300 else | |
| 301 { | |
| 302 polyline.AddChain(chain, true /* closed */, GetColor()); | |
| 303 } | |
| 304 } | |
| 305 | |
| 306 virtual void RenderOtherLayers(MacroSceneLayer& macro, | |
| 307 const Scene2D& scene) ORTHANC_OVERRIDE | |
| 308 { | |
| 309 } | |
| 310 | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
311 virtual void MovePreview(const ScenePoint2D& delta, |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
312 const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 313 { |
| 314 SetModified(true); | |
| 315 delta_ = delta; | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
316 GetParentAnnotation().SignalMove(*this, scene); |
| 1804 | 317 } |
| 318 | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
319 virtual void MoveDone(const ScenePoint2D& delta, |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
320 const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 321 { |
| 322 SetModified(true); | |
| 323 center_ = center_ + delta; | |
| 324 delta_ = ScenePoint2D(0, 0); | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
325 GetParentAnnotation().SignalMove(*this, scene); |
| 1804 | 326 } |
| 327 }; | |
| 328 | |
| 329 | |
| 330 class AnnotationsSceneLayer::Segment : public GeometricPrimitive | |
| 331 { | |
| 332 private: | |
| 333 ScenePoint2D p1_; | |
| 334 ScenePoint2D p2_; | |
| 335 ScenePoint2D delta_; | |
| 336 | |
| 337 public: | |
| 338 Segment(Annotation& parentAnnotation, | |
| 339 const ScenePoint2D& p1, | |
| 340 const ScenePoint2D& p2) : | |
| 341 GeometricPrimitive(parentAnnotation, 1), // Can only be selected if no handle matches | |
| 342 p1_(p1), | |
| 343 p2_(p2), | |
| 344 delta_(0, 0) | |
| 345 { | |
| 346 } | |
| 347 | |
| 348 void SetPosition(const ScenePoint2D& p1, | |
| 349 const ScenePoint2D& p2) | |
| 350 { | |
| 351 SetModified(true); | |
| 352 p1_ = p1; | |
| 353 p2_ = p2; | |
| 354 delta_ = ScenePoint2D(0, 0); | |
| 355 } | |
| 356 | |
| 357 ScenePoint2D GetPosition1() const | |
| 358 { | |
| 359 return p1_ + delta_; | |
| 360 } | |
| 361 | |
| 362 ScenePoint2D GetPosition2() const | |
| 363 { | |
| 364 return p2_ + delta_; | |
| 365 } | |
| 366 | |
| 367 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
|
368 const Scene2D& scene) const ORTHANC_OVERRIDE |
| 1804 | 369 { |
| 370 const double zoom = scene.GetSceneToCanvasTransform().ComputeZoom(); | |
| 371 return (ScenePoint2D::SquaredDistancePtSegment(p1_ + delta_, p2_ + delta_, p) * zoom * zoom <= | |
| 372 (HANDLE_SIZE / 2.0) * (HANDLE_SIZE / 2.0)); | |
| 373 } | |
| 374 | |
| 375 virtual void RenderPolylineLayer(PolylineSceneLayer& polyline, | |
| 376 const Scene2D& scene) ORTHANC_OVERRIDE | |
| 377 { | |
| 378 PolylineSceneLayer::Chain chain; | |
| 379 chain.reserve(2); | |
| 380 chain.push_back(p1_ + delta_); | |
| 381 chain.push_back(p2_ + delta_); | |
| 382 | |
| 383 if (IsHover()) | |
| 384 { | |
| 385 polyline.AddChain(chain, false /* closed */, GetHoverColor()); | |
| 386 } | |
| 387 else | |
| 388 { | |
| 389 polyline.AddChain(chain, false /* closed */, GetColor()); | |
| 390 } | |
| 391 } | |
| 392 | |
| 393 virtual void RenderOtherLayers(MacroSceneLayer& macro, | |
| 394 const Scene2D& scene) ORTHANC_OVERRIDE | |
| 395 { | |
| 396 } | |
| 397 | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
398 virtual void MovePreview(const ScenePoint2D& delta, |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
399 const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 400 { |
| 401 SetModified(true); | |
| 402 delta_ = delta; | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
403 GetParentAnnotation().SignalMove(*this, scene); |
| 1804 | 404 } |
| 405 | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
406 virtual void MoveDone(const ScenePoint2D& delta, |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
407 const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 408 { |
| 409 SetModified(true); | |
| 410 p1_ = p1_ + delta; | |
| 411 p2_ = p2_ + delta; | |
| 412 delta_ = ScenePoint2D(0, 0); | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
413 GetParentAnnotation().SignalMove(*this, scene); |
| 1804 | 414 } |
| 415 }; | |
| 416 | |
| 417 | |
| 418 class AnnotationsSceneLayer::Circle : public GeometricPrimitive | |
| 419 { | |
| 420 private: | |
| 421 ScenePoint2D p1_; | |
| 422 ScenePoint2D p2_; | |
|
1823
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
423 ScenePoint2D delta_; |
| 1804 | 424 |
| 425 public: | |
| 426 Circle(Annotation& parentAnnotation, | |
| 427 const ScenePoint2D& p1, | |
| 428 const ScenePoint2D& p2) : | |
| 429 GeometricPrimitive(parentAnnotation, 2), | |
| 430 p1_(p1), | |
|
1823
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
431 p2_(p2), |
|
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
432 delta_(0, 0) |
| 1804 | 433 { |
| 434 } | |
| 435 | |
| 436 void SetPosition(const ScenePoint2D& p1, | |
| 437 const ScenePoint2D& p2) | |
| 438 { | |
| 439 SetModified(true); | |
| 440 p1_ = p1; | |
| 441 p2_ = p2; | |
|
1823
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
442 delta_ = ScenePoint2D(0, 0); |
| 1804 | 443 } |
| 444 | |
| 445 ScenePoint2D GetPosition1() const | |
| 446 { | |
|
1823
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
447 return p1_ + delta_; |
| 1804 | 448 } |
| 449 | |
| 450 ScenePoint2D GetPosition2() const | |
| 451 { | |
|
1823
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
452 return p2_ + delta_; |
| 1804 | 453 } |
| 454 | |
| 455 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
|
456 const Scene2D& scene) const ORTHANC_OVERRIDE |
| 1804 | 457 { |
|
1823
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
458 const double zoom = scene.GetSceneToCanvasTransform().ComputeZoom(); |
|
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
459 |
|
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
460 ScenePoint2D middle((p1_.GetX() + p2_.GetX()) / 2.0, |
|
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
461 (p1_.GetY() + p2_.GetY()) / 2.0); |
|
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
462 |
|
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
463 const double radius = ScenePoint2D::DistancePtPt(middle, p1_); |
|
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
464 const double distance = ScenePoint2D::DistancePtPt(middle, p - delta_); |
|
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
465 |
|
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
466 return std::abs(radius - distance) * zoom <= HANDLE_SIZE / 2.0; |
| 1804 | 467 } |
| 468 | |
| 469 virtual void RenderPolylineLayer(PolylineSceneLayer& polyline, | |
| 470 const Scene2D& scene) ORTHANC_OVERRIDE | |
| 471 { | |
| 472 static unsigned int NUM_SEGMENTS = 128; | |
| 473 | |
| 474 ScenePoint2D middle((p1_.GetX() + p2_.GetX()) / 2.0, | |
| 475 (p1_.GetY() + p2_.GetY()) / 2.0); | |
| 476 | |
| 477 const double radius = ScenePoint2D::DistancePtPt(middle, p1_); | |
| 478 | |
| 479 double increment = 2.0 * PI / static_cast<double>(NUM_SEGMENTS - 1); | |
| 480 | |
| 481 PolylineSceneLayer::Chain chain; | |
| 482 chain.reserve(NUM_SEGMENTS); | |
| 483 | |
| 484 double theta = 0; | |
| 485 for (unsigned int i = 0; i < NUM_SEGMENTS; i++) | |
| 486 { | |
|
1823
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
487 chain.push_back(ScenePoint2D(delta_.GetX() + middle.GetX() + radius * cos(theta), |
|
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
488 delta_.GetY() + middle.GetY() + radius * sin(theta))); |
| 1804 | 489 theta += increment; |
| 490 } | |
| 491 | |
| 492 if (IsHover()) | |
| 493 { | |
| 494 polyline.AddChain(chain, false /* closed */, GetHoverColor()); | |
| 495 } | |
| 496 else | |
| 497 { | |
| 498 polyline.AddChain(chain, false /* closed */, GetColor()); | |
| 499 } | |
| 500 } | |
| 501 | |
| 502 virtual void RenderOtherLayers(MacroSceneLayer& macro, | |
| 503 const Scene2D& scene) ORTHANC_OVERRIDE | |
| 504 { | |
| 505 } | |
| 506 | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
507 virtual void MovePreview(const ScenePoint2D& delta, |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
508 const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 509 { |
|
1823
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
510 SetModified(true); |
|
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
511 delta_ = delta; |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
512 GetParentAnnotation().SignalMove(*this, scene); |
| 1804 | 513 } |
| 514 | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
515 virtual void MoveDone(const ScenePoint2D& delta, |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
516 const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 517 { |
|
1823
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
518 SetModified(true); |
|
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
519 p1_ = p1_ + delta; |
|
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
520 p2_ = p2_ + delta; |
|
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
521 delta_ = ScenePoint2D(0, 0); |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
522 GetParentAnnotation().SignalMove(*this, scene); |
| 1804 | 523 } |
| 524 }; | |
| 525 | |
| 526 | |
| 527 class AnnotationsSceneLayer::Arc : public GeometricPrimitive | |
| 528 { | |
| 529 private: | |
| 530 ScenePoint2D start_; | |
| 531 ScenePoint2D middle_; | |
| 532 ScenePoint2D end_; | |
| 533 double radius_; // in pixels | |
| 534 | |
| 535 void ComputeAngles(double& fullAngle, | |
| 536 double& startAngle, | |
| 537 double& endAngle) const | |
| 538 { | |
| 539 const double x1 = start_.GetX(); | |
| 540 const double y1 = start_.GetY(); | |
| 541 const double xc = middle_.GetX(); | |
| 542 const double yc = middle_.GetY(); | |
| 543 const double x2 = end_.GetX(); | |
| 544 const double y2 = end_.GetY(); | |
| 545 | |
| 546 startAngle = atan2(y1 - yc, x1 - xc); | |
| 547 endAngle = atan2(y2 - yc, x2 - xc); | |
| 548 | |
| 549 fullAngle = endAngle - startAngle; | |
| 550 | |
| 551 while (fullAngle < -PI) | |
| 552 { | |
| 553 fullAngle += 2.0 * PI; | |
| 554 } | |
| 555 | |
| 556 while (fullAngle >= PI) | |
| 557 { | |
| 558 fullAngle -= 2.0 * PI; | |
| 559 } | |
| 560 } | |
| 561 | |
| 562 public: | |
| 563 Arc(Annotation& parentAnnotation, | |
| 564 const ScenePoint2D& start, | |
| 565 const ScenePoint2D& middle, | |
| 566 const ScenePoint2D& end) : | |
| 567 GeometricPrimitive(parentAnnotation, 2), | |
| 568 start_(start), | |
| 569 middle_(middle), | |
| 570 end_(end), | |
| 571 radius_(20) | |
| 572 { | |
| 573 } | |
| 574 | |
| 575 double GetAngle() const | |
| 576 { | |
| 577 double fullAngle, startAngle, endAngle; | |
| 578 ComputeAngles(fullAngle, startAngle, endAngle); | |
| 579 return fullAngle; | |
| 580 } | |
| 581 | |
| 582 void SetStart(const ScenePoint2D& p) | |
| 583 { | |
| 584 SetModified(true); | |
| 585 start_ = p; | |
| 586 } | |
| 587 | |
| 588 void SetMiddle(const ScenePoint2D& p) | |
| 589 { | |
| 590 SetModified(true); | |
| 591 middle_ = p; | |
| 592 } | |
| 593 | |
| 594 void SetEnd(const ScenePoint2D& p) | |
| 595 { | |
| 596 SetModified(true); | |
| 597 end_ = p; | |
| 598 } | |
| 599 | |
| 600 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
|
601 const Scene2D& scene) const ORTHANC_OVERRIDE |
| 1804 | 602 { |
| 603 return false; | |
| 604 } | |
| 605 | |
| 606 virtual void RenderPolylineLayer(PolylineSceneLayer& polyline, | |
| 607 const Scene2D& scene) ORTHANC_OVERRIDE | |
| 608 { | |
| 609 static unsigned int NUM_SEGMENTS = 64; | |
| 610 | |
| 611 const double radius = radius_ / scene.GetSceneToCanvasTransform().ComputeZoom(); | |
| 612 | |
| 613 double fullAngle, startAngle, endAngle; | |
| 614 ComputeAngles(fullAngle, startAngle, endAngle); | |
| 615 | |
| 616 double increment = fullAngle / static_cast<double>(NUM_SEGMENTS - 1); | |
| 617 | |
| 618 PolylineSceneLayer::Chain chain; | |
| 619 chain.reserve(NUM_SEGMENTS); | |
| 620 | |
| 621 double theta = startAngle; | |
| 622 for (unsigned int i = 0; i < NUM_SEGMENTS; i++) | |
| 623 { | |
| 624 chain.push_back(ScenePoint2D(middle_.GetX() + radius * cos(theta), | |
| 625 middle_.GetY() + radius * sin(theta))); | |
| 626 theta += increment; | |
| 627 } | |
| 628 | |
| 629 if (IsHover()) | |
| 630 { | |
| 631 polyline.AddChain(chain, false /* closed */, GetHoverColor()); | |
| 632 } | |
| 633 else | |
| 634 { | |
| 635 polyline.AddChain(chain, false /* closed */, GetColor()); | |
| 636 } | |
| 637 } | |
| 638 | |
| 639 virtual void RenderOtherLayers(MacroSceneLayer& macro, | |
| 640 const Scene2D& scene) ORTHANC_OVERRIDE | |
| 641 { | |
| 642 } | |
| 643 | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
644 virtual void MovePreview(const ScenePoint2D& delta, |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
645 const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 646 { |
| 647 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); // No hit is possible | |
| 648 } | |
| 649 | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
650 virtual void MoveDone(const ScenePoint2D& delta, |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
651 const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 652 { |
| 653 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); // No hit is possible | |
| 654 } | |
| 655 }; | |
| 656 | |
| 657 | |
| 658 class AnnotationsSceneLayer::Text : public GeometricPrimitive | |
| 659 { | |
| 660 private: | |
| 661 AnnotationsSceneLayer& that_; | |
| 662 bool first_; | |
| 663 size_t subLayer_; | |
| 664 std::unique_ptr<TextSceneLayer> content_; | |
| 665 | |
| 666 public: | |
| 667 Text(AnnotationsSceneLayer& that, | |
| 668 Annotation& parentAnnotation) : | |
| 669 GeometricPrimitive(parentAnnotation, 2), | |
| 670 that_(that), | |
| 1817 | 671 first_(true), |
| 672 subLayer_(0) // dummy initialization | |
| 1804 | 673 { |
| 674 } | |
| 675 | |
| 676 virtual ~Text() | |
| 677 { | |
| 678 if (!first_) | |
| 679 { | |
| 680 that_.TagSubLayerToRemove(subLayer_); | |
| 681 } | |
| 682 } | |
| 683 | |
| 684 void SetContent(const TextSceneLayer& content) | |
| 685 { | |
| 686 SetModified(true); | |
| 687 content_.reset(dynamic_cast<TextSceneLayer*>(content.Clone())); | |
| 1977 | 688 } |
| 689 | |
| 690 void SetText(const std::string& text) | |
| 691 { | |
| 692 if (content_.get() == NULL) | |
| 693 { | |
| 694 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); | |
| 695 } | |
| 696 else | |
| 697 { | |
| 698 SetModified(true); | |
| 699 content_->SetText(text); | |
| 700 } | |
| 701 } | |
| 702 | |
| 703 void SetPosition(double x, | |
| 704 double y) | |
| 705 { | |
| 706 if (content_.get() == NULL) | |
| 707 { | |
| 708 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); | |
| 709 } | |
| 710 else | |
| 711 { | |
| 712 SetModified(true); | |
| 713 content_->SetPosition(x, y); | |
| 714 } | |
| 715 } | |
| 1804 | 716 |
| 717 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
|
718 const Scene2D& scene) const ORTHANC_OVERRIDE |
| 1804 | 719 { |
| 720 return false; | |
| 721 } | |
| 722 | |
| 723 virtual void RenderPolylineLayer(PolylineSceneLayer& polyline, | |
| 724 const Scene2D& scene) ORTHANC_OVERRIDE | |
| 725 { | |
| 726 } | |
| 727 | |
| 728 virtual void RenderOtherLayers(MacroSceneLayer& macro, | |
| 729 const Scene2D& scene) ORTHANC_OVERRIDE | |
| 730 { | |
| 731 if (content_.get() != NULL) | |
| 732 { | |
| 733 std::unique_ptr<TextSceneLayer> layer(reinterpret_cast<TextSceneLayer*>(content_->Clone())); | |
| 734 | |
| 735 layer->SetColor(IsHover() ? GetHoverColor() : GetColor()); | |
| 736 | |
| 737 if (first_) | |
| 738 { | |
| 739 subLayer_ = macro.AddLayer(layer.release()); | |
| 740 first_ = false; | |
| 741 } | |
| 742 else | |
| 743 { | |
| 744 macro.UpdateLayer(subLayer_, layer.release()); | |
| 745 } | |
| 746 } | |
| 747 } | |
| 748 | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
749 virtual void MovePreview(const ScenePoint2D& delta, |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
750 const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 751 { |
| 752 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); // No hit is possible | |
| 753 } | |
| 754 | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
755 virtual void MoveDone(const ScenePoint2D& delta, |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
756 const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 757 { |
| 758 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); // No hit is possible | |
| 759 } | |
| 760 }; | |
| 761 | |
| 762 | |
| 763 class AnnotationsSceneLayer::EditPrimitiveTracker : public IFlexiblePointerTracker | |
| 764 { | |
| 765 private: | |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1806
diff
changeset
|
766 AnnotationsSceneLayer& that_; |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1806
diff
changeset
|
767 GeometricPrimitive& primitive_; |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1806
diff
changeset
|
768 ScenePoint2D sceneClick_; |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1806
diff
changeset
|
769 AffineTransform2D canvasToScene_; |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1806
diff
changeset
|
770 bool alive_; |
| 1804 | 771 |
| 772 public: | |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1806
diff
changeset
|
773 EditPrimitiveTracker(AnnotationsSceneLayer& that, |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1806
diff
changeset
|
774 GeometricPrimitive& primitive, |
| 1804 | 775 const ScenePoint2D& sceneClick, |
| 776 const AffineTransform2D& canvasToScene) : | |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1806
diff
changeset
|
777 that_(that), |
| 1804 | 778 primitive_(primitive), |
| 779 sceneClick_(sceneClick), | |
| 780 canvasToScene_(canvasToScene), | |
| 781 alive_(true) | |
| 782 { | |
| 783 } | |
| 784 | |
|
1972
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
785 virtual void PointerMove(const PointerEvent& event, |
|
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
786 const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 787 { |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
788 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
|
789 that_.BroadcastMessage(AnnotationChangedMessage(that_)); |
| 1804 | 790 } |
| 791 | |
|
1972
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
792 virtual void PointerUp(const PointerEvent& event, |
|
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
793 const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 794 { |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
795 primitive_.MoveDone(event.GetMainPosition().Apply(canvasToScene_) - sceneClick_, scene); |
| 1804 | 796 alive_ = false; |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1806
diff
changeset
|
797 that_.BroadcastMessage(AnnotationChangedMessage(that_)); |
| 1804 | 798 } |
| 799 | |
|
1972
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
800 virtual void PointerDown(const PointerEvent& event, |
|
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
801 const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 802 { |
| 803 } | |
| 804 | |
| 805 virtual bool IsAlive() const ORTHANC_OVERRIDE | |
| 806 { | |
| 807 return alive_; | |
| 808 } | |
| 809 | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
810 virtual void Cancel(const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 811 { |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
812 //primitive_.MoveDone(ScenePoint2D(0, 0), scene); |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
813 primitive_.MoveDone(sceneClick_, scene); // TODO Check this |
| 1804 | 814 } |
| 815 }; | |
| 816 | |
| 817 | |
| 818 class AnnotationsSceneLayer::SegmentAnnotation : public Annotation | |
| 819 { | |
| 820 private: | |
| 821 bool showLabel_; | |
| 822 Handle& handle1_; | |
| 823 Handle& handle2_; | |
| 824 Segment& segment_; | |
| 825 Text& label_; | |
| 826 | |
| 827 void UpdateLabel() | |
| 828 { | |
| 829 if (showLabel_) | |
| 830 { | |
| 831 TextSceneLayer content; | |
| 832 | |
| 833 double x1 = handle1_.GetCenter().GetX(); | |
| 834 double y1 = handle1_.GetCenter().GetY(); | |
| 835 double x2 = handle2_.GetCenter().GetX(); | |
| 836 double y2 = handle2_.GetCenter().GetY(); | |
| 837 | |
| 838 // Put the label to the right of the right-most handle | |
| 839 if (x1 < x2) | |
| 840 { | |
| 841 content.SetPosition(x2, y2); | |
| 842 } | |
| 843 else | |
| 844 { | |
| 845 content.SetPosition(x1, y1); | |
| 846 } | |
| 847 | |
| 848 content.SetAnchor(BitmapAnchor_CenterLeft); | |
| 849 content.SetBorder(10); | |
| 850 | |
| 851 double dx = x1 - x2; | |
| 852 double dy = y1 - y2; | |
| 853 char buf[32]; | |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
854 |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
855 switch (GetUnits()) |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
856 { |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
857 case Units_Millimeters: |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
858 sprintf(buf, "%0.2f cm", sqrt(dx * dx + dy * dy) / 10.0); |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
859 break; |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
860 |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
861 case Units_Pixels: |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
862 sprintf(buf, "%0.1f px", sqrt(dx * dx + dy * dy)); |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
863 break; |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
864 |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
865 default: |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
866 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
867 } |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
868 |
| 1804 | 869 content.SetText(buf); |
| 870 | |
| 871 label_.SetContent(content); | |
| 872 } | |
| 873 } | |
| 874 | |
| 875 public: | |
| 876 SegmentAnnotation(AnnotationsSceneLayer& that, | |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
877 Units units, |
| 1804 | 878 bool showLabel, |
| 879 const ScenePoint2D& p1, | |
| 880 const ScenePoint2D& p2) : | |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
881 Annotation(that, units), |
| 1804 | 882 showLabel_(showLabel), |
| 883 handle1_(AddTypedPrimitive<Handle>(new Handle(*this, p1))), | |
| 884 handle2_(AddTypedPrimitive<Handle>(new Handle(*this, p2))), | |
| 885 segment_(AddTypedPrimitive<Segment>(new Segment(*this, p1, p2))), | |
| 886 label_(AddTypedPrimitive<Text>(new Text(that, *this))) | |
| 887 { | |
|
1819
fe402c678d18
improved color theme for annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1817
diff
changeset
|
888 label_.SetColor(COLOR_TEXT); |
| 1804 | 889 UpdateLabel(); |
| 890 } | |
| 891 | |
| 892 Handle& GetHandle1() const | |
| 893 { | |
| 894 return handle1_; | |
| 895 } | |
| 896 | |
| 897 Handle& GetHandle2() const | |
| 898 { | |
| 899 return handle2_; | |
| 900 } | |
| 901 | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
902 virtual void SignalMove(GeometricPrimitive& primitive, |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
903 const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 904 { |
| 905 if (&primitive == &handle1_ || | |
| 906 &primitive == &handle2_) | |
| 907 { | |
| 908 segment_.SetPosition(handle1_.GetCenter(), handle2_.GetCenter()); | |
| 909 } | |
| 910 else if (&primitive == &segment_) | |
| 911 { | |
| 912 handle1_.SetCenter(segment_.GetPosition1()); | |
| 913 handle2_.SetCenter(segment_.GetPosition2()); | |
| 914 } | |
| 915 | |
| 916 UpdateLabel(); | |
| 917 } | |
| 918 | |
|
1976
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
919 virtual void UpdateProbe(const Scene2D& scene) ORTHANC_OVERRIDE |
|
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
920 { |
|
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
921 } |
|
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
922 |
| 1804 | 923 virtual void Serialize(Json::Value& target) ORTHANC_OVERRIDE |
| 924 { | |
| 925 target = Json::objectValue; | |
| 926 target[KEY_TYPE] = VALUE_SEGMENT; | |
| 927 target[KEY_X1] = handle1_.GetCenter().GetX(); | |
| 928 target[KEY_Y1] = handle1_.GetCenter().GetY(); | |
| 929 target[KEY_X2] = handle2_.GetCenter().GetX(); | |
| 930 target[KEY_Y2] = handle2_.GetCenter().GetY(); | |
| 931 } | |
| 932 | |
| 933 static void Unserialize(AnnotationsSceneLayer& target, | |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
934 Units units, |
| 1804 | 935 const Json::Value& source) |
| 936 { | |
| 937 if (source.isMember(KEY_X1) && | |
| 938 source.isMember(KEY_Y1) && | |
| 939 source.isMember(KEY_X2) && | |
| 940 source.isMember(KEY_Y2) && | |
| 941 source[KEY_X1].isNumeric() && | |
| 942 source[KEY_Y1].isNumeric() && | |
| 943 source[KEY_X2].isNumeric() && | |
| 944 source[KEY_Y2].isNumeric()) | |
| 945 { | |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
946 new SegmentAnnotation(target, units, true, |
| 1804 | 947 ScenePoint2D(source[KEY_X1].asDouble(), source[KEY_Y1].asDouble()), |
| 948 ScenePoint2D(source[KEY_X2].asDouble(), source[KEY_Y2].asDouble())); | |
| 949 } | |
| 950 else | |
| 951 { | |
| 952 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat, "Cannot unserialize an segment annotation"); | |
| 953 } | |
| 954 } | |
| 955 }; | |
| 956 | |
| 1977 | 957 |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
958 class AnnotationsSceneLayer::PixelProbeAnnotation : public Annotation |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
959 { |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
960 private: |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
961 int probedLayer_; |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
962 Handle& handle_; |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
963 Text& label_; |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
964 |
|
1976
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
965 public: |
|
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
966 PixelProbeAnnotation(AnnotationsSceneLayer& that, |
|
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
967 Units units, |
|
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
968 const ScenePoint2D& p, |
|
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
969 int probedLayer) : |
|
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
970 Annotation(that, units), |
|
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
971 probedLayer_(probedLayer), |
|
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
972 handle_(AddTypedPrimitive<Handle>(new Handle(*this, p))), |
|
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
973 label_(AddTypedPrimitive<Text>(new Text(that, *this))) |
|
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
974 { |
| 1977 | 975 TextSceneLayer content; |
| 976 content.SetPosition(handle_.GetCenter().GetX(), handle_.GetCenter().GetY()); | |
| 977 content.SetAnchor(BitmapAnchor_CenterLeft); | |
| 978 content.SetBorder(10); | |
| 979 content.SetText("?"); | |
| 980 | |
| 981 label_.SetContent(content); | |
|
1976
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
982 label_.SetColor(COLOR_TEXT); |
|
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
983 } |
|
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
984 |
|
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
985 Handle& GetHandle() const |
|
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
986 { |
|
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
987 return handle_; |
|
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
988 } |
|
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
989 |
|
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
990 virtual void SignalMove(GeometricPrimitive& primitive, |
|
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
991 const Scene2D& scene) ORTHANC_OVERRIDE |
|
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
992 { |
| 1977 | 993 label_.SetPosition(handle_.GetCenter().GetX(), handle_.GetCenter().GetY()); |
|
1976
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
994 } |
|
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
995 |
|
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
996 virtual void UpdateProbe(const Scene2D& scene) ORTHANC_OVERRIDE |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
997 { |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
998 if (scene.HasLayer(probedLayer_)) |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
999 { |
| 1977 | 1000 const ISceneLayer& layer = scene.GetLayer(probedLayer_); |
| 1001 if (layer.GetType() == ISceneLayer::Type_FloatTexture || | |
| 1002 layer.GetType() == ISceneLayer::Type_ColorTexture) | |
| 1003 { | |
| 1004 const TextureBaseSceneLayer& texture = dynamic_cast<TextureBaseSceneLayer&>(scene.GetLayer(probedLayer_)); | |
| 1005 const AffineTransform2D sceneToTexture = AffineTransform2D::Invert(texture.GetTransform()); | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1006 |
| 1977 | 1007 double x = handle_.GetCenter().GetX(); |
| 1008 double y = handle_.GetCenter().GetY(); | |
| 1009 sceneToTexture.Apply(x, y); | |
| 1010 | |
| 1011 int textureX = static_cast<int>(std::floor(x)); | |
| 1012 int textureY = static_cast<int>(std::floor(y)); | |
| 1013 | |
| 1014 char buf[64]; | |
| 1015 sprintf(buf, "Hello %d x %d / (%d,%d)\n", texture.GetTexture().GetWidth(), texture.GetTexture().GetHeight(), | |
| 1016 textureX, textureY); | |
| 1017 label_.SetText(buf); | |
| 1018 } | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1019 } |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1020 } |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1021 |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1022 virtual void Serialize(Json::Value& target) ORTHANC_OVERRIDE |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1023 { |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1024 target = Json::objectValue; |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1025 target[KEY_TYPE] = VALUE_PIXEL_PROBE; |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1026 target[KEY_X] = handle_.GetCenter().GetX(); |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1027 target[KEY_Y] = handle_.GetCenter().GetY(); |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1028 } |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1029 |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1030 static void Unserialize(AnnotationsSceneLayer& target, |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1031 Units units, |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1032 int probedLayer, |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1033 const Json::Value& source) |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1034 { |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1035 if (source.isMember(KEY_X) && |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1036 source.isMember(KEY_Y) && |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1037 source[KEY_X].isNumeric() && |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1038 source[KEY_Y].isNumeric()) |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1039 { |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1040 new PixelProbeAnnotation(target, units, |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1041 ScenePoint2D(source[KEY_X].asDouble(), source[KEY_Y].asDouble()), |
|
1976
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
1042 probedLayer); |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1043 } |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1044 else |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1045 { |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1046 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
|
1047 } |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1048 } |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1049 }; |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1050 |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1051 |
| 1804 | 1052 class AnnotationsSceneLayer::AngleAnnotation : public Annotation |
| 1053 { | |
| 1054 private: | |
| 1055 Handle& startHandle_; | |
| 1056 Handle& middleHandle_; | |
| 1057 Handle& endHandle_; | |
| 1058 Segment& segment1_; | |
| 1059 Segment& segment2_; | |
| 1060 Arc& arc_; | |
| 1061 Text& label_; | |
| 1062 | |
| 1063 void UpdateLabel() | |
| 1064 { | |
| 1065 TextSceneLayer content; | |
| 1066 | |
| 1067 const double x1 = startHandle_.GetCenter().GetX(); | |
| 1068 const double x2 = middleHandle_.GetCenter().GetX(); | |
| 1069 const double y2 = middleHandle_.GetCenter().GetY(); | |
| 1070 const double x3 = endHandle_.GetCenter().GetX(); | |
| 1071 | |
| 1072 if (x2 < x1 && | |
| 1073 x2 < x3) | |
| 1074 { | |
| 1075 content.SetAnchor(BitmapAnchor_CenterRight); | |
| 1076 } | |
| 1077 else | |
| 1078 { | |
| 1079 content.SetAnchor(BitmapAnchor_CenterLeft); | |
| 1080 } | |
| 1081 | |
| 1082 content.SetPosition(x2, y2); | |
| 1083 content.SetBorder(10); | |
| 1084 | |
| 1085 char buf[32]; | |
| 1086 sprintf(buf, "%.01f%c%c", std::abs(arc_.GetAngle()) / PI * 180.0, | |
| 1087 0xc2, 0xb0 /* two bytes corresponding to degree symbol in UTF-8 */); | |
| 1088 content.SetText(buf); | |
| 1089 | |
| 1090 label_.SetContent(content); | |
| 1091 } | |
| 1092 | |
| 1093 public: | |
| 1094 AngleAnnotation(AnnotationsSceneLayer& that, | |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1095 Units units, |
| 1804 | 1096 const ScenePoint2D& start, |
| 1097 const ScenePoint2D& middle, | |
| 1098 const ScenePoint2D& end) : | |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1099 Annotation(that, units), |
| 1804 | 1100 startHandle_(AddTypedPrimitive<Handle>(new Handle(*this, start))), |
| 1101 middleHandle_(AddTypedPrimitive<Handle>(new Handle(*this, middle))), | |
| 1102 endHandle_(AddTypedPrimitive<Handle>(new Handle(*this, end))), | |
| 1103 segment1_(AddTypedPrimitive<Segment>(new Segment(*this, start, middle))), | |
| 1104 segment2_(AddTypedPrimitive<Segment>(new Segment(*this, middle, end))), | |
| 1105 arc_(AddTypedPrimitive<Arc>(new Arc(*this, start, middle, end))), | |
| 1106 label_(AddTypedPrimitive<Text>(new Text(that, *this))) | |
| 1107 { | |
|
1819
fe402c678d18
improved color theme for annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1817
diff
changeset
|
1108 label_.SetColor(COLOR_TEXT); |
| 1804 | 1109 UpdateLabel(); |
| 1110 } | |
| 1111 | |
| 1112 Handle& GetEndHandle() const | |
| 1113 { | |
| 1114 return endHandle_; | |
| 1115 } | |
| 1116 | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1117 virtual void SignalMove(GeometricPrimitive& primitive, |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1118 const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 1119 { |
| 1120 if (&primitive == &startHandle_) | |
| 1121 { | |
| 1122 segment1_.SetPosition(startHandle_.GetCenter(), middleHandle_.GetCenter()); | |
| 1123 arc_.SetStart(startHandle_.GetCenter()); | |
| 1124 } | |
| 1125 else if (&primitive == &middleHandle_) | |
| 1126 { | |
| 1127 segment1_.SetPosition(startHandle_.GetCenter(), middleHandle_.GetCenter()); | |
| 1128 segment2_.SetPosition(middleHandle_.GetCenter(), endHandle_.GetCenter()); | |
| 1129 arc_.SetMiddle(middleHandle_.GetCenter()); | |
| 1130 } | |
| 1131 else if (&primitive == &endHandle_) | |
| 1132 { | |
| 1133 segment2_.SetPosition(middleHandle_.GetCenter(), endHandle_.GetCenter()); | |
| 1134 arc_.SetEnd(endHandle_.GetCenter()); | |
| 1135 } | |
| 1136 else if (&primitive == &segment1_) | |
| 1137 { | |
| 1138 startHandle_.SetCenter(segment1_.GetPosition1()); | |
| 1139 middleHandle_.SetCenter(segment1_.GetPosition2()); | |
| 1140 segment2_.SetPosition(segment1_.GetPosition2(), segment2_.GetPosition2()); | |
| 1141 arc_.SetStart(segment1_.GetPosition1()); | |
| 1142 arc_.SetMiddle(segment1_.GetPosition2()); | |
| 1143 } | |
| 1144 else if (&primitive == &segment2_) | |
| 1145 { | |
| 1146 middleHandle_.SetCenter(segment2_.GetPosition1()); | |
| 1147 endHandle_.SetCenter(segment2_.GetPosition2()); | |
| 1148 segment1_.SetPosition(segment1_.GetPosition1(), segment2_.GetPosition1()); | |
| 1149 arc_.SetMiddle(segment2_.GetPosition1()); | |
| 1150 arc_.SetEnd(segment2_.GetPosition2()); | |
| 1151 } | |
| 1152 | |
| 1153 UpdateLabel(); | |
| 1154 } | |
| 1155 | |
|
1976
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
1156 virtual void UpdateProbe(const Scene2D& scene) ORTHANC_OVERRIDE |
|
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
1157 { |
|
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
1158 } |
|
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
1159 |
| 1804 | 1160 virtual void Serialize(Json::Value& target) ORTHANC_OVERRIDE |
| 1161 { | |
| 1162 target = Json::objectValue; | |
| 1163 target[KEY_TYPE] = VALUE_ANGLE; | |
| 1164 target[KEY_X1] = startHandle_.GetCenter().GetX(); | |
| 1165 target[KEY_Y1] = startHandle_.GetCenter().GetY(); | |
| 1166 target[KEY_X2] = middleHandle_.GetCenter().GetX(); | |
| 1167 target[KEY_Y2] = middleHandle_.GetCenter().GetY(); | |
| 1168 target[KEY_X3] = endHandle_.GetCenter().GetX(); | |
| 1169 target[KEY_Y3] = endHandle_.GetCenter().GetY(); | |
| 1170 } | |
| 1171 | |
| 1172 static void Unserialize(AnnotationsSceneLayer& target, | |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1173 Units units, |
| 1804 | 1174 const Json::Value& source) |
| 1175 { | |
| 1176 if (source.isMember(KEY_X1) && | |
| 1177 source.isMember(KEY_Y1) && | |
| 1178 source.isMember(KEY_X2) && | |
| 1179 source.isMember(KEY_Y2) && | |
| 1180 source.isMember(KEY_X3) && | |
| 1181 source.isMember(KEY_Y3) && | |
| 1182 source[KEY_X1].isNumeric() && | |
| 1183 source[KEY_Y1].isNumeric() && | |
| 1184 source[KEY_X2].isNumeric() && | |
| 1185 source[KEY_Y2].isNumeric() && | |
| 1186 source[KEY_X3].isNumeric() && | |
| 1187 source[KEY_Y3].isNumeric()) | |
| 1188 { | |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1189 new AngleAnnotation(target, units, |
| 1804 | 1190 ScenePoint2D(source[KEY_X1].asDouble(), source[KEY_Y1].asDouble()), |
| 1191 ScenePoint2D(source[KEY_X2].asDouble(), source[KEY_Y2].asDouble()), | |
| 1192 ScenePoint2D(source[KEY_X3].asDouble(), source[KEY_Y3].asDouble())); | |
| 1193 } | |
| 1194 else | |
| 1195 { | |
| 1196 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat, "Cannot unserialize an angle annotation"); | |
| 1197 } | |
| 1198 } | |
| 1199 }; | |
| 1200 | |
| 1201 | |
| 1202 class AnnotationsSceneLayer::CircleAnnotation : public Annotation | |
| 1203 { | |
| 1204 private: | |
| 1205 Handle& handle1_; | |
| 1206 Handle& handle2_; | |
| 1207 Segment& segment_; | |
| 1208 Circle& circle_; | |
| 1209 Text& label_; | |
| 1210 | |
| 1211 void UpdateLabel() | |
| 1212 { | |
| 1213 TextSceneLayer content; | |
| 1214 | |
| 1215 double x1 = handle1_.GetCenter().GetX(); | |
| 1216 double y1 = handle1_.GetCenter().GetY(); | |
| 1217 double x2 = handle2_.GetCenter().GetX(); | |
| 1218 double y2 = handle2_.GetCenter().GetY(); | |
| 1219 | |
| 1220 // Put the label to the right of the right-most handle | |
| 1221 if (x1 < x2) | |
| 1222 { | |
| 1223 content.SetPosition(x2, y2); | |
| 1224 } | |
| 1225 else | |
| 1226 { | |
| 1227 content.SetPosition(x1, y1); | |
| 1228 } | |
| 1229 | |
| 1230 content.SetAnchor(BitmapAnchor_CenterLeft); | |
| 1231 content.SetBorder(10); | |
| 1232 | |
| 1233 double dx = x1 - x2; | |
| 1234 double dy = y1 - y2; | |
| 1235 double diameter = sqrt(dx * dx + dy * dy); // in millimeters | |
| 1236 | |
| 1237 double area = PI * diameter * diameter / 4.0; | |
| 1238 | |
| 1239 char buf[32]; | |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1240 |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1241 switch (GetUnits()) |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1242 { |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1243 case Units_Millimeters: |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1244 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
|
1245 diameter / 10.0, |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1246 area / 100.0, |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1247 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
|
1248 break; |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1249 |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1250 case Units_Pixels: |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1251 // 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
|
1252 sprintf(buf, "%0.1f px", diameter); |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1253 break; |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1254 |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1255 default: |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1256 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1257 } |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1258 |
| 1804 | 1259 content.SetText(buf); |
| 1260 | |
| 1261 label_.SetContent(content); | |
| 1262 } | |
| 1263 | |
| 1264 public: | |
| 1265 CircleAnnotation(AnnotationsSceneLayer& that, | |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1266 Units units, |
| 1804 | 1267 const ScenePoint2D& p1, |
| 1268 const ScenePoint2D& p2) : | |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1269 Annotation(that, units), |
| 1804 | 1270 handle1_(AddTypedPrimitive<Handle>(new Handle(*this, p1))), |
| 1271 handle2_(AddTypedPrimitive<Handle>(new Handle(*this, p2))), | |
| 1272 segment_(AddTypedPrimitive<Segment>(new Segment(*this, p1, p2))), | |
| 1273 circle_(AddTypedPrimitive<Circle>(new Circle(*this, p1, p2))), | |
| 1274 label_(AddTypedPrimitive<Text>(new Text(that, *this))) | |
| 1275 { | |
|
1819
fe402c678d18
improved color theme for annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1817
diff
changeset
|
1276 label_.SetColor(COLOR_TEXT); |
| 1804 | 1277 UpdateLabel(); |
| 1278 } | |
| 1279 | |
| 1280 Handle& GetHandle2() const | |
| 1281 { | |
| 1282 return handle2_; | |
| 1283 } | |
| 1284 | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1285 virtual void SignalMove(GeometricPrimitive& primitive, |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1286 const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 1287 { |
| 1288 if (&primitive == &handle1_ || | |
| 1289 &primitive == &handle2_) | |
| 1290 { | |
| 1291 segment_.SetPosition(handle1_.GetCenter(), handle2_.GetCenter()); | |
| 1292 circle_.SetPosition(handle1_.GetCenter(), handle2_.GetCenter()); | |
| 1293 } | |
| 1294 else if (&primitive == &segment_) | |
| 1295 { | |
| 1296 handle1_.SetCenter(segment_.GetPosition1()); | |
| 1297 handle2_.SetCenter(segment_.GetPosition2()); | |
| 1298 circle_.SetPosition(segment_.GetPosition1(), segment_.GetPosition2()); | |
| 1299 } | |
|
1823
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
1300 else if (&primitive == &circle_) |
|
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
1301 { |
|
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
1302 handle1_.SetCenter(circle_.GetPosition1()); |
|
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
1303 handle2_.SetCenter(circle_.GetPosition2()); |
|
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
1304 segment_.SetPosition(circle_.GetPosition1(), circle_.GetPosition2()); |
|
781e9fc8925e
dragging circle annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1821
diff
changeset
|
1305 } |
| 1804 | 1306 |
| 1307 UpdateLabel(); | |
| 1308 } | |
| 1309 | |
|
1976
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
1310 virtual void UpdateProbe(const Scene2D& scene) ORTHANC_OVERRIDE |
|
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
1311 { |
|
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
1312 } |
|
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
1313 |
| 1804 | 1314 virtual void Serialize(Json::Value& target) ORTHANC_OVERRIDE |
| 1315 { | |
| 1316 target = Json::objectValue; | |
| 1317 target[KEY_TYPE] = VALUE_CIRCLE; | |
| 1318 target[KEY_X1] = handle1_.GetCenter().GetX(); | |
| 1319 target[KEY_Y1] = handle1_.GetCenter().GetY(); | |
| 1320 target[KEY_X2] = handle2_.GetCenter().GetX(); | |
| 1321 target[KEY_Y2] = handle2_.GetCenter().GetY(); | |
| 1322 } | |
| 1323 | |
| 1324 static void Unserialize(AnnotationsSceneLayer& target, | |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1325 Units units, |
| 1804 | 1326 const Json::Value& source) |
| 1327 { | |
| 1328 if (source.isMember(KEY_X1) && | |
| 1329 source.isMember(KEY_Y1) && | |
| 1330 source.isMember(KEY_X2) && | |
| 1331 source.isMember(KEY_Y2) && | |
| 1332 source[KEY_X1].isNumeric() && | |
| 1333 source[KEY_Y1].isNumeric() && | |
| 1334 source[KEY_X2].isNumeric() && | |
| 1335 source[KEY_Y2].isNumeric()) | |
| 1336 { | |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1337 new CircleAnnotation(target, units, |
| 1804 | 1338 ScenePoint2D(source[KEY_X1].asDouble(), source[KEY_Y1].asDouble()), |
| 1339 ScenePoint2D(source[KEY_X2].asDouble(), source[KEY_Y2].asDouble())); | |
| 1340 } | |
| 1341 else | |
| 1342 { | |
| 1343 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat, "Cannot unserialize an circle annotation"); | |
| 1344 } | |
| 1345 } | |
| 1346 }; | |
| 1347 | |
| 1348 | |
| 1349 class AnnotationsSceneLayer::CreateSegmentOrCircleTracker : public IFlexiblePointerTracker | |
| 1350 { | |
| 1351 private: | |
| 1352 AnnotationsSceneLayer& that_; | |
| 1353 Annotation* annotation_; | |
| 1354 AffineTransform2D canvasToScene_; | |
| 1355 Handle* handle2_; | |
| 1356 | |
| 1357 public: | |
| 1358 CreateSegmentOrCircleTracker(AnnotationsSceneLayer& that, | |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1359 Units units, |
| 1804 | 1360 bool isCircle, |
| 1361 const ScenePoint2D& sceneClick, | |
| 1362 const AffineTransform2D& canvasToScene) : | |
| 1363 that_(that), | |
| 1364 annotation_(NULL), | |
| 1365 canvasToScene_(canvasToScene), | |
| 1366 handle2_(NULL) | |
| 1367 { | |
| 1368 if (isCircle) | |
| 1369 { | |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1370 annotation_ = new CircleAnnotation(that, units, sceneClick, sceneClick); |
| 1804 | 1371 handle2_ = &dynamic_cast<CircleAnnotation*>(annotation_)->GetHandle2(); |
| 1372 } | |
| 1373 else | |
| 1374 { | |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1375 annotation_ = new SegmentAnnotation(that, units, true /* show label */, sceneClick, sceneClick); |
| 1804 | 1376 handle2_ = &dynamic_cast<SegmentAnnotation*>(annotation_)->GetHandle2(); |
| 1377 } | |
| 1378 | |
| 1379 assert(annotation_ != NULL && | |
| 1380 handle2_ != NULL); | |
| 1381 } | |
| 1382 | |
|
1972
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
1383 virtual void PointerMove(const PointerEvent& event, |
|
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
1384 const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 1385 { |
| 1386 if (annotation_ != NULL) | |
| 1387 { | |
| 1388 assert(handle2_ != NULL); | |
| 1389 handle2_->SetCenter(event.GetMainPosition().Apply(canvasToScene_)); | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1390 annotation_->SignalMove(*handle2_, scene); |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1806
diff
changeset
|
1391 |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1806
diff
changeset
|
1392 that_.BroadcastMessage(AnnotationChangedMessage(that_)); |
| 1804 | 1393 } |
| 1394 } | |
| 1395 | |
|
1972
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
1396 virtual void PointerUp(const PointerEvent& event, |
|
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
1397 const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 1398 { |
| 1399 annotation_ = NULL; // IsAlive() becomes false | |
| 1400 | |
| 1401 that_.BroadcastMessage(AnnotationAddedMessage(that_)); | |
| 1402 } | |
| 1403 | |
|
1972
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
1404 virtual void PointerDown(const PointerEvent& event, |
|
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
1405 const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 1406 { |
| 1407 } | |
| 1408 | |
| 1409 virtual bool IsAlive() const ORTHANC_OVERRIDE | |
| 1410 { | |
| 1411 return (annotation_ != NULL); | |
| 1412 } | |
| 1413 | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1414 virtual void Cancel(const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 1415 { |
| 1416 if (annotation_ != NULL) | |
| 1417 { | |
| 1418 that_.DeleteAnnotation(annotation_); | |
| 1419 annotation_ = NULL; | |
| 1420 } | |
| 1421 } | |
| 1422 }; | |
| 1423 | |
| 1424 | |
| 1425 class AnnotationsSceneLayer::CreateAngleTracker : public IFlexiblePointerTracker | |
| 1426 { | |
| 1427 private: | |
| 1428 AnnotationsSceneLayer& that_; | |
| 1429 SegmentAnnotation* segment_; | |
| 1430 AngleAnnotation* angle_; | |
| 1431 AffineTransform2D canvasToScene_; | |
| 1432 | |
| 1433 public: | |
| 1434 CreateAngleTracker(AnnotationsSceneLayer& that, | |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1435 Units units, |
| 1804 | 1436 const ScenePoint2D& sceneClick, |
| 1437 const AffineTransform2D& canvasToScene) : | |
| 1438 that_(that), | |
| 1439 segment_(NULL), | |
| 1440 angle_(NULL), | |
| 1441 canvasToScene_(canvasToScene) | |
| 1442 { | |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1443 segment_ = new SegmentAnnotation(that, units, false /* no length label */, sceneClick, sceneClick); |
| 1804 | 1444 } |
| 1445 | |
|
1972
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
1446 virtual void PointerMove(const PointerEvent& event, |
|
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
1447 const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 1448 { |
| 1449 if (segment_ != NULL) | |
| 1450 { | |
| 1451 segment_->GetHandle2().SetCenter(event.GetMainPosition().Apply(canvasToScene_)); | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1452 segment_->SignalMove(segment_->GetHandle2(), scene); |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1806
diff
changeset
|
1453 that_.BroadcastMessage(AnnotationChangedMessage(that_)); |
| 1804 | 1454 } |
| 1455 | |
| 1456 if (angle_ != NULL) | |
| 1457 { | |
| 1458 angle_->GetEndHandle().SetCenter(event.GetMainPosition().Apply(canvasToScene_)); | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1459 angle_->SignalMove(angle_->GetEndHandle(), scene); |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1806
diff
changeset
|
1460 that_.BroadcastMessage(AnnotationChangedMessage(that_)); |
| 1804 | 1461 } |
| 1462 } | |
| 1463 | |
|
1972
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
1464 virtual void PointerUp(const PointerEvent& event, |
|
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
1465 const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 1466 { |
| 1467 if (segment_ != NULL) | |
| 1468 { | |
| 1469 // End of first step: The first segment is available, now create the angle | |
| 1470 | |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1471 angle_ = new AngleAnnotation(that_, segment_->GetUnits(), segment_->GetHandle1().GetCenter(), |
| 1804 | 1472 segment_->GetHandle2().GetCenter(), |
| 1473 segment_->GetHandle2().GetCenter()); | |
| 1474 | |
| 1475 that_.DeleteAnnotation(segment_); | |
| 1476 segment_ = NULL; | |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1806
diff
changeset
|
1477 |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1806
diff
changeset
|
1478 that_.BroadcastMessage(AnnotationChangedMessage(that_)); |
| 1804 | 1479 } |
| 1480 else | |
| 1481 { | |
| 1482 angle_ = NULL; // IsAlive() becomes false | |
| 1483 | |
| 1484 that_.BroadcastMessage(AnnotationAddedMessage(that_)); | |
| 1485 } | |
| 1486 } | |
| 1487 | |
|
1972
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
1488 virtual void PointerDown(const PointerEvent& event, |
|
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
1489 const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 1490 { |
| 1491 } | |
| 1492 | |
| 1493 virtual bool IsAlive() const ORTHANC_OVERRIDE | |
| 1494 { | |
| 1495 return (segment_ != NULL || | |
| 1496 angle_ != NULL); | |
| 1497 } | |
| 1498 | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1499 virtual void Cancel(const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 1500 { |
| 1501 if (segment_ != NULL) | |
| 1502 { | |
| 1503 that_.DeleteAnnotation(segment_); | |
| 1504 segment_ = NULL; | |
| 1505 } | |
| 1506 | |
| 1507 if (angle_ != NULL) | |
| 1508 { | |
| 1509 that_.DeleteAnnotation(angle_); | |
| 1510 angle_ = NULL; | |
| 1511 } | |
| 1512 } | |
| 1513 }; | |
| 1514 | |
| 1515 | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1516 class AnnotationsSceneLayer::CreatePixelProbeTracker : public IFlexiblePointerTracker |
|
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 private: |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1519 AnnotationsSceneLayer& that_; |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1520 |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1521 public: |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1522 CreatePixelProbeTracker(AnnotationsSceneLayer& that, |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1523 Units units, |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1524 const ScenePoint2D& sceneClick, |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1525 const Scene2D& scene, |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1526 int probedLayer) : |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1527 that_(that) |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1528 { |
|
1976
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
1529 PixelProbeAnnotation* annotation = new PixelProbeAnnotation(that, units, sceneClick, probedLayer); |
|
d71acf30970a
fixed serialization of pixel probes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1975
diff
changeset
|
1530 annotation->UpdateProbe(scene); |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1531 } |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1532 |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1533 virtual void PointerMove(const PointerEvent& event, |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1534 const Scene2D& scene) ORTHANC_OVERRIDE |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1535 { |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1536 } |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1537 |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1538 virtual void PointerUp(const PointerEvent& event, |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1539 const Scene2D& scene) ORTHANC_OVERRIDE |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1540 { |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1541 that_.BroadcastMessage(AnnotationAddedMessage(that_)); |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1542 } |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1543 |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1544 virtual void PointerDown(const PointerEvent& event, |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1545 const Scene2D& scene) ORTHANC_OVERRIDE |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1546 { |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1547 } |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1548 |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1549 virtual bool IsAlive() const ORTHANC_OVERRIDE |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1550 { |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1551 return false; |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1552 } |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1553 |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1554 virtual void Cancel(const Scene2D& scene) ORTHANC_OVERRIDE |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1555 { |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1556 } |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1557 }; |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1558 |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1559 |
| 1804 | 1560 // Dummy tracker that is only used for deletion, in order to warn |
| 1561 // 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
|
1562 class AnnotationsSceneLayer::RemoveTracker : public IFlexiblePointerTracker |
| 1804 | 1563 { |
| 1564 public: | |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1806
diff
changeset
|
1565 RemoveTracker() |
| 1804 | 1566 { |
| 1567 } | |
| 1568 | |
|
1972
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
1569 virtual void PointerMove(const PointerEvent& event, |
|
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
1570 const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 1571 { |
| 1572 } | |
| 1573 | |
|
1972
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
1574 virtual void PointerUp(const PointerEvent& event, |
|
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
1575 const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 1576 { |
| 1577 } | |
| 1578 | |
|
1972
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
1579 virtual void PointerDown(const PointerEvent& event, |
|
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
1580 const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 1581 { |
| 1582 } | |
| 1583 | |
| 1584 virtual bool IsAlive() const ORTHANC_OVERRIDE | |
| 1585 { | |
| 1586 return false; | |
| 1587 } | |
| 1588 | |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1589 virtual void Cancel(const Scene2D& scene) ORTHANC_OVERRIDE |
| 1804 | 1590 { |
| 1591 } | |
| 1592 }; | |
| 1593 | |
| 1594 | |
| 1595 void AnnotationsSceneLayer::AddAnnotation(Annotation* annotation) | |
| 1596 { | |
| 1597 assert(annotation != NULL); | |
| 1598 assert(annotations_.find(annotation) == annotations_.end()); | |
| 1599 annotations_.insert(annotation); | |
| 1600 } | |
| 1601 | |
| 1602 | |
| 1603 void AnnotationsSceneLayer::DeleteAnnotation(Annotation* annotation) | |
| 1604 { | |
| 1605 if (annotation != NULL) | |
| 1606 { | |
| 1607 assert(annotations_.find(annotation) != annotations_.end()); | |
| 1608 annotations_.erase(annotation); | |
| 1609 delete annotation; | |
| 1610 } | |
| 1611 } | |
| 1612 | |
| 1613 | |
| 1614 void AnnotationsSceneLayer::DeletePrimitive(GeometricPrimitive* primitive) | |
| 1615 { | |
| 1616 if (primitive != NULL) | |
| 1617 { | |
| 1618 assert(primitives_.find(primitive) != primitives_.end()); | |
| 1619 primitives_.erase(primitive); | |
| 1620 delete primitive; | |
| 1621 } | |
| 1622 } | |
| 1623 | |
| 1624 | |
| 1625 void AnnotationsSceneLayer::TagSubLayerToRemove(size_t subLayerIndex) | |
| 1626 { | |
| 1627 assert(subLayersToRemove_.find(subLayerIndex) == subLayersToRemove_.end()); | |
| 1628 subLayersToRemove_.insert(subLayerIndex); | |
| 1629 } | |
| 1630 | |
| 1631 | |
| 1632 AnnotationsSceneLayer::AnnotationsSceneLayer(size_t macroLayerIndex) : | |
| 1633 activeTool_(Tool_Edit), | |
| 1634 macroLayerIndex_(macroLayerIndex), | |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1635 polylineSubLayer_(0), // dummy initialization |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1636 units_(Units_Pixels), |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1637 probedLayer_(0) |
| 1804 | 1638 { |
| 1639 } | |
| 1640 | |
| 1641 | |
| 1642 void AnnotationsSceneLayer::Clear() | |
| 1643 { | |
| 1644 for (Annotations::iterator it = annotations_.begin(); it != annotations_.end(); ++it) | |
| 1645 { | |
| 1646 assert(*it != NULL); | |
| 1647 delete *it; | |
| 1648 } | |
| 1649 | |
| 1650 annotations_.clear(); | |
|
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1809
diff
changeset
|
1651 |
|
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1809
diff
changeset
|
1652 ClearHover(); |
| 1804 | 1653 } |
| 1654 | |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1655 |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1656 void AnnotationsSceneLayer::SetUnits(Units units) |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1657 { |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1658 if (units_ != units) |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1659 { |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1660 Clear(); |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1661 units_ = units; |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1662 } |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1663 } |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1664 |
| 1804 | 1665 |
|
1806
0840a25c6d41
removed hard-coded test in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1804
diff
changeset
|
1666 void AnnotationsSceneLayer::AddSegmentAnnotation(const ScenePoint2D& p1, |
|
0840a25c6d41
removed hard-coded test in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1804
diff
changeset
|
1667 const ScenePoint2D& p2) |
|
0840a25c6d41
removed hard-coded test in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1804
diff
changeset
|
1668 { |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1669 annotations_.insert(new SegmentAnnotation(*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
|
1670 } |
|
0840a25c6d41
removed hard-coded test in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1804
diff
changeset
|
1671 |
|
0840a25c6d41
removed hard-coded test in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1804
diff
changeset
|
1672 |
|
0840a25c6d41
removed hard-coded test in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1804
diff
changeset
|
1673 void AnnotationsSceneLayer::AddCircleAnnotation(const ScenePoint2D& p1, |
|
0840a25c6d41
removed hard-coded test in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1804
diff
changeset
|
1674 const ScenePoint2D& p2) |
|
0840a25c6d41
removed hard-coded test in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1804
diff
changeset
|
1675 { |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1676 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
|
1677 } |
|
0840a25c6d41
removed hard-coded test in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1804
diff
changeset
|
1678 |
|
0840a25c6d41
removed hard-coded test in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1804
diff
changeset
|
1679 |
|
0840a25c6d41
removed hard-coded test in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1804
diff
changeset
|
1680 void AnnotationsSceneLayer::AddAngleAnnotation(const ScenePoint2D& p1, |
|
0840a25c6d41
removed hard-coded test in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1804
diff
changeset
|
1681 const ScenePoint2D& p2, |
|
0840a25c6d41
removed hard-coded test in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1804
diff
changeset
|
1682 const ScenePoint2D& p3) |
|
0840a25c6d41
removed hard-coded test in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1804
diff
changeset
|
1683 { |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1684 annotations_.insert(new AngleAnnotation(*this, units_, p1, p2, p3)); |
|
1806
0840a25c6d41
removed hard-coded test in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1804
diff
changeset
|
1685 } |
|
0840a25c6d41
removed hard-coded test in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1804
diff
changeset
|
1686 |
|
0840a25c6d41
removed hard-coded test in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1804
diff
changeset
|
1687 |
| 1804 | 1688 void AnnotationsSceneLayer::Render(Scene2D& scene) |
| 1689 { | |
| 1977 | 1690 // First, update the probes |
| 1691 for (Annotations::const_iterator it = annotations_.begin(); it != annotations_.end(); ++it) | |
| 1692 { | |
| 1693 assert(*it != NULL); | |
| 1694 (*it)->UpdateProbe(scene); | |
| 1695 } | |
| 1696 | |
| 1804 | 1697 MacroSceneLayer* macro = NULL; |
| 1698 | |
| 1699 if (scene.HasLayer(macroLayerIndex_)) | |
| 1700 { | |
| 1701 macro = &dynamic_cast<MacroSceneLayer&>(scene.GetLayer(macroLayerIndex_)); | |
| 1702 } | |
| 1703 else | |
| 1704 { | |
| 1705 macro = &dynamic_cast<MacroSceneLayer&>(scene.SetLayer(macroLayerIndex_, new MacroSceneLayer)); | |
| 1706 polylineSubLayer_ = macro->AddLayer(new PolylineSceneLayer); | |
| 1707 } | |
| 1708 | |
| 1709 for (SubLayers::const_iterator it = subLayersToRemove_.begin(); it != subLayersToRemove_.end(); ++it) | |
| 1710 { | |
| 1711 assert(macro->HasLayer(*it)); | |
| 1712 macro->DeleteLayer(*it); | |
| 1713 } | |
| 1714 | |
| 1715 subLayersToRemove_.clear(); | |
| 1716 | |
| 1717 std::unique_ptr<PolylineSceneLayer> polyline(new PolylineSceneLayer); | |
| 1718 | |
| 1719 for (GeometricPrimitives::iterator it = primitives_.begin(); it != primitives_.end(); ++it) | |
| 1720 { | |
| 1721 assert(*it != NULL); | |
| 1722 GeometricPrimitive& primitive = **it; | |
| 1723 | |
| 1724 primitive.RenderPolylineLayer(*polyline, scene); | |
| 1725 | |
| 1726 if (primitive.IsModified()) | |
| 1727 { | |
| 1728 primitive.RenderOtherLayers(*macro, scene); | |
| 1729 primitive.SetModified(false); | |
| 1730 } | |
| 1731 } | |
| 1732 | |
| 1733 macro->UpdateLayer(polylineSubLayer_, polyline.release()); | |
| 1734 } | |
| 1735 | |
| 1736 | |
| 1737 bool AnnotationsSceneLayer::ClearHover() | |
| 1738 { | |
| 1739 bool needsRefresh = false; | |
| 1740 | |
| 1741 for (GeometricPrimitives::iterator it = primitives_.begin(); it != primitives_.end(); ++it) | |
| 1742 { | |
| 1743 assert(*it != NULL); | |
| 1744 if ((*it)->IsHover()) | |
| 1745 { | |
| 1746 (*it)->SetHover(false); | |
| 1747 needsRefresh = true; | |
| 1748 } | |
| 1749 } | |
| 1750 | |
| 1751 return needsRefresh; | |
| 1752 } | |
| 1753 | |
| 1754 | |
| 1755 bool AnnotationsSceneLayer::SetMouseHover(const ScenePoint2D& p, | |
| 1756 const Scene2D& scene) | |
| 1757 { | |
| 1758 if (activeTool_ == Tool_None) | |
| 1759 { | |
| 1760 return ClearHover(); | |
| 1761 } | |
| 1762 else | |
| 1763 { | |
| 1764 bool needsRefresh = false; | |
| 1765 | |
| 1766 const ScenePoint2D s = p.Apply(scene.GetCanvasToSceneTransform()); | |
| 1767 | |
| 1768 for (GeometricPrimitives::iterator it = primitives_.begin(); it != primitives_.end(); ++it) | |
| 1769 { | |
| 1770 assert(*it != NULL); | |
| 1771 bool hover = (*it)->IsHit(s, scene); | |
| 1772 | |
| 1773 if ((*it)->IsHover() != hover) | |
| 1774 { | |
| 1775 needsRefresh = true; | |
| 1776 } | |
| 1777 | |
| 1778 (*it)->SetHover(hover); | |
| 1779 } | |
| 1780 | |
| 1781 return needsRefresh; | |
| 1782 } | |
| 1783 } | |
| 1784 | |
| 1785 | |
| 1786 IFlexiblePointerTracker* AnnotationsSceneLayer::CreateTracker(const ScenePoint2D& p, | |
| 1787 const Scene2D& scene) | |
| 1788 { | |
|
1972
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
1789 /** |
|
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
1790 * 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
|
1791 **/ |
|
9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1871
diff
changeset
|
1792 |
| 1804 | 1793 if (activeTool_ == Tool_None) |
| 1794 { | |
| 1795 return NULL; | |
| 1796 } | |
| 1797 else | |
| 1798 { | |
| 1799 const ScenePoint2D s = p.Apply(scene.GetCanvasToSceneTransform()); | |
| 1800 | |
| 1801 GeometricPrimitive* bestHit = NULL; | |
| 1802 | |
| 1803 for (GeometricPrimitives::iterator it = primitives_.begin(); it != primitives_.end(); ++it) | |
| 1804 { | |
| 1805 assert(*it != NULL); | |
| 1806 if ((*it)->IsHit(s, scene)) | |
| 1807 { | |
| 1808 if (bestHit == NULL || | |
| 1809 bestHit->GetDepth() > (*it)->GetDepth()) | |
| 1810 { | |
| 1811 bestHit = *it; | |
| 1812 } | |
| 1813 } | |
| 1814 } | |
| 1815 | |
| 1816 if (bestHit != NULL) | |
| 1817 { | |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1806
diff
changeset
|
1818 if (activeTool_ == Tool_Remove) |
| 1804 | 1819 { |
| 1820 DeleteAnnotation(&bestHit->GetParentAnnotation()); | |
| 1821 BroadcastMessage(AnnotationRemovedMessage(*this)); | |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1806
diff
changeset
|
1822 return new RemoveTracker; |
| 1804 | 1823 } |
| 1824 else | |
| 1825 { | |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1806
diff
changeset
|
1826 return new EditPrimitiveTracker(*this, *bestHit, s, scene.GetCanvasToSceneTransform()); |
| 1804 | 1827 } |
| 1828 } | |
| 1829 else | |
| 1830 { | |
| 1831 switch (activeTool_) | |
| 1832 { | |
| 1833 case Tool_Segment: | |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1834 return new CreateSegmentOrCircleTracker(*this, units_, false /* segment */, s, scene.GetCanvasToSceneTransform()); |
| 1804 | 1835 |
| 1836 case Tool_Circle: | |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1837 return new CreateSegmentOrCircleTracker(*this, units_, true /* circle */, s, scene.GetCanvasToSceneTransform()); |
| 1804 | 1838 |
| 1839 case Tool_Angle: | |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1840 return new CreateAngleTracker(*this, units_, s, scene.GetCanvasToSceneTransform()); |
| 1804 | 1841 |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1842 case Tool_PixelProbe: |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1843 return new CreatePixelProbeTracker(*this, units_, s, scene, probedLayer_); |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1844 |
| 1804 | 1845 default: |
| 1846 return NULL; | |
| 1847 } | |
| 1848 } | |
| 1849 } | |
| 1850 } | |
| 1851 | |
| 1852 | |
| 1853 void AnnotationsSceneLayer::Serialize(Json::Value& target) const | |
| 1854 { | |
| 1855 Json::Value annotations = Json::arrayValue; | |
| 1856 | |
| 1857 for (Annotations::const_iterator it = annotations_.begin(); it != annotations_.end(); ++it) | |
| 1858 { | |
| 1859 assert(*it != NULL); | |
| 1860 | |
| 1861 Json::Value item; | |
| 1862 (*it)->Serialize(item); | |
| 1863 annotations.append(item); | |
| 1864 } | |
| 1865 | |
| 1866 target = Json::objectValue; | |
| 1867 target[KEY_ANNOTATIONS] = annotations; | |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1868 |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1869 switch (units_) |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1870 { |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1871 case Units_Millimeters: |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1872 target[KEY_UNITS] = VALUE_MILLIMETERS; |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1873 break; |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1874 |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1875 case Units_Pixels: |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1876 target[KEY_UNITS] = VALUE_PIXELS; |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1877 break; |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1878 |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1879 default: |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1880 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1881 } |
| 1804 | 1882 } |
| 1883 | |
| 1884 | |
| 1885 void AnnotationsSceneLayer::Unserialize(const Json::Value& serialized) | |
| 1886 { | |
| 1887 Clear(); | |
| 1888 | |
| 1889 if (serialized.type() != Json::objectValue || | |
| 1890 !serialized.isMember(KEY_ANNOTATIONS) || | |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1891 !serialized.isMember(KEY_UNITS) || |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1892 serialized[KEY_ANNOTATIONS].type() != Json::arrayValue || |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1893 serialized[KEY_UNITS].type() != Json::stringValue) |
| 1804 | 1894 { |
| 1895 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat, "Cannot unserialize a set of annotations"); | |
| 1896 } | |
| 1897 | |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1898 const std::string& u = serialized[KEY_UNITS].asString(); |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1899 |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1900 if (u == VALUE_MILLIMETERS) |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1901 { |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1902 units_ = Units_Millimeters; |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1903 } |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1904 else if (u == VALUE_PIXELS) |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1905 { |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1906 units_ = Units_Pixels; |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1907 } |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1908 else |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1909 { |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1910 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
|
1911 } |
|
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1912 |
| 1804 | 1913 const Json::Value& annotations = serialized[KEY_ANNOTATIONS]; |
| 1914 | |
| 1915 for (Json::Value::ArrayIndex i = 0; i < annotations.size(); i++) | |
| 1916 { | |
| 1917 if (annotations[i].type() != Json::objectValue || | |
| 1918 !annotations[i].isMember(KEY_TYPE) || | |
| 1919 annotations[i][KEY_TYPE].type() != Json::stringValue) | |
| 1920 { | |
| 1921 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat); | |
| 1922 } | |
| 1923 | |
| 1924 const std::string& type = annotations[i][KEY_TYPE].asString(); | |
| 1925 | |
| 1926 if (type == VALUE_ANGLE) | |
| 1927 { | |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1928 AngleAnnotation::Unserialize(*this, units_, annotations[i]); |
| 1804 | 1929 } |
| 1930 else if (type == VALUE_CIRCLE) | |
| 1931 { | |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1932 CircleAnnotation::Unserialize(*this, units_, annotations[i]); |
| 1804 | 1933 } |
| 1934 else if (type == VALUE_SEGMENT) | |
| 1935 { | |
|
1821
36430d73e36c
introducing measure units in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1819
diff
changeset
|
1936 SegmentAnnotation::Unserialize(*this, units_, annotations[i]); |
| 1804 | 1937 } |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1938 else if (type == VALUE_PIXEL_PROBE) |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1939 { |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1940 PixelProbeAnnotation::Unserialize(*this, units_, probedLayer_, annotations[i]); |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1972
diff
changeset
|
1941 } |
| 1804 | 1942 else |
| 1943 { | |
| 1944 LOG(ERROR) << "Cannot unserialize unknown type of annotation: " << type; | |
| 1945 } | |
| 1946 } | |
| 1947 } | |
| 1948 } |