comparison Framework/Scene2DViewport/LineMeasureTool.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
comparison
equal deleted inserted replaced
750:284f37dc1c66 751:712ff6ff3c19
36 namespace OrthancStone 36 namespace OrthancStone
37 { 37 {
38 class LineMeasureTool : public MeasureTool 38 class LineMeasureTool : public MeasureTool
39 { 39 {
40 public: 40 public:
41 LineMeasureTool(MessageBroker& broker, ViewportControllerWPtr controllerW) 41 LineMeasureTool(MessageBroker& broker, ViewportControllerWPtr controllerW);
42 : MeasureTool(broker, controllerW)
43 , layersCreated(false)
44 , polylineZIndex_(-1)
45 , textZIndex_(-1)
46 {
47
48 }
49 42
50 ~LineMeasureTool(); 43 ~LineMeasureTool();
51 44
52 void SetStart(ScenePoint2D start); 45 void SetStart(ScenePoint2D start);
53 void SetEnd(ScenePoint2D end); 46 void SetEnd(ScenePoint2D end);
54 void Set(ScenePoint2D start, ScenePoint2D end); 47 void Set(ScenePoint2D start, ScenePoint2D end);
55 48
56 private: 49 private:
57 PolylineSceneLayer* GetPolylineLayer();
58 TextSceneLayer* GetTextLayer();
59 virtual void RefreshScene() ORTHANC_OVERRIDE; 50 virtual void RefreshScene() ORTHANC_OVERRIDE;
60 void RemoveFromScene(); 51 void RemoveFromScene();
61 52
62 private: 53 private:
63 ScenePoint2D start_; 54 ScenePoint2D start_;
64 ScenePoint2D end_; 55 ScenePoint2D end_;
65 bool layersCreated; 56 LayerHolderPtr layerHolder_;
66 int polylineZIndex_; 57 int baseLayerIndex_;
67 int textZIndex_;
68 }; 58 };
69 59
70 } 60 }
71 61