Mercurial > hg > orthanc-stone
diff Framework/Scene2DViewport/AngleMeasureTool.h @ 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 | 059e1fd05fd6 |
children | 92c400a09f1b |
line wrap: on
line diff
--- a/Framework/Scene2DViewport/AngleMeasureTool.h Tue May 21 13:18:35 2019 +0200 +++ b/Framework/Scene2DViewport/AngleMeasureTool.h Wed May 22 11:55:52 2019 +0200 @@ -22,10 +22,12 @@ #include "MeasureTools.h" -#include <Framework/Scene2D/Scene2D.h> -#include <Framework/Scene2D/ScenePoint2D.h> -#include <Framework/Scene2D/PolylineSceneLayer.h> -#include <Framework/Scene2D/TextSceneLayer.h> +#include "../Scene2D/Scene2D.h" +#include "../Scene2D/ScenePoint2D.h" +#include "../Scene2D/PolylineSceneLayer.h" +#include "../Scene2D/TextSceneLayer.h" + +#include "../Scene2DViewport/LayerHolder.h" #include <boost/shared_ptr.hpp> #include <boost/weak_ptr.hpp> @@ -38,14 +40,7 @@ class AngleMeasureTool : public MeasureTool { public: - AngleMeasureTool(MessageBroker& broker, ViewportControllerWPtr controllerW) - : MeasureTool(broker, controllerW) - , layersCreated(false) - , polylineZIndex_(-1) - , textBaseZIndex_(-1) - { - - } + AngleMeasureTool(MessageBroker& broker, ViewportControllerWPtr controllerW); ~AngleMeasureTool(); @@ -54,23 +49,15 @@ void SetSide2End(ScenePoint2D start); private: - PolylineSceneLayer* GetPolylineLayer(); - - // 0 --> 3 are for the text background (outline) - // 4 is for the actual text - TextSceneLayer* GetTextLayer(int index); virtual void RefreshScene() ORTHANC_OVERRIDE; void RemoveFromScene(); private: - ScenePoint2D side1End_; - ScenePoint2D side2End_; - ScenePoint2D center_; - bool layersCreated; - int polylineZIndex_; - int textBaseZIndex_; + ScenePoint2D side1End_; + ScenePoint2D side2End_; + ScenePoint2D center_; + LayerHolderPtr layerHolder_; }; - }