kindred/create
1
1
Fork 0
Code Issues 37 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 883d02756d
commit 3279a1dd8f
41 changed files with 355 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Mod/Sketcher/Gui/DrawSketchHandlerLineSet.h
View File

@@ -188,6 +188,8 @@ public:
void mouseMove(Base::Vector2d onSketchPos) override
{
using std::numbers::pi;
suppressTransition = false;
if (Mode == STATUS_SEEK_First) {
setPositionText(onSketchPos);
@@ -222,7 +224,7 @@ public:
if (showCursorCoords()) {
SbString text;
std::string lengthString = lengthToDisplayFormat(length, 1);
std::string angleString = angleToDisplayFormat(angle * 180.0 / M_PI, 1);
std::string angleString = angleToDisplayFormat(angle * 180.0 / pi, 1);
text.sprintf(" (%s, %s)", lengthString.c_str(), angleString.c_str());
setPositionText(EditCurve[1], text);
}
@@ -289,14 +291,14 @@ public:
arcAngle = 0.f;
}
if (arcRadius >= 0 && arcAngle > 0) {
arcAngle -= 2 * M_PI;
arcAngle -= 2 * pi;
}
if (arcRadius < 0 && arcAngle < 0) {
arcAngle += 2 * M_PI;
arcAngle += 2 * pi;
}
if (SnapMode == SNAP_MODE_45Degree) {
arcAngle = round(arcAngle / (M_PI / 4)) * M_PI / 4;
arcAngle = round(arcAngle / (pi / 4)) * pi / 4;
}
endAngle = startAngle + arcAngle;
@@ -316,7 +318,7 @@ public:
if (showCursorCoords()) {
SbString text;
std::string radiusString = lengthToDisplayFormat(std::abs(arcRadius), 1);
std::string angleString = angleToDisplayFormat(arcAngle * 180.0 / M_PI, 1);
std::string angleString = angleToDisplayFormat(arcAngle * 180.0 / pi, 1);
text.sprintf(" (R%s, %s)", radiusString.c_str(), angleString.c_str());
setPositionText(onSketchPos, text);
}
@@ -536,8 +538,8 @@ public:
// #3974: if in radians, the printf %f defaults to six decimals, which leads to
// loss of precision
double arcAngle =
abs(round((endAngle - startAngle) / (M_PI / 4)) * 45); // in degrees
double arcAngle = abs(round((endAngle - startAngle) / (std::numbers::pi / 4))
* 45); // in degrees
Gui::cmdAppObjectArgs(sketchgui->getObject(),
"addConstraint(Sketcher.Constraint('Angle',%i,App.Units."