Mercurial > hg > orthanc-stone

diff Framework/Scene2DViewport/MeasureTrackers.h @ 860:238693c3bc51 am-dev

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge default -> am-dev
author Alain Mazy <alain@mazy.be>
date Mon, 24 Jun 2019 14:35:00 +0200
parents e42b491f1fb2
children c71ef52602a0
line wrap: on
line diff
--- a/Framework/Scene2DViewport/MeasureTrackers.h	Wed Jun 19 17:36:33 2019 +0200
+++ b/Framework/Scene2DViewport/MeasureTrackers.h	Mon Jun 24 14:35:00 2019 +0200
@@ -21,10 +21,10 @@
 #pragma once
 
 #include "IFlexiblePointerTracker.h"
-#include "../../Framework/Scene2D/Scene2D.h"
-#include "../../Framework/Scene2D/PointerEvent.h"
+#include "../Scene2D/Scene2D.h"
+#include "../Scene2D/PointerEvent.h"
 
-#include "MeasureTools.h"
+#include "MeasureTool.h"
 #include "MeasureCommands.h"
 
 #include <vector>
@@ -37,15 +37,15 @@
     virtual void Cancel() ORTHANC_OVERRIDE;
     virtual bool IsAlive() const ORTHANC_OVERRIDE;
   protected:
-    CreateMeasureTracker(ViewportControllerWPtr controllerW);
+    CreateMeasureTracker(boost::weak_ptr<ViewportController> controllerW);
 
     ~CreateMeasureTracker();
   
   protected:
-    CreateMeasureCommandPtr         command_;
-    ViewportControllerWPtr          controllerW_;
+    boost::shared_ptr<CreateMeasureCommand>         command_;
+    boost::weak_ptr<ViewportController>          controllerW_;
     bool                            alive_;
-    Scene2DPtr                      GetScene();
+    boost::shared_ptr<Scene2D>                      GetScene();
 
   private:
     bool                            commitResult_;