Mercurial > hg > orthanc-stone

diff OrthancStone/Sources/Scene2DViewport/EditLineMeasureTracker.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/EditLineMeasureTracker.cpp	Mon May 17 13:57:25 2021 +0200
+++ b/OrthancStone/Sources/Scene2DViewport/EditLineMeasureTracker.cpp	Mon May 17 16:11:17 2021 +0200
@@ -56,36 +56,37 @@
 
     ScenePoint2D delta = scenePos - GetOriginalClickPosition();
 
-    boost::shared_ptr<LineMeasureToolMemento> memento =
-      boost::dynamic_pointer_cast<LineMeasureToolMemento>(command_->mementoOriginal_);
-
-    ORTHANC_ASSERT(memento.get() != NULL);
+    const LineMeasureToolMemento& memento =
+      dynamic_cast<const LineMeasureToolMemento&>(command_->GetMementoOriginal());
 
     switch (modifiedZone_)
     {
-    case LineMeasureTool::LineHighlightArea_Start:
-    {
-      ScenePoint2D newStart = memento->start_ + delta;
-      GetCommand()->SetStart(newStart);
-    }
-    break;
-    case LineMeasureTool::LineHighlightArea_End:
-    {
-      ScenePoint2D newEnd = memento->end_ + delta;
-      GetCommand()->SetEnd(newEnd);
-    }
-    break;
-    case LineMeasureTool::LineHighlightArea_Segment:
-    {
-      ScenePoint2D newStart = memento->start_ + delta;
-      ScenePoint2D newEnd = memento->end_ + delta;
-      GetCommand()->SetStart(newStart);
-      GetCommand()->SetEnd(newEnd);
-    }
-    break;
-    default:
-      LOG(WARNING) << "Warning: please retry the measuring tool editing operation!";
-      break;
+      case LineMeasureTool::LineHighlightArea_Start:
+      {
+        ScenePoint2D newStart = memento.start_ + delta;
+        GetCommand()->SetStart(newStart);
+        break;
+      }
+      
+      case LineMeasureTool::LineHighlightArea_End:
+      {
+        ScenePoint2D newEnd = memento.end_ + delta;
+        GetCommand()->SetEnd(newEnd);
+        break;
+      }
+      
+      case LineMeasureTool::LineHighlightArea_Segment:
+      {
+        ScenePoint2D newStart = memento.start_ + delta;
+        ScenePoint2D newEnd = memento.end_ + delta;
+        GetCommand()->SetStart(newStart);
+        GetCommand()->SetEnd(newEnd);
+        break;
+      }
+      
+      default:
+        LOG(WARNING) << "Warning: please retry the measuring tool editing operation!";
+        break;
     }
   }
 
@@ -106,5 +107,4 @@
     ORTHANC_ASSERT(ret.get() != NULL, "Internal error in EditLineMeasureTracker::GetCommand()");
     return ret;
   }
-
 }