Mercurial > hg > orthanc-stone

comparison Framework/Scene2DViewport/MeasureToolsToolbox.cpp @ 818:e42b491f1fb2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed typedefs to shared_ptr by making them explicit. Removed using namespace directives to make usage more explicit, too.
author Benjamin Golinvaux <bgo@osimis.io>
date Wed, 29 May 2019 10:51:28 +0200
parents 66ac7a2d1e3a
children a29c13497557
comparison
equal deleted inserted replaced
817:68f888812af4 818:e42b491f1fb2
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 "MeasureToolsToolbox.h" 21 #include "MeasureToolsToolbox.h"
22 #include "PointerTypes.h" 22 #include "PredeclaredTypes.h"
23 #include "LayerHolder.h" 23 #include "LayerHolder.h"
24 #include "ViewportController.h" 24 #include "ViewportController.h"
25 25
26 #include "../Scene2D/TextSceneLayer.h" 26 #include "../Scene2D/TextSceneLayer.h"
27 #include "../Scene2D/Scene2D.h" 27 #include "../Scene2D/Scene2D.h"
58 static const double factor = 180.0 / g_pi; 58 static const double factor = 180.0 / g_pi;
59 return angleRad * factor; 59 return angleRad * factor;
60 } 60 }
61 61
62 void AddSquare(PolylineSceneLayer::Chain& chain, 62 void AddSquare(PolylineSceneLayer::Chain& chain,
63 Scene2DConstPtr scene, 63 boost::shared_ptr<const Scene2D> scene,
64 const ScenePoint2D& centerS, 64 const ScenePoint2D& centerS,
65 const double& sideLengthS) 65 const double& sideLengthS)
66 { 66 {
67 // get the scaling factor 67 // get the scaling factor
68 const double sceneToCanvas = 68 const double sceneToCanvas =
286 This utility function assumes that the layer holder contains 5 text layers 286 This utility function assumes that the layer holder contains 5 text layers
287 and will use the first four ones for the text background and the fifth one 287 and will use the first four ones for the text background and the fifth one
288 for the actual text 288 for the actual text
289 */ 289 */
290 void SetTextLayerOutlineProperties( 290 void SetTextLayerOutlineProperties(
291 Scene2DPtr scene, LayerHolderPtr layerHolder, 291 boost::shared_ptr<Scene2D> scene, boost::shared_ptr<LayerHolder> layerHolder,
292 const char* text, ScenePoint2D p) 292 const char* text, ScenePoint2D p)
293 { 293 {
294 double xoffsets[5] = { 2, 0, -2, 0, 0 }; 294 double xoffsets[5] = { 2, 0, -2, 0, 0 };
295 double yoffsets[5] = { 0, -2, 0, 2, 0 }; 295 double yoffsets[5] = { 0, -2, 0, 2, 0 };
296 296