Mercurial > hg > orthanc-stone

diff OrthancStone/Sources/Scene2DViewport/EditAngleMeasureTracker.cpp @ 1791:9b650ab68d4c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
replaced unneeded use of boost::share_ptr for MeasureCommand mementos by std::unique_ptr
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 17 May 2021 16:11:17 +0200
parents 9ac2a65d4172
children 3889ae96d2e9
line wrap: on
line diff
--- a/OrthancStone/Sources/Scene2DViewport/EditAngleMeasureTracker.cpp	Mon May 17 13:57:25 2021 +0200
+++ b/OrthancStone/Sources/Scene2DViewport/EditAngleMeasureTracker.cpp	Mon May 17 16:11:17 2021 +0200
@@ -61,42 +61,44 @@
 
     ScenePoint2D delta = scenePos - GetOriginalClickPosition();
 
-    boost::shared_ptr<AngleMeasureToolMemento> memento =
-      boost::dynamic_pointer_cast<AngleMeasureToolMemento>(command_->mementoOriginal_);
-
-    ORTHANC_ASSERT(memento.get() != NULL);
+    const AngleMeasureToolMemento& memento =
+      dynamic_cast<const AngleMeasureToolMemento&>(command_->GetMementoOriginal());
 
     switch (modifiedZone_)
     {
       case AngleMeasureTool::AngleHighlightArea_Center:
       {
-        ScenePoint2D newCenter = memento->center_ + delta;
+        ScenePoint2D newCenter = memento.center_ + delta;
         GetCommand()->SetCenter(newCenter);
+        break;
       }
-      break;
+      
       case AngleMeasureTool::AngleHighlightArea_Side1:
       case AngleMeasureTool::AngleHighlightArea_Side2:
       {
-        ScenePoint2D newCenter = memento->center_ + delta;
-        ScenePoint2D newSide1End = memento->side1End_ + delta;
-        ScenePoint2D newSide2End = memento->side2End_ + delta;
+        ScenePoint2D newCenter = memento.center_ + delta;
+        ScenePoint2D newSide1End = memento.side1End_ + delta;
+        ScenePoint2D newSide2End = memento.side2End_ + delta;
         GetCommand()->SetCenter(newCenter);
         GetCommand()->SetSide1End(newSide1End);
         GetCommand()->SetSide2End(newSide2End);
+        break;
       }
-      break;
+      
       case AngleMeasureTool::AngleHighlightArea_Side1End:
       {
-        ScenePoint2D newSide1End = memento->side1End_ + delta;
+        ScenePoint2D newSide1End = memento.side1End_ + delta;
         GetCommand()->SetSide1End(newSide1End);
+        break;
       }
-      break;
+
       case AngleMeasureTool::AngleHighlightArea_Side2End:
       {
-        ScenePoint2D newSide2End = memento->side2End_ + delta;
+        ScenePoint2D newSide2End = memento.side2End_ + delta;
         GetCommand()->SetSide2End(newSide2End);
+        break;
       }
-      break;
+      
       default:
         LOG(WARNING) << "Warning: please retry the measuring tool editing operation!";
         break;