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