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

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

Browse Source
This commit is contained in:
Benjamin Nauck
2025-03-27 19:02:09 +01:00
parent 044997b1ac
commit 7efa4c1830
6 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Mod/ReverseEngineering/App/RegionGrowing.cpp
View File

@@ -88,7 +88,7 @@ void RegionGrowing::perform(int ksearch)
reg.setInputCloud(cloud);
// reg.setIndices (indices);
reg.setInputNormals(normals);
reg.setSmoothnessThreshold(3.0 / 180.0 * M_PI);
reg.setSmoothnessThreshold(3.0 / 180.0 * std::numbers::pi);
reg.setCurvatureThreshold(1.0);
std::vector<pcl::PointIndices> clusters;
@@ -142,7 +142,7 @@ void RegionGrowing::perform(const std::vector<Base::Vector3f>& myNormals)
reg.setInputCloud(cloud);
// reg.setIndices (indices);
reg.setInputNormals(normals);
reg.setSmoothnessThreshold(3.0 / 180.0 * M_PI);
reg.setSmoothnessThreshold(3.0 / 180.0 * std::numbers::pi);
reg.setCurvatureThreshold(1.0);
std::vector<pcl::PointIndices> clusters;

12
src/Mod/ReverseEngineering/App/SurfaceTriangulation.cpp
View File

@@ -114,9 +114,9 @@ void SurfaceTriangulation::perform(int ksearch)
gp3.setSearchRadius(searchRadius);
gp3.setMu(mu);
gp3.setMaximumNearestNeighbors(100);
gp3.setMaximumSurfaceAngle(M_PI / 4); // 45 degrees
gp3.setMinimumAngle(M_PI / 18); // 10 degrees
gp3.setMaximumAngle(2 * M_PI / 3); // 120 degrees
gp3.setMaximumSurfaceAngle(std::numbers::pi / 4); // 45 degrees
gp3.setMinimumAngle(std::numbers::pi / 18); // 10 degrees
gp3.setMaximumAngle(2 * std::numbers::pi / 3); // 120 degrees
gp3.setNormalConsistency(false);
gp3.setConsistentVertexOrdering(true);
@@ -171,9 +171,9 @@ void SurfaceTriangulation::perform(const std::vector<Base::Vector3f>& normals)
gp3.setSearchRadius(searchRadius);
gp3.setMu(mu);
gp3.setMaximumNearestNeighbors(100);
gp3.setMaximumSurfaceAngle(M_PI / 4); // 45 degrees
gp3.setMinimumAngle(M_PI / 18); // 10 degrees
gp3.setMaximumAngle(2 * M_PI / 3); // 120 degrees
gp3.setMaximumSurfaceAngle(std::numbers::pi / 4); // 45 degrees
gp3.setMinimumAngle(std::numbers::pi / 18); // 10 degrees
gp3.setMaximumAngle(2 * std::numbers::pi / 3); // 120 degrees
gp3.setNormalConsistency(true);
gp3.setConsistentVertexOrdering(true);

6
src/Mod/ReverseEngineering/Gui/Command.cpp
View File

@@ -272,7 +272,7 @@ void CmdApproxCylinder::activated(int)
fit.SetInitialValues(base, axis);
}
if (fit.Fit() < FLOAT_MAX) {
if (fit.Fit() < std::numeric_limits<float>::max()) {
Base::Vector3f base, top;
fit.GetBounding(base, top);
float height = Base::Distance(base, top);
@@ -329,7 +329,7 @@ void CmdApproxSphere::activated(int)
const MeshCore::MeshKernel& kernel = mesh.getKernel();
MeshCore::SphereFit fit;
fit.AddPoints(kernel.GetPoints());
if (fit.Fit() < FLOAT_MAX) {
if (fit.Fit() < std::numeric_limits<float>::max()) {
Base::Vector3f base = fit.GetCenter();
std::stringstream str;
@@ -378,7 +378,7 @@ void CmdApproxPolynomial::activated(int)
const MeshCore::MeshKernel& kernel = mesh.getKernel();
MeshCore::SurfaceFit fit;
fit.AddPoints(kernel.GetPoints());
if (fit.Fit() < FLOAT_MAX) {
if (fit.Fit() < std::numeric_limits<float>::max()) {
Base::BoundBox3f bbox = fit.GetBoundings();
std::vector<Base::Vector3d> poles =
fit.toBezier(bbox.MinX, bbox.MaxX, bbox.MinY, bbox.MaxY);

2
src/Mod/ReverseEngineering/Gui/FitBSplineSurface.cpp
View File

@@ -122,7 +122,7 @@ void FitBSplineSurfaceWidget::onMakePlacementClicked()
});
MeshCore::PlaneFit fit;
fit.AddPoints(data);
if (fit.Fit() < FLOAT_MAX) {
if (fit.Fit() < std::numeric_limits<float>::max()) {
Base::Vector3f base = fit.GetBase();
Base::Vector3f dirU = fit.GetDirU();
Base::Vector3f norm = fit.GetNormal();

4
src/Mod/ReverseEngineering/Gui/Segmentation.cpp
View File

@@ -59,7 +59,7 @@ Segmentation::Segmentation(Mesh::Feature* mesh, QWidget* parent, Qt::WindowFlags
, myMesh(mesh)
{
ui->setupUi(this);
ui->numPln->setRange(1, INT_MAX);
ui->numPln->setRange(1, std::numeric_limits<int>::max());
ui->numPln->setValue(100);
ui->checkBoxSmooth->setChecked(false);
@@ -115,7 +115,7 @@ void Segmentation::accept()
std::vector<MeshCore::PointIndex> indexes = kernel.GetFacetPoints(jt);
MeshCore::PlaneFit fit;
fit.AddPoints(kernel.GetPoints(indexes));
if (fit.Fit() < FLOAT_MAX) {
if (fit.Fit() < std::numeric_limits<float>::max()) {
Base::Vector3f base = fit.GetBase();
Base::Vector3f axis = fit.GetNormal();
MeshCore::AbstractSurfaceFit* fitter =

8
src/Mod/ReverseEngineering/Gui/SegmentationManual.cpp
View File

@@ -47,7 +47,7 @@ SegmentationManual::SegmentationManual(QWidget* parent, Qt::WindowFlags fl)
{
ui->setupUi(this);
setupConnections();
ui->spSelectComp->setRange(1, INT_MAX);
ui->spSelectComp->setRange(1, std::numeric_limits<int>::max());
ui->spSelectComp->setValue(10);
Gui::Selection().clearSelection();
@@ -215,7 +215,7 @@ void SegmentationManual::onPlaneDetectClicked()
MeshCore::PlaneFit fit;
fit.AddPoints(points);
if (fit.Fit() < FLOAT_MAX) {
if (fit.Fit() < std::numeric_limits<float>::max()) {
Base::Vector3f base = fit.GetBase();
Base::Vector3f axis = fit.GetNormal();
return new MeshCore::PlaneSurfaceFit(base, axis);
@@ -239,7 +239,7 @@ void SegmentationManual::onCylinderDetectClicked()
Base::Vector3f axis = fit.GetInitialAxisFromNormals(normal);
fit.SetInitialValues(base, axis);
}
if (fit.Fit() < FLOAT_MAX) {
if (fit.Fit() < std::numeric_limits<float>::max()) {
Base::Vector3f base = fit.GetBase();
Base::Vector3f axis = fit.GetAxis();
float radius = fit.GetRadius();
@@ -259,7 +259,7 @@ void SegmentationManual::onSphereDetectClicked()
MeshCore::SphereFit fit;
fit.AddPoints(points);
if (fit.Fit() < FLOAT_MAX) {
if (fit.Fit() < std::numeric_limits<float>::max()) {
Base::Vector3f base = fit.GetCenter();
float radius = fit.GetRadius();
return new MeshCore::SphereSurfaceFit(base, radius);