Mercurial > hg > orthanc-stone
diff Framework/Scene2DViewport/MeasureToolsToolbox.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 | 8b6adfb62a2f |
| children | 92c400a09f1b |
line wrap: on
line diff
--- a/Framework/Scene2DViewport/MeasureToolsToolbox.h Tue May 21 13:18:35 2019 +0200 +++ b/Framework/Scene2DViewport/MeasureToolsToolbox.h Wed May 22 11:55:52 2019 +0200 @@ -18,8 +18,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. **/ -#include <Framework/Scene2D/PolylineSceneLayer.h> -#include <Framework/Scene2D/Scene2D.h> +#include "../Scene2D/PolylineSceneLayer.h" +#include "PointerTypes.h" namespace OrthancStone { @@ -30,10 +30,9 @@ square sides are parallel to the canvas boundaries. */ void AddSquare(PolylineSceneLayer::Chain& chain, - const Scene2D& scene, + Scene2DConstPtr scene, const ScenePoint2D& centerS, - const double& sideLength); - + const double& sideLengthS); /** Creates an arc centered on c that goes @@ -49,7 +48,6 @@ */ void AddShortestArc( PolylineSceneLayer::Chain& chain - , const Scene2D& scene , const ScenePoint2D& p1 , const ScenePoint2D& c , const ScenePoint2D& p2 @@ -64,7 +62,6 @@ */ void AddShortestArc( PolylineSceneLayer::Chain& chain - , const Scene2D& scene , const ScenePoint2D& centerS , const double& radiusS , const double startAngleRad @@ -182,6 +179,6 @@ from layerIndex, up to (and not including) layerIndex+5. */ void SetTextLayerOutlineProperties( - Scene2D& scene, int baseLayerIndex, const char* text, ScenePoint2D p); - + Scene2DPtr scene, LayerHolderPtr layerHolder, + const char* text, ScenePoint2D p); }