Mercurial > hg > orthanc-stone
comparison OrthancStone/Sources/Scene2DViewport/MeasureCommands.cpp @ 1640:52b8b96cb55f
cleaning namespaces
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 10 Nov 2020 16:55:22 +0100 |
parents | 646e581e115b |
children | 9ac2a65d4172 |
comparison
equal
deleted
inserted
replaced
1639:5cdc5b98f14d | 1640:52b8b96cb55f |
---|---|
38 } | 38 } |
39 | 39 |
40 | 40 |
41 void CreateMeasureCommand::Undo() | 41 void CreateMeasureCommand::Undo() |
42 { | 42 { |
43 std::unique_ptr<OrthancStone::IViewport::ILock> lock(GetViewportLock()); | 43 std::unique_ptr<IViewport::ILock> lock(GetViewportLock()); |
44 // simply disable the measure tool upon undo | 44 // simply disable the measure tool upon undo |
45 GetMeasureTool()->Disable(); | 45 GetMeasureTool()->Disable(); |
46 lock->GetController().RemoveMeasureTool(GetMeasureTool()); | 46 lock->GetController().RemoveMeasureTool(GetMeasureTool()); |
47 } | 47 } |
48 | 48 |
49 void CreateMeasureCommand::Redo() | 49 void CreateMeasureCommand::Redo() |
50 { | 50 { |
51 std::unique_ptr<OrthancStone::IViewport::ILock> lock(GetViewportLock()); | 51 std::unique_ptr<IViewport::ILock> lock(GetViewportLock()); |
52 GetMeasureTool()->Enable(); | 52 GetMeasureTool()->Enable(); |
53 lock->GetController().AddMeasureTool(GetMeasureTool()); | 53 lock->GetController().AddMeasureTool(GetMeasureTool()); |
54 } | 54 } |
55 | 55 |
56 CreateMeasureCommand::CreateMeasureCommand(boost::weak_ptr<IViewport> viewport) | 56 CreateMeasureCommand::CreateMeasureCommand(boost::weak_ptr<IViewport> viewport) |
65 // we thus leave it as is | 65 // we thus leave it as is |
66 } | 66 } |
67 | 67 |
68 void DeleteMeasureCommand::Redo() | 68 void DeleteMeasureCommand::Redo() |
69 { | 69 { |
70 std::unique_ptr<OrthancStone::IViewport::ILock> lock(GetViewportLock()); | 70 std::unique_ptr<IViewport::ILock> lock(GetViewportLock()); |
71 // simply disable the measure tool upon undo | 71 // simply disable the measure tool upon undo |
72 GetMeasureTool()->Disable(); | 72 GetMeasureTool()->Disable(); |
73 lock->GetController().RemoveMeasureTool(GetMeasureTool()); | 73 lock->GetController().RemoveMeasureTool(GetMeasureTool()); |
74 } | 74 } |
75 | 75 |
76 void DeleteMeasureCommand::Undo() | 76 void DeleteMeasureCommand::Undo() |
77 { | 77 { |
78 std::unique_ptr<OrthancStone::IViewport::ILock> lock(GetViewportLock()); | 78 std::unique_ptr<IViewport::ILock> lock(GetViewportLock()); |
79 GetMeasureTool()->Enable(); | 79 GetMeasureTool()->Enable(); |
80 lock->GetController().AddMeasureTool(GetMeasureTool()); | 80 lock->GetController().AddMeasureTool(GetMeasureTool()); |
81 } | 81 } |
82 | 82 |
83 DeleteMeasureCommand::~DeleteMeasureCommand() | 83 DeleteMeasureCommand::~DeleteMeasureCommand() |
91 MeasureCommand(viewport), | 91 MeasureCommand(viewport), |
92 measureTool_(measureTool), | 92 measureTool_(measureTool), |
93 mementoModified_(measureTool->GetMemento()), | 93 mementoModified_(measureTool->GetMemento()), |
94 mementoOriginal_(measureTool->GetMemento()) | 94 mementoOriginal_(measureTool->GetMemento()) |
95 { | 95 { |
96 std::unique_ptr<OrthancStone::IViewport::ILock> lock(GetViewportLock()); | 96 std::unique_ptr<IViewport::ILock> lock(GetViewportLock()); |
97 GetMeasureTool()->Disable(); | 97 GetMeasureTool()->Disable(); |
98 lock->GetController().RemoveMeasureTool(GetMeasureTool()); | 98 lock->GetController().RemoveMeasureTool(GetMeasureTool()); |
99 } | 99 } |
100 | 100 |
101 EditMeasureCommand::EditMeasureCommand(boost::shared_ptr<MeasureTool> measureTool, | 101 EditMeasureCommand::EditMeasureCommand(boost::shared_ptr<MeasureTool> measureTool, |