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

Points: fix many linter warnings

Browse Source
This commit is contained in:
wmayer
2024-03-12 14:09:17 +01:00
committed by wwmayer
parent be5dce2e9e
commit 0b8990c96c
14 changed files with 298 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

167
src/Mod/Points/App/PointsGrid.cpp
View File

@@ -33,14 +33,14 @@ PointsGrid::PointsGrid(const PointKernel& rclM)
, _ulCtGridsX(0)
, _ulCtGridsY(0)
, _ulCtGridsZ(0)
, _fGridLenX(0.0f)
, _fGridLenY(0.0f)
, _fGridLenZ(0.0f)
, _fMinX(0.0f)
, _fMinY(0.0f)
, _fMinZ(0.0f)
, _fGridLenX(0.0F)
, _fGridLenY(0.0F)
, _fGridLenZ(0.0F)
, _fMinX(0.0F)
, _fMinY(0.0F)
, _fMinZ(0.0F)
{
RebuildGrid();
PointsGrid::RebuildGrid();
}
PointsGrid::PointsGrid()
@@ -49,12 +49,12 @@ PointsGrid::PointsGrid()
, _ulCtGridsX(POINTS_CT_GRID)
, _ulCtGridsY(POINTS_CT_GRID)
, _ulCtGridsZ(POINTS_CT_GRID)
, _fGridLenX(0.0f)
, _fGridLenY(0.0f)
, _fGridLenZ(0.0f)
, _fMinX(0.0f)
, _fMinY(0.0f)
, _fMinZ(0.0f)
, _fGridLenX(0.0F)
, _fGridLenY(0.0F)
, _fGridLenZ(0.0F)
, _fMinX(0.0F)
, _fMinY(0.0F)
, _fMinZ(0.0F)
{}
PointsGrid::PointsGrid(const PointKernel& rclM,
@@ -66,14 +66,14 @@ PointsGrid::PointsGrid(const PointKernel& rclM,
, _ulCtGridsX(0)
, _ulCtGridsY(0)
, _ulCtGridsZ(0)
, _fGridLenX(0.0f)
, _fGridLenY(0.0f)
, _fGridLenZ(0.0f)
, _fMinX(0.0f)
, _fMinY(0.0f)
, _fMinZ(0.0f)
, _fGridLenX(0.0F)
, _fGridLenY(0.0F)
, _fGridLenZ(0.0F)
, _fMinX(0.0F)
, _fMinY(0.0F)
, _fMinZ(0.0F)
{
Rebuild(ulX, ulY, ulZ);
PointsGrid::Rebuild(ulX, ulY, ulZ);
}
PointsGrid::PointsGrid(const PointKernel& rclM, int iCtGridPerAxis)
@@ -82,14 +82,14 @@ PointsGrid::PointsGrid(const PointKernel& rclM, int iCtGridPerAxis)
, _ulCtGridsX(0)
, _ulCtGridsY(0)
, _ulCtGridsZ(0)
, _fGridLenX(0.0f)
, _fGridLenY(0.0f)
, _fGridLenZ(0.0f)
, _fMinX(0.0f)
, _fMinY(0.0f)
, _fMinZ(0.0f)
, _fGridLenX(0.0F)
, _fGridLenY(0.0F)
, _fGridLenZ(0.0F)
, _fMinX(0.0F)
, _fMinY(0.0F)
, _fMinZ(0.0F)
{
Rebuild(iCtGridPerAxis);
PointsGrid::Rebuild(iCtGridPerAxis);
}
PointsGrid::PointsGrid(const PointKernel& rclM, double fGridLen)
@@ -98,20 +98,20 @@ PointsGrid::PointsGrid(const PointKernel& rclM, double fGridLen)
, _ulCtGridsX(0)
, _ulCtGridsY(0)
, _ulCtGridsZ(0)
, _fGridLenX(0.0f)
, _fGridLenY(0.0f)
, _fGridLenZ(0.0f)
, _fMinX(0.0f)
, _fMinY(0.0f)
, _fMinZ(0.0f)
, _fGridLenX(0.0F)
, _fGridLenY(0.0F)
, _fGridLenZ(0.0F)
, _fMinX(0.0F)
, _fMinY(0.0F)
, _fMinZ(0.0F)
{
Base::BoundBox3d clBBPts; // = _pclPoints->GetBoundBox();
for (const auto& pnt : *_pclPoints) {
clBBPts.Add(pnt);
}
Rebuild(std::max<unsigned long>((unsigned long)(clBBPts.LengthX() / fGridLen), 1),
std::max<unsigned long>((unsigned long)(clBBPts.LengthY() / fGridLen), 1),
std::max<unsigned long>((unsigned long)(clBBPts.LengthZ() / fGridLen), 1));
PointsGrid::Rebuild(std::max<unsigned long>((unsigned long)(clBBPts.LengthX() / fGridLen), 1),
std::max<unsigned long>((unsigned long)(clBBPts.LengthY() / fGridLen), 1),
std::max<unsigned long>((unsigned long)(clBBPts.LengthZ() / fGridLen), 1));
}
void PointsGrid::Attach(const PointKernel& rclM)
@@ -153,8 +153,6 @@ void PointsGrid::InitGrid()
{
assert(_pclPoints);
unsigned long i, j;
// Calculate grid lengths if not initialized
//
if ((_ulCtGridsX == 0) || (_ulCtGridsY == 0) || (_ulCtGridsZ == 0)) {
@@ -180,8 +178,8 @@ void PointsGrid::InitGrid()
if (num == 0) {
num = 1;
}
_fGridLenX = (1.0f + fLengthX) / double(num);
_fMinX = clBBPts.MinX - 0.5f;
_fGridLenX = (1.0F + fLengthX) / double(num);
_fMinX = clBBPts.MinX - 0.5F;
}
{
@@ -189,8 +187,8 @@ void PointsGrid::InitGrid()
if (num == 0) {
num = 1;
}
_fGridLenY = (1.0f + fLengthY) / double(num);
_fMinY = clBBPts.MinY - 0.5f;
_fGridLenY = (1.0F + fLengthY) / double(num);
_fMinY = clBBPts.MinY - 0.5F;
}
{
@@ -198,17 +196,17 @@ void PointsGrid::InitGrid()
if (num == 0) {
num = 1;
}
_fGridLenZ = (1.0f + fLengthZ) / double(num);
_fMinZ = clBBPts.MinZ - 0.5f;
_fGridLenZ = (1.0F + fLengthZ) / double(num);
_fMinZ = clBBPts.MinZ - 0.5F;
}
}
// Create data structure
_aulGrid.clear();
_aulGrid.resize(_ulCtGridsX);
for (i = 0; i < _ulCtGridsX; i++) {
for (unsigned long i = 0; i < _ulCtGridsX; i++) {
_aulGrid[i].resize(_ulCtGridsY);
for (j = 0; j < _ulCtGridsY; j++) {
for (unsigned long j = 0; j < _ulCtGridsY; j++) {
_aulGrid[i][j].resize(_ulCtGridsZ);
}
}
@@ -218,7 +216,12 @@ unsigned long PointsGrid::InSide(const Base::BoundBox3d& rclBB,
std::vector<unsigned long>& raulElements,
bool bDelDoubles) const
{
unsigned long i, j, k, ulMinX, ulMinY, ulMinZ, ulMaxX, ulMaxY, ulMaxZ;
unsigned long ulMinX {};
unsigned long ulMinY {};
unsigned long ulMinZ {};
unsigned long ulMaxX {};
unsigned long ulMaxY {};
unsigned long ulMaxZ {};
raulElements.clear();
@@ -226,9 +229,9 @@ unsigned long PointsGrid::InSide(const Base::BoundBox3d& rclBB,
Position(Base::Vector3d(rclBB.MinX, rclBB.MinY, rclBB.MinZ), ulMinX, ulMinY, ulMinZ);
Position(Base::Vector3d(rclBB.MaxX, rclBB.MaxY, rclBB.MaxZ), ulMaxX, ulMaxY, ulMaxZ);
for (i = ulMinX; i <= ulMaxX; i++) {
for (j = ulMinY; j <= ulMaxY; j++) {
for (k = ulMinZ; k <= ulMaxZ; k++) {
for (auto i = ulMinX; i <= ulMaxX; i++) {
for (auto j = ulMinY; j <= ulMaxY; j++) {
for (auto k = ulMinZ; k <= ulMaxZ; k++) {
raulElements.insert(raulElements.end(),
_aulGrid[i][j][k].begin(),
_aulGrid[i][j][k].end());
@@ -252,7 +255,8 @@ unsigned long PointsGrid::InSide(const Base::BoundBox3d& rclBB,
double fMaxDist,
bool bDelDoubles) const
{
unsigned long i, j, k, ulMinX, ulMinY, ulMinZ, ulMaxX, ulMaxY, ulMaxZ;
unsigned long ulMinX {}, ulMinY {}, ulMinZ {};
unsigned long ulMaxX {}, ulMaxY {}, ulMaxZ {};
double fGridDiag = GetBoundBox(0, 0, 0).CalcDiagonalLength();
double fMinDistP2 = (fGridDiag * fGridDiag) + (fMaxDist * fMaxDist);
@@ -262,9 +266,9 @@ unsigned long PointsGrid::InSide(const Base::BoundBox3d& rclBB,
Position(Base::Vector3d(rclBB.MinX, rclBB.MinY, rclBB.MinZ), ulMinX, ulMinY, ulMinZ);
Position(Base::Vector3d(rclBB.MaxX, rclBB.MaxY, rclBB.MaxZ), ulMaxX, ulMaxY, ulMaxZ);
for (i = ulMinX; i <= ulMaxX; i++) {
for (j = ulMinY; j <= ulMaxY; j++) {
for (k = ulMinZ; k <= ulMaxZ; k++) {
for (auto i = ulMinX; i <= ulMaxX; i++) {
for (auto j = ulMinY; j <= ulMaxY; j++) {
for (auto k = ulMinZ; k <= ulMaxZ; k++) {
if (Base::DistanceP2(GetBoundBox(i, j, k).GetCenter(), rclOrg) < fMinDistP2) {
raulElements.insert(raulElements.end(),
_aulGrid[i][j][k].begin(),
@@ -287,7 +291,8 @@ unsigned long PointsGrid::InSide(const Base::BoundBox3d& rclBB,
unsigned long PointsGrid::InSide(const Base::BoundBox3d& rclBB,
std::set<unsigned long>& raulElements) const
{
unsigned long i, j, k, ulMinX, ulMinY, ulMinZ, ulMaxX, ulMaxY, ulMaxZ;
unsigned long ulMinX {}, ulMinY {}, ulMinZ {};
unsigned long ulMaxX {}, ulMaxY {}, ulMaxZ {};
raulElements.clear();
@@ -295,9 +300,9 @@ unsigned long PointsGrid::InSide(const Base::BoundBox3d& rclBB,
Position(Base::Vector3d(rclBB.MinX, rclBB.MinY, rclBB.MinZ), ulMinX, ulMinY, ulMinZ);
Position(Base::Vector3d(rclBB.MaxX, rclBB.MaxY, rclBB.MaxZ), ulMaxX, ulMaxY, ulMaxZ);
for (i = ulMinX; i <= ulMaxX; i++) {
for (j = ulMinY; j <= ulMaxY; j++) {
for (k = ulMinZ; k <= ulMaxZ; k++) {
for (auto i = ulMinX; i <= ulMaxX; i++) {
for (auto j = ulMinY; j <= ulMaxY; j++) {
for (auto k = ulMinZ; k <= ulMaxZ; k++) {
raulElements.insert(_aulGrid[i][j][k].begin(), _aulGrid[i][j][k].end());
}
}
@@ -345,7 +350,7 @@ void PointsGrid::CalculateGridLength(unsigned long ulCtGrid, unsigned long ulMax
for (const auto& pnt : *_pclPoints) {
clBBPtsEnlarged.Add(pnt);
}
double fVolElem;
double fVolElem {};
if (_ulCtElements > (ulMaxGrids * ulCtGrid)) {
fVolElem =
@@ -359,7 +364,7 @@ void PointsGrid::CalculateGridLength(unsigned long ulCtGrid, unsigned long ulMax
}
double fVol = fVolElem * float(ulCtGrid);
double fGridLen = float(pow((float)fVol, 1.0f / 3.0f));
double fGridLen = float(pow((float)fVol, 1.0F / 3.0F));
if (fGridLen > 0) {
_ulCtGridsX =
@@ -398,7 +403,7 @@ void PointsGrid::CalculateGridLength(int iCtGridPerAxis)
double fLenghtD = clBBPts.CalcDiagonalLength();
double fLengthTol = 0.05f * fLenghtD;
double fLengthTol = 0.05F * fLenghtD;
bool bLenghtXisZero = (fLenghtX <= fLengthTol);
bool bLenghtYisZero = (fLenghtY <= fLengthTol);
@@ -444,7 +449,7 @@ void PointsGrid::CalculateGridLength(int iCtGridPerAxis)
fVolumenGrid = fVolumen / (float)iMaxGrids;
}
double fLengthGrid = float(pow((float)fVolumenGrid, 1.0f / 3.0f));
double fLengthGrid = float(pow((float)fVolumenGrid, 1.0F / 3.0F));
_ulCtGridsX = std::max<unsigned long>((unsigned long)(fLenghtX / fLengthGrid), 1);
_ulCtGridsY = std::max<unsigned long>((unsigned long)(fLenghtY / fLengthGrid), 1);
@@ -529,7 +534,9 @@ void PointsGrid::SearchNearestFromPoint(const Base::Vector3d& rclPt,
Base::BoundBox3d clBB = GetBoundBox();
if (clBB.IsInBox(rclPt)) { // Point lies within
unsigned long ulX, ulY, ulZ;
unsigned long ulX {};
unsigned long ulY {};
unsigned long ulZ {};
Position(rclPt, ulX, ulY, ulZ);
unsigned long ulLevel = 0;
while (raclInd.empty()) {
@@ -632,41 +639,39 @@ void PointsGrid::GetHull(unsigned long ulX,
int nY2 = std::min<int>(int(_ulCtGridsY) - 1, int(ulY) + int(ulDistance));
int nZ2 = std::min<int>(int(_ulCtGridsZ) - 1, int(ulZ) + int(ulDistance));
int i, j;
// top plane
for (i = nX1; i <= nX2; i++) {
for (j = nY1; j <= nY2; j++) {
for (int i = nX1; i <= nX2; i++) {
for (int j = nY1; j <= nY2; j++) {
GetElements(i, j, nZ1, raclInd);
}
}
// bottom plane
for (i = nX1; i <= nX2; i++) {
for (j = nY1; j <= nY2; j++) {
for (int i = nX1; i <= nX2; i++) {
for (int j = nY1; j <= nY2; j++) {
GetElements(i, j, nZ2, raclInd);
}
}
// left plane
for (i = nY1; i <= nY2; i++) {
for (j = (nZ1 + 1); j <= (nZ2 - 1); j++) {
for (int i = nY1; i <= nY2; i++) {
for (int j = (nZ1 + 1); j <= (nZ2 - 1); j++) {
GetElements(nX1, i, j, raclInd);
}
}
// right plane
for (i = nY1; i <= nY2; i++) {
for (j = (nZ1 + 1); j <= (nZ2 - 1); j++) {
for (int i = nY1; i <= nY2; i++) {
for (int j = (nZ1 + 1); j <= (nZ2 - 1); j++) {
GetElements(nX2, i, j, raclInd);
}
}
// front plane
for (i = (nX1 + 1); i <= (nX2 - 1); i++) {
for (j = (nZ1 + 1); j <= (nZ2 - 1); j++) {
for (int i = (nX1 + 1); i <= (nX2 - 1); i++) {
for (int j = (nZ1 + 1); j <= (nZ2 - 1); j++) {
GetElements(i, nY1, j, raclInd);
}
}
// back plane
for (i = (nX1 + 1); i <= (nX2 - 1); i++) {
for (j = (nZ1 + 1); j <= (nZ2 - 1); j++) {
for (int i = (nX1 + 1); i <= (nX2 - 1); i++) {
for (int j = (nZ1 + 1); j <= (nZ2 - 1); j++) {
GetElements(i, nY2, j, raclInd);
}
}
@@ -688,7 +693,7 @@ unsigned long PointsGrid::GetElements(unsigned long ulX,
void PointsGrid::AddPoint(const Base::Vector3d& rclPt, unsigned long ulPtIndex, float /*fEpsilon*/)
{
unsigned long ulX, ulY, ulZ;
unsigned long ulX {}, ulY {}, ulZ {};
Pos(Base::Vector3d(rclPt.x, rclPt.y, rclPt.z), ulX, ulY, ulZ);
if ((ulX < _ulCtGridsX) && (ulY < _ulCtGridsY) && (ulZ < _ulCtGridsZ)) {
_aulGrid[ulX][ulY][ulZ].insert(ulPtIndex);
@@ -767,7 +772,7 @@ void PointsGrid::Pos(const Base::Vector3d& rclPoint,
unsigned long PointsGrid::FindElements(const Base::Vector3d& rclPoint,
std::set<unsigned long>& aulElements) const
{
unsigned long ulX, ulY, ulZ;
unsigned long ulX {}, ulY {}, ulZ {};
Pos(rclPoint, ulX, ulY, ulZ);
// check if the given point is inside the grid structure
@@ -782,8 +787,8 @@ unsigned long PointsGrid::FindElements(const Base::Vector3d& rclPoint,
PointsGridIterator::PointsGridIterator(const PointsGrid& rclG)
: _rclGrid(rclG)
, _clPt(0.0f, 0.0f, 0.0f)
, _clDir(0.0f, 0.0f, 0.0f)
, _clPt(0.0F, 0.0F, 0.0F)
, _clDir(0.0F, 0.0F, 0.0F)
{}
bool PointsGridIterator::InitOnRay(const Base::Vector3d& rclPt,