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