Mercurial > hg > orthanc-stone
comparison Framework/Scene2DViewport/MeasureCommands.cpp @ 818:e42b491f1fb2
Removed typedefs to shared_ptr by making them explicit. Removed using namespace
directives to make usage more explicit, too.
author | Benjamin Golinvaux <bgo@osimis.io> |
---|---|
date | Wed, 29 May 2019 10:51:28 +0200 |
parents | 712ff6ff3c19 |
children | c71ef52602a0 |
comparison
equal
deleted
inserted
replaced
817:68f888812af4 | 818:e42b491f1fb2 |
---|---|
36 { | 36 { |
37 GetMeasureTool()->Enable(); | 37 GetMeasureTool()->Enable(); |
38 GetController()->AddMeasureTool(GetMeasureTool()); | 38 GetController()->AddMeasureTool(GetMeasureTool()); |
39 } | 39 } |
40 | 40 |
41 CreateMeasureCommand::CreateMeasureCommand(ViewportControllerWPtr controllerW) | 41 CreateMeasureCommand::CreateMeasureCommand(boost::weak_ptr<ViewportController> controllerW) |
42 : TrackerCommand(controllerW) | 42 : TrackerCommand(controllerW) |
43 { | 43 { |
44 | 44 |
45 } | 45 } |
46 | 46 |
50 // we thus leave it as is | 50 // we thus leave it as is |
51 } | 51 } |
52 | 52 |
53 CreateLineMeasureCommand::CreateLineMeasureCommand( | 53 CreateLineMeasureCommand::CreateLineMeasureCommand( |
54 MessageBroker& broker, | 54 MessageBroker& broker, |
55 ViewportControllerWPtr controllerW, | 55 boost::weak_ptr<ViewportController> controllerW, |
56 ScenePoint2D point) | 56 ScenePoint2D point) |
57 : CreateMeasureCommand(controllerW) | 57 : CreateMeasureCommand(controllerW) |
58 , measureTool_( | 58 , measureTool_( |
59 boost::make_shared<LineMeasureTool>(boost::ref(broker), controllerW)) | 59 boost::make_shared<LineMeasureTool>(boost::ref(broker), controllerW)) |
60 { | 60 { |
67 measureTool_->SetEnd(scenePos); | 67 measureTool_->SetEnd(scenePos); |
68 } | 68 } |
69 | 69 |
70 CreateAngleMeasureCommand::CreateAngleMeasureCommand( | 70 CreateAngleMeasureCommand::CreateAngleMeasureCommand( |
71 MessageBroker& broker, | 71 MessageBroker& broker, |
72 ViewportControllerWPtr controllerW, | 72 boost::weak_ptr<ViewportController> controllerW, |
73 ScenePoint2D point) | 73 ScenePoint2D point) |
74 : CreateMeasureCommand(controllerW) | 74 : CreateMeasureCommand(controllerW) |
75 , measureTool_( | 75 , measureTool_( |
76 boost::make_shared<AngleMeasureTool>(boost::ref(broker), controllerW)) | 76 boost::make_shared<AngleMeasureTool>(boost::ref(broker), controllerW)) |
77 { | 77 { |
91 void CreateAngleMeasureCommand::SetSide2End(ScenePoint2D scenePos) | 91 void CreateAngleMeasureCommand::SetSide2End(ScenePoint2D scenePos) |
92 { | 92 { |
93 measureTool_->SetSide2End(scenePos); | 93 measureTool_->SetSide2End(scenePos); |
94 } | 94 } |
95 | 95 |
96 ViewportControllerPtr TrackerCommand::GetController() | 96 boost::shared_ptr<ViewportController> TrackerCommand::GetController() |
97 { | 97 { |
98 ViewportControllerPtr controller = controllerW_.lock(); | 98 boost::shared_ptr<ViewportController> controller = controllerW_.lock(); |
99 assert(controller); // accessing dead object? | 99 assert(controller); // accessing dead object? |
100 return controller; | 100 return controller; |
101 } | 101 } |
102 } | 102 } |