Mercurial > hg > orthanc-stone

diff Framework/Scene2DViewport/MeasureTrackers.cpp @ 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.cpp	Wed Jun 19 17:36:33 2019 +0200
+++ b/Framework/Scene2DViewport/MeasureTrackers.cpp	Mon Jun 24 14:35:00 2019 +0200
@@ -21,12 +21,10 @@
 #include "MeasureTrackers.h"
 #include <Core/OrthancException.h>
 
-using namespace Orthanc;
-
 namespace OrthancStone
 {
 
-  CreateMeasureTracker::CreateMeasureTracker(ViewportControllerWPtr controllerW)
+  CreateMeasureTracker::CreateMeasureTracker(boost::weak_ptr<ViewportController> controllerW)
     : controllerW_(controllerW)
     , alive_(true)
     , commitResult_(true)
@@ -56,7 +54,7 @@
       command_->Undo();
   }
 
-  OrthancStone::Scene2DPtr CreateMeasureTracker::GetScene()
+  boost::shared_ptr<Scene2D> CreateMeasureTracker::GetScene()
   {
     return controllerW_.lock()->GetScene();
   }