Mercurial > hg > orthanc-stone

comparison 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
comparison
equal deleted inserted replaced
856:a6e17a5a39e7 860:238693c3bc51
19 **/ 19 **/
20 20
21 #include "MeasureTrackers.h" 21 #include "MeasureTrackers.h"
22 #include <Core/OrthancException.h> 22 #include <Core/OrthancException.h>
23 23
24 using namespace Orthanc;
25
26 namespace OrthancStone 24 namespace OrthancStone
27 { 25 {
28 26
29 CreateMeasureTracker::CreateMeasureTracker(ViewportControllerWPtr controllerW) 27 CreateMeasureTracker::CreateMeasureTracker(boost::weak_ptr<ViewportController> controllerW)
30 : controllerW_(controllerW) 28 : controllerW_(controllerW)
31 , alive_(true) 29 , alive_(true)
32 , commitResult_(true) 30 , commitResult_(true)
33 { 31 {
34 } 32 }
54 controllerW_.lock()->PushCommand(command_); 52 controllerW_.lock()->PushCommand(command_);
55 else 53 else
56 command_->Undo(); 54 command_->Undo();
57 } 55 }
58 56
59 OrthancStone::Scene2DPtr CreateMeasureTracker::GetScene() 57 boost::shared_ptr<Scene2D> CreateMeasureTracker::GetScene()
60 { 58 {
61 return controllerW_.lock()->GetScene(); 59 return controllerW_.lock()->GetScene();
62 } 60 }
63 61
64 } 62 }