Mercurial > hg > orthanc-stone
comparison Framework/Scene2DViewport/ViewportController.cpp @ 751:712ff6ff3c19
- undo redo now works fine for both measure tool creation commands
- added LayerHolder to streamline layer index management
- added overloads for ORTHANC_ASSERT with no string message (some heavy
preprocessor wizardry in there)
- fixing wasm BasicScene is *not* finished.
| author | Benjamin Golinvaux <bgo@osimis.io> |
|---|---|
| date | Wed, 22 May 2019 11:55:52 +0200 |
| parents | 28b9e3a54200 |
| children | 92c400a09f1b |
comparison
equal
deleted
inserted
replaced
| 750:284f37dc1c66 | 751:712ff6ff3c19 |
|---|---|
| 128 | 128 |
| 129 void ViewportController::RemoveMeasureTool(MeasureToolPtr measureTool) | 129 void ViewportController::RemoveMeasureTool(MeasureToolPtr measureTool) |
| 130 { | 130 { |
| 131 ORTHANC_ASSERT(std::find(measureTools_.begin(), measureTools_.end(), measureTool) | 131 ORTHANC_ASSERT(std::find(measureTools_.begin(), measureTools_.end(), measureTool) |
| 132 != measureTools_.end(), "Measure tool not found"); | 132 != measureTools_.end(), "Measure tool not found"); |
| 133 measureTools_.push_back(measureTool); | 133 measureTools_.erase( |
| 134 std::remove(measureTools_.begin(), measureTools_.end(), measureTool), | |
| 135 measureTools_.end()); | |
| 134 } | 136 } |
| 135 | |
| 136 } | 137 } |
| 137 | 138 |