comparison Framework/Scene2DViewport/MeasureToolsToolbox.h @ 860:238693c3bc51 am-dev

merge default -> am-dev
author Alain Mazy <alain@mazy.be>
date Mon, 24 Jun 2019 14:35:00 +0200
parents e42b491f1fb2
children a29c13497557
comparison
equal deleted inserted replaced
856:a6e17a5a39e7 860:238693c3bc51
16 * 16 *
17 * You should have received a copy of the GNU Affero General Public License 17 * You should have received a copy of the GNU Affero General Public License
18 * along with this program. If not, see <http://www.gnu.org/licenses/>. 18 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 **/ 19 **/
20 20
21 #include <Framework/Scene2D/PolylineSceneLayer.h> 21 #include "PredeclaredTypes.h"
22 #include <Framework/Scene2D/Scene2D.h> 22 #include "../Scene2D/PolylineSceneLayer.h"
23 #include "../Scene2D/Scene2D.h"
23 24
24 namespace OrthancStone 25 namespace OrthancStone
25 { 26 {
26 27
27 /** 28 /**
28 This function will create a square around the center point supplied in 29 This function will create a square around the center point supplied in
29 scene coordinates, with a side length given in canvas coordinates. The 30 scene coordinates, with a side length given in canvas coordinates. The
30 square sides are parallel to the canvas boundaries. 31 square sides are parallel to the canvas boundaries.
31 */ 32 */
32 void AddSquare(PolylineSceneLayer::Chain& chain, 33 void AddSquare(PolylineSceneLayer::Chain& chain,
33 const Scene2D& scene, 34 boost::shared_ptr<const Scene2D> scene,
34 const ScenePoint2D& centerS, 35 const ScenePoint2D& centerS,
35 const double& sideLength); 36 const double& sideLengthS);
36
37 37
38 /** 38 /**
39 Creates an arc centered on c that goes 39 Creates an arc centered on c that goes
40 - from a point r1: 40 - from a point r1:
41 - so that r1 belongs to the p1,c line 41 - so that r1 belongs to the p1,c line
47 47
48 Warning: the existing chain content will be wiped out. 48 Warning: the existing chain content will be wiped out.
49 */ 49 */
50 void AddShortestArc( 50 void AddShortestArc(
51 PolylineSceneLayer::Chain& chain 51 PolylineSceneLayer::Chain& chain
52 , const Scene2D& scene
53 , const ScenePoint2D& p1 52 , const ScenePoint2D& p1
54 , const ScenePoint2D& c 53 , const ScenePoint2D& c
55 , const ScenePoint2D& p2 54 , const ScenePoint2D& p2
56 , const double& radiusS 55 , const double& radiusS
57 , const int subdivisionsCount = 63); 56 , const int subdivisionsCount = 63);
62 61
63 Warning: the existing chain content will be wiped out. 62 Warning: the existing chain content will be wiped out.
64 */ 63 */
65 void AddShortestArc( 64 void AddShortestArc(
66 PolylineSceneLayer::Chain& chain 65 PolylineSceneLayer::Chain& chain
67 , const Scene2D& scene
68 , const ScenePoint2D& centerS 66 , const ScenePoint2D& centerS
69 , const double& radiusS 67 , const double& radiusS
70 , const double startAngleRad 68 , const double startAngleRad
71 , const double endAngleRad 69 , const double endAngleRad
72 , const int subdivisionsCount = 63); 70 , const int subdivisionsCount = 63);
180 178
181 The five text layers are supposed to already exist in the scene, starting 179 The five text layers are supposed to already exist in the scene, starting
182 from layerIndex, up to (and not including) layerIndex+5. 180 from layerIndex, up to (and not including) layerIndex+5.
183 */ 181 */
184 void SetTextLayerOutlineProperties( 182 void SetTextLayerOutlineProperties(
185 Scene2D& scene, int baseLayerIndex, const char* text, ScenePoint2D p); 183 boost::shared_ptr<Scene2D> scene, boost::shared_ptr<LayerHolder> layerHolder,
186 184 const char* text, ScenePoint2D p);
187 } 185 }