Mercurial > hg > orthanc-stone
diff Framework/Scene2DViewport/MeasureTrackers.cpp @ 727:853e30d17cae
merge
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Tue, 21 May 2019 11:45:06 +0200 |
| parents | 28b9e3a54200 |
| children | 8e31b174ab26 |
line wrap: on
line diff
--- a/Framework/Scene2DViewport/MeasureTrackers.cpp Tue May 21 11:43:25 2019 +0200 +++ b/Framework/Scene2DViewport/MeasureTrackers.cpp Tue May 21 11:45:06 2019 +0200 @@ -26,14 +26,9 @@ namespace OrthancStone { - CreateMeasureTracker::CreateMeasureTracker( - ViewportControllerWPtr controllerW, - std::vector<TrackerCommandPtr>& undoStack, - std::vector<MeasureToolPtr>& measureTools) + CreateMeasureTracker::CreateMeasureTracker(ViewportControllerWPtr controllerW) : controllerW_(controllerW) , alive_(true) - , undoStack_(undoStack) - , measureTools_(measureTools) , commitResult_(true) { } @@ -56,12 +51,11 @@ // otherwise, we simply undo it if (commitResult_) - undoStack_.push_back(command_); + controllerW_.lock()->PushCommand(command_); else command_->Undo(); } - OrthancStone::Scene2DPtr CreateMeasureTracker::GetScene() { return controllerW_.lock()->GetScene();