Mercurial > hg > orthanc-stone

diff Framework/Scene2DViewport/LineMeasureTool.h @ 751:712ff6ff3c19

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- 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 059e1fd05fd6
children 92c400a09f1b
line wrap: on
line diff
--- a/Framework/Scene2DViewport/LineMeasureTool.h	Tue May 21 13:18:35 2019 +0200
+++ b/Framework/Scene2DViewport/LineMeasureTool.h	Wed May 22 11:55:52 2019 +0200
@@ -38,14 +38,7 @@
   class LineMeasureTool : public MeasureTool
   {
   public:
-    LineMeasureTool(MessageBroker& broker, ViewportControllerWPtr controllerW)
-      : MeasureTool(broker, controllerW)
-      , layersCreated(false)
-      , polylineZIndex_(-1)
-      , textZIndex_(-1)
-    {
-
-    }
+    LineMeasureTool(MessageBroker& broker, ViewportControllerWPtr controllerW);
 
     ~LineMeasureTool();
 
@@ -54,17 +47,14 @@
     void Set(ScenePoint2D start, ScenePoint2D end);
 
   private:
-    PolylineSceneLayer* GetPolylineLayer();
-    TextSceneLayer*     GetTextLayer();
     virtual void        RefreshScene() ORTHANC_OVERRIDE;
     void                RemoveFromScene();
 
   private:
-    ScenePoint2D start_;
-    ScenePoint2D end_;
-    bool         layersCreated;
-    int          polylineZIndex_;
-    int          textZIndex_;
+    ScenePoint2D   start_;
+    ScenePoint2D   end_;
+    LayerHolderPtr layerHolder_;
+    int            baseLayerIndex_;
   };
 
 }