kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Sketcher: Use std::numeric_limits and std::numbers instead of defines

Browse Source
This commit is contained in:
Benjamin Nauck
2025-03-27 19:02:24 +01:00
parent e8d836f390
commit b4eb28e50e
41 changed files with 355 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/src/Mod/Sketcher/App/SketchObject.cpp
View File

@@ -237,7 +237,7 @@ TEST_F(SketchObjectTest, testGetPointFromGeomArcOfCircle)
{
// Arrange
Base::Vector3d coordsCenter(1.0, 2.0, 0.0);
double radius = 3.0, startParam = M_PI / 3, endParam = M_PI * 1.5;
double radius = 3.0, startParam = std::numbers::pi / 3, endParam = std::numbers::pi * 1.5;
Part::GeomArcOfCircle arcOfCircle;
arcOfCircle.setCenter(coordsCenter);
arcOfCircle.setRadius(radius);
@@ -267,7 +267,7 @@ TEST_F(SketchObjectTest, testGetPointFromGeomArcOfEllipse)
Base::Vector3d coordsCenter(1.0, 2.0, 0.0);
double majorRadius = 4.0;
double minorRadius = 3.0;
double startParam = M_PI / 3, endParam = M_PI * 1.5;
double startParam = std::numbers::pi / 3, endParam = std::numbers::pi * 1.5;
Part::GeomArcOfEllipse arcOfEllipse;
arcOfEllipse.setCenter(coordsCenter);
arcOfEllipse.setMajorRadius(majorRadius);
@@ -298,7 +298,7 @@ TEST_F(SketchObjectTest, testGetPointFromGeomArcOfHyperbola)
Base::Vector3d coordsCenter(1.0, 2.0, 0.0);
double majorRadius = 4.0;
double minorRadius = 3.0;
double startParam = M_PI / 3, endParam = M_PI * 1.5;
double startParam = std::numbers::pi / 3, endParam = std::numbers::pi * 1.5;
Part::GeomArcOfHyperbola arcOfHyperbola;
arcOfHyperbola.setCenter(coordsCenter);
arcOfHyperbola.setMajorRadius(majorRadius);
@@ -330,7 +330,7 @@ TEST_F(SketchObjectTest, testGetPointFromGeomArcOfParabola)
// Arrange
Base::Vector3d coordsCenter(1.0, 2.0, 0.0);
double focal = 3.0;
double startParam = M_PI / 3, endParam = M_PI * 1.5;
double startParam = std::numbers::pi / 3, endParam = std::numbers::pi * 1.5;
Part::GeomArcOfParabola arcOfParabola;
arcOfParabola.setCenter(coordsCenter);
arcOfParabola.setFocal(focal);

4
tests/src/Mod/Sketcher/App/SketchObjectChanges.cpp
View File

@@ -846,7 +846,7 @@ TEST_F(SketchObjectTest, testJoinCurves)
// Arrange
// Make two curves
Base::Vector3d coordsCenter(0.0, 0.0, 0.0);
double radius = 3.0, startParam = M_PI / 2, endParam = M_PI;
double radius = 3.0, startParam = std::numbers::pi / 2, endParam = std::numbers::pi;
Part::GeomArcOfCircle arcOfCircle;
arcOfCircle.setCenter(coordsCenter);
arcOfCircle.setRadius(radius);
@@ -877,7 +877,7 @@ TEST_F(SketchObjectTest, testJoinCurvesWhenTangent)
// Arrange
// Make two curves
Base::Vector3d coordsCenter(0.0, 0.0, 0.0);
double radius = 3.0, startParam = M_PI / 2, endParam = M_PI;
double radius = 3.0, startParam = std::numbers::pi / 2, endParam = std::numbers::pi;
Part::GeomArcOfCircle arcOfCircle;
arcOfCircle.setCenter(coordsCenter);
arcOfCircle.setRadius(radius);

6
tests/src/Mod/Sketcher/App/SketcherTestHelpers.cpp
View File

@@ -56,7 +56,7 @@ void setupArcOfCircle(Part::GeomArcOfCircle& arcOfCircle)
{
Base::Vector3d coordsCenter(1.0, 2.0, 0.0);
double radius = 3.0;
double startParam = M_PI / 3, endParam = M_PI * 1.5;
double startParam = std::numbers::pi / 3, endParam = std::numbers::pi * 1.5;
arcOfCircle.setCenter(coordsCenter);
arcOfCircle.setRadius(radius);
arcOfCircle.setRange(startParam, endParam, true);
@@ -77,7 +77,7 @@ void setupArcOfHyperbola(Part::GeomArcOfHyperbola& arcOfHyperbola)
Base::Vector3d coordsCenter(1.0, 2.0, 0.0);
double majorRadius = 4.0;
double minorRadius = 3.0;
double startParam = M_PI / 3, endParam = M_PI * 1.5;
double startParam = std::numbers::pi / 3, endParam = std::numbers::pi * 1.5;
arcOfHyperbola.setCenter(coordsCenter);
arcOfHyperbola.setMajorRadius(majorRadius);
arcOfHyperbola.setMinorRadius(minorRadius);
@@ -88,7 +88,7 @@ void setupArcOfParabola(Part::GeomArcOfParabola& aop)
{
Base::Vector3d coordsCenter(1.0, 2.0, 0.0);
double focal = 3.0;
double startParam = -M_PI * 1.5, endParam = M_PI * 1.5;
double startParam = -std::numbers::pi * 1.5, endParam = std::numbers::pi * 1.5;
aop.setCenter(coordsCenter);
aop.setFocal(focal);
aop.setRange(startParam, endParam, true);

5
tests/src/Mod/Sketcher/App/planegcs/Constraints.cpp
View File

@@ -1,6 +1,7 @@
// SPDX-License-Identifier: LGPL-2.1-or-later
#include <cmath>
#include <numbers>
#include <gtest/gtest.h>
@@ -54,8 +55,8 @@ TEST_F(ConstraintsTest, tangentBSplineAndArc) // NOLINT
arcEnd.y = &arcEndY;
arcCenter.x = &arcCenterX;
arcCenter.y = &arcCenterY;
double arcRadius = 5.0, arcStartAngle = 0.0, arcEndAngle = M_PI / 2;
double desiredAngle = M_PI;
double arcRadius = 5.0, arcStartAngle = 0.0, arcEndAngle = std::numbers::pi / 2;
double desiredAngle = std::numbers::pi;
double bSplineStartX = 0.0, bSplineEndX = 16.0;
double bSplineStartY = 10.0, bSplineEndY = -10.0;
GCS::Point bSplineStart, bSplineEnd;