Mercurial > hg > orthanc-stone

diff Framework/Scene2DViewport/LineMeasureTool.h @ 1305:a5326ce4f24b broker

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Trackers and measuring tools now use the viewport instead of ViewportController, so that proper locks can be used
author Benjamin Golinvaux <bgo@osimis.io>
date Wed, 04 Mar 2020 09:45:38 +0100
parents 7ec8fea061b9
children 9b126de2cde2
line wrap: on
line diff
--- a/Framework/Scene2DViewport/LineMeasureTool.h	Wed Mar 04 09:44:34 2020 +0100
+++ b/Framework/Scene2DViewport/LineMeasureTool.h	Wed Mar 04 09:45:38 2020 +0100
@@ -38,7 +38,7 @@
   class LineMeasureTool : public MeasureTool
   {
   public:
-    LineMeasureTool(boost::weak_ptr<ViewportController> controllerW);
+    LineMeasureTool(IViewport& viewport);
 
     ~LineMeasureTool();
 
@@ -47,7 +47,7 @@
     void Set(ScenePoint2D start, ScenePoint2D end);
 
 
-    virtual bool HitTest(ScenePoint2D p) const ORTHANC_OVERRIDE;
+    virtual bool HitTest(ScenePoint2D p) ORTHANC_OVERRIDE;
     virtual void Highlight(ScenePoint2D p) ORTHANC_OVERRIDE;
     virtual void ResetHighlightState() ORTHANC_OVERRIDE;
     virtual boost::shared_ptr<IFlexiblePointerTracker> CreateEditionTracker(const PointerEvent& e) ORTHANC_OVERRIDE;
@@ -64,7 +64,7 @@
     };
 
 
-    LineHighlightArea LineHitTest(ScenePoint2D p) const;
+    LineHighlightArea LineHitTest(ScenePoint2D p);
 
   private:
     virtual void        RefreshScene() ORTHANC_OVERRIDE;