Mercurial > hg > orthanc-stone
comparison OrthancStone/Sources/Scene2DViewport/AngleMeasureTool.h @ 1606:874e178f34e9
- ViewportController now has weak ptr to Viewport
- Measuring tools + related commands and all trackers now store only a weak_ptr to the Viewport and lock() on demand for usage
- LayerHolder and FixedPoint aligner store only a weak_ptr to the Viewport, too
- Fixed float/double warning in GrayscaleWindowingSceneTracker
author | Benjamin Golinvaux <bgo@osimis.io> |
---|---|
date | Wed, 28 Oct 2020 20:14:34 +0100 |
parents | 8563ea5d8ae4 |
children | 9ac2a65d4172 |
comparison
equal
deleted
inserted
replaced
1605:b3c439d96d3e | 1606:874e178f34e9 |
---|---|
39 namespace OrthancStone | 39 namespace OrthancStone |
40 { | 40 { |
41 class AngleMeasureTool : public MeasureTool | 41 class AngleMeasureTool : public MeasureTool |
42 { | 42 { |
43 public: | 43 public: |
44 static boost::shared_ptr<AngleMeasureTool> Create(boost::shared_ptr<IViewport> viewport); | 44 static boost::shared_ptr<AngleMeasureTool> Create(boost::weak_ptr<IViewport> viewport); |
45 | 45 |
46 ~AngleMeasureTool(); | 46 ~AngleMeasureTool(); |
47 | 47 |
48 void SetSide1End(ScenePoint2D start); | 48 void SetSide1End(ScenePoint2D start); |
49 void SetCenter(ScenePoint2D start); | 49 void SetCenter(ScenePoint2D start); |
69 | 69 |
70 | 70 |
71 AngleHighlightArea AngleHitTest(ScenePoint2D p) const; | 71 AngleHighlightArea AngleHitTest(ScenePoint2D p) const; |
72 | 72 |
73 private: | 73 private: |
74 explicit AngleMeasureTool(boost::shared_ptr<IViewport> viewport); | 74 explicit AngleMeasureTool(boost::weak_ptr<IViewport> viewport); |
75 | 75 |
76 virtual void RefreshScene() ORTHANC_OVERRIDE; | 76 virtual void RefreshScene() ORTHANC_OVERRIDE; |
77 void RemoveFromScene(); | 77 void RemoveFromScene(); |
78 void SetAngleHighlightArea(AngleHighlightArea area); | 78 void SetAngleHighlightArea(AngleHighlightArea area); |
79 | 79 |