From 2cea9600ef49de9222e835910b331a7f5f58bc23 Mon Sep 17 00:00:00 2001 From: wandererfan Date: Thu, 6 Mar 2025 10:15:00 -0500 Subject: [PATCH] [TD]clean annoying lint messages --- src/Mod/TechDraw/Gui/DimensionValidators.cpp | 65 ++++++++++---------- src/Mod/TechDraw/Gui/DimensionValidators.h | 26 ++++---- 2 files changed, 47 insertions(+), 44 deletions(-) diff --git a/src/Mod/TechDraw/Gui/DimensionValidators.cpp b/src/Mod/TechDraw/Gui/DimensionValidators.cpp index c277f6b1e6..673b172d15 100644 --- a/src/Mod/TechDraw/Gui/DimensionValidators.cpp +++ b/src/Mod/TechDraw/Gui/DimensionValidators.cpp @@ -210,11 +210,11 @@ DimensionGeometry TechDraw::validateDimSelection3d( return DimensionGeometry::isInvalid; } -bool TechDraw::validateSubnameList(StringVector subNames, GeometrySet acceptableGeometrySet) +bool TechDraw::validateSubnameList(const StringVector& subNames, GeometrySet acceptableGeometrySet) { for (auto& sub : subNames) { std::string geometryType = DrawUtil::getGeomTypeFromName(ShapeFinder::getLastTerm(sub)); - if (acceptableGeometrySet.count(geometryType) == 0) { + if (acceptableGeometrySet.contains(geometryType)) { //this geometry type is not allowed return false; } @@ -223,13 +223,13 @@ bool TechDraw::validateSubnameList(StringVector subNames, GeometrySet acceptable } //count how many of each "Edge", "Vertex, etc and compare totals to required minimum -bool TechDraw::checkGeometryOccurrences(StringVector subNames, GeomCountMap keyedMinimumCounts) +bool TechDraw::checkGeometryOccurrences(const StringVector& subNames, GeomCountMap keyedMinimumCounts) { //how many of each geometry descriptor are input GeomCountMap foundCounts; for (auto& sub : subNames) { std::string geometryType = DrawUtil::getGeomTypeFromName(ShapeFinder::getLastTerm(sub)); - std::map::iterator it0(foundCounts.find(geometryType)); + auto it0(foundCounts.find(geometryType)); if (it0 == foundCounts.end()) { //first occurrence of this geometryType foundCounts[geometryType] = 1; @@ -294,7 +294,7 @@ DimensionGeometry TechDraw::getGeometryConfiguration(ReferenceVector valid2dRefe //return the first valid configuration contained in the already validated references DimensionGeometry TechDraw::getGeometryConfiguration3d(DrawViewPart* dvp, - ReferenceVector valid3dReferences) + const ReferenceVector& valid3dReferences) { //first we check for whole object references ReferenceVector wholeObjectRefs; @@ -360,7 +360,7 @@ GeomCountMap TechDraw::loadRequiredCounts(const StringVector& acceptableGeometry } //! verify that Selection contains a valid Geometry for a single Edge Dimension -DimensionGeometry TechDraw::isValidSingleEdge(ReferenceEntry ref) +DimensionGeometry TechDraw::isValidSingleEdge(const ReferenceEntry& ref) { auto objFeat(dynamic_cast(ref.getObject())); if (!objFeat) { @@ -387,12 +387,12 @@ DimensionGeometry TechDraw::isValidSingleEdge(ReferenceEntry ref) } Base::Vector3d line = gen1->points.at(1) - gen1->points.at(0); if (fabs(line.y) < FLT_EPSILON) { - return DimensionGeometry::isHorizontal; - } else if (fabs(line.x) < FLT_EPSILON) { - return DimensionGeometry::isHorizontal; - } else { - return DimensionGeometry::isDiagonal; + return DimensionGeometry::isVertical; } + if (fabs(line.x) < FLT_EPSILON) { + return DimensionGeometry::isHorizontal; + } + return DimensionGeometry::isDiagonal; } else if (geom->getGeomType() == GeomType::CIRCLE || geom->getGeomType() == GeomType::ARCOFCIRCLE) { return DimensionGeometry::isCircle; } else if (geom->getGeomType() == GeomType::ELLIPSE || geom->getGeomType() == GeomType::ARCOFELLIPSE) { @@ -401,15 +401,14 @@ DimensionGeometry TechDraw::isValidSingleEdge(ReferenceEntry ref) TechDraw::BSplinePtr spline = std::static_pointer_cast(geom); if (spline->isCircle()) { return DimensionGeometry::isBSplineCircle; - } else { - return DimensionGeometry::isBSpline; } + return DimensionGeometry::isBSpline; } return DimensionGeometry::isInvalid; } //! verify that Selection contains a valid Geometry for a single Edge Dimension -DimensionGeometry TechDraw::isValidSingleEdge3d(DrawViewPart* dvp, ReferenceEntry ref) +DimensionGeometry TechDraw::isValidSingleEdge3d(DrawViewPart* dvp, const ReferenceEntry& ref) { (void)dvp; //the Name starts with "Edge" @@ -432,8 +431,9 @@ DimensionGeometry TechDraw::isValidSingleEdge3d(DrawViewPart* dvp, ReferenceEntr point1 = dvp->projectPoint(point1); Base::Vector3d line = point1 - point0; if (fabs(line.y) < FLT_EPSILON) { - return DimensionGeometry::isHorizontal; - } else if (fabs(line.x) < FLT_EPSILON) { + return DimensionGeometry::isVertical; + } + if (fabs(line.x) < FLT_EPSILON) { return DimensionGeometry::isHorizontal; } // else if (fabs(line.z) < FLT_EPSILON) { @@ -449,16 +449,15 @@ DimensionGeometry TechDraw::isValidSingleEdge3d(DrawViewPart* dvp, ReferenceEntr } else if (adapt.GetType() == GeomAbs_BSplineCurve) { if (GeometryUtils::isCircle(occEdge)) { return DimensionGeometry::isBSplineCircle; - } else { - return DimensionGeometry::isBSpline; } + return DimensionGeometry::isBSpline; } return DimensionGeometry::isInvalid; } //! verify that Selection contains a valid Geometry for a single Edge Dimension -DimensionGeometry TechDraw::isValidSingleFace(ReferenceEntry ref) +DimensionGeometry TechDraw::isValidSingleFace(const ReferenceEntry& ref) { auto objFeat(dynamic_cast(ref.getObject())); if (!objFeat) { @@ -480,7 +479,7 @@ DimensionGeometry TechDraw::isValidSingleFace(ReferenceEntry ref) } //! verify that Selection contains a valid Geometry for a single Edge Dimension -DimensionGeometry TechDraw::isValidSingleFace3d(DrawViewPart* dvp, ReferenceEntry ref) +DimensionGeometry TechDraw::isValidSingleFace3d(DrawViewPart* dvp, const ReferenceEntry& ref) { (void)dvp; //the Name starts with "Edge" @@ -500,7 +499,7 @@ DimensionGeometry TechDraw::isValidSingleFace3d(DrawViewPart* dvp, ReferenceEntr //! verify that the edge references can make a dimension. Currently only extent //! dimensions support more than 2 edges -DimensionGeometry TechDraw::isValidMultiEdge(ReferenceVector refs) +DimensionGeometry TechDraw::isValidMultiEdge(const ReferenceVector& refs) { //there has to be at least 2 if (refs.size() < 2) { @@ -551,7 +550,7 @@ DimensionGeometry TechDraw::isValidMultiEdge(ReferenceVector refs) //! verify that the edge references can make a dimension. Currently only extent //! dimensions support more than 2 edges -DimensionGeometry TechDraw::isValidMultiEdge3d(DrawViewPart* dvp, ReferenceVector refs) +DimensionGeometry TechDraw::isValidMultiEdge3d(DrawViewPart* dvp, const ReferenceVector& refs) { (void)dvp; //there has to be at least 2 @@ -615,9 +614,9 @@ DimensionGeometry TechDraw::isValidMultiEdge3d(DrawViewPart* dvp, ReferenceVecto } //! verify that the vertex references can make a dimension -DimensionGeometry TechDraw::isValidVertexes(ReferenceVector refs) +DimensionGeometry TechDraw::isValidVertexes(const ReferenceVector& refs) { - TechDraw::DrawViewPart* dvp(dynamic_cast(refs.front().getObject())); + auto* dvp(dynamic_cast(refs.front().getObject())); if (!dvp) { //probably redundant throw Base::RuntimeError("Logic error in isValidMultiEdge"); @@ -650,7 +649,7 @@ DimensionGeometry TechDraw::isValidVertexes(ReferenceVector refs) } //! verify that the vertex references can make a dimension -DimensionGeometry TechDraw::isValidVertexes3d(DrawViewPart* dvp, ReferenceVector refs) +DimensionGeometry TechDraw::isValidVertexes3d(DrawViewPart* dvp, const ReferenceVector& refs) { (void)dvp; const std::string matchToken{"Vertex"}; @@ -672,8 +671,9 @@ DimensionGeometry TechDraw::isValidVertexes3d(DrawViewPart* dvp, ReferenceVector point1 = dvp->projectPoint(point1); Base::Vector3d line = point1 - point0; if (fabs(line.y) < FLT_EPSILON) { - return DimensionGeometry::isHorizontal; - } else if (fabs(line.x) < FLT_EPSILON) { + return DimensionGeometry::isVertical; + } + if (fabs(line.x) < FLT_EPSILON) { return DimensionGeometry::isHorizontal; // } else if(fabs(line.z) < FLT_EPSILON) { // return isZLimited; @@ -691,7 +691,7 @@ DimensionGeometry TechDraw::isValidVertexes3d(DrawViewPart* dvp, ReferenceVector } //! verify that the mixed bag (ex Vertex-Edge) of references can make a dimension -DimensionGeometry TechDraw::isValidHybrid(ReferenceVector refs) +DimensionGeometry TechDraw::isValidHybrid(const ReferenceVector& refs) { if (refs.empty()) { return DimensionGeometry::isInvalid; @@ -716,7 +716,7 @@ DimensionGeometry TechDraw::isValidHybrid(ReferenceVector refs) } //! verify that the mixed bag (ex Vertex-Edge) of references can make a dimension -DimensionGeometry TechDraw::isValidHybrid3d(DrawViewPart* dvp, ReferenceVector refs) +DimensionGeometry TechDraw::isValidHybrid3d(DrawViewPart* dvp, const ReferenceVector& refs) { (void)dvp; //we can reuse the 2d check here. @@ -745,9 +745,11 @@ long int TechDraw::mapGeometryTypeToDimType(long int dimType, DimensionGeometry case DimensionGeometry::isAngle3Pt: return DrawViewDimension::Angle3Pt; default: - break; // For all other cases, return dimType + return dimType; } - } else if (geometry2d != DimensionGeometry::isViewReference) { + } + + if (geometry2d != DimensionGeometry::isViewReference) { switch (geometry2d) { case DimensionGeometry::isDiagonal: return DrawViewDimension::Distance; @@ -763,6 +765,7 @@ long int TechDraw::mapGeometryTypeToDimType(long int dimType, DimensionGeometry break; // For all other cases, return dimType } } + return dimType; } diff --git a/src/Mod/TechDraw/Gui/DimensionValidators.h b/src/Mod/TechDraw/Gui/DimensionValidators.h index f70ec0663b..29bfa64107 100644 --- a/src/Mod/TechDraw/Gui/DimensionValidators.h +++ b/src/Mod/TechDraw/Gui/DimensionValidators.h @@ -74,27 +74,27 @@ DimensionGeometry validateDimSelection3d(DrawViewPart* dvp, const std::vector& minimumCounts, //how many of each geometry are needed for a good dimension const std::vector& acceptableDimensionGeometrys);//isVertical, isHorizontal, ... -bool validateSubnameList(StringVector subNames, GeometrySet acceptableGeometrySet); +bool validateSubnameList(const StringVector& subNames, GeometrySet acceptableGeometrySet); DimensionGeometry getGeometryConfiguration(ReferenceVector valid2dReferences); DimensionGeometry getGeometryConfiguration3d(DrawViewPart* dvp, - ReferenceVector valid3dReferences); + const ReferenceVector& valid3dReferences); GeomCountMap loadRequiredCounts(const StringVector& acceptableGeometry, const std::vector& minimumCouts); -bool checkGeometryOccurrences(StringVector subNames, GeomCountMap keyedMinimumCounts); +bool checkGeometryOccurrences(const StringVector& subNames, GeomCountMap keyedMinimumCounts); -DimensionGeometry isValidVertexes(ReferenceVector refs); -DimensionGeometry isValidMultiEdge(ReferenceVector refs); -DimensionGeometry isValidSingleEdge(ReferenceEntry ref); -DimensionGeometry isValidSingleFace(ReferenceEntry ref); -DimensionGeometry isValidHybrid(ReferenceVector refs); +DimensionGeometry isValidVertexes(const ReferenceVector& refs); +DimensionGeometry isValidMultiEdge(const ReferenceVector& refs); +DimensionGeometry isValidSingleEdge(const ReferenceEntry& ref); +DimensionGeometry isValidSingleFace(const ReferenceEntry& ref); +DimensionGeometry isValidHybrid(const ReferenceVector& refs); -DimensionGeometry isValidVertexes3d(DrawViewPart* dvp, ReferenceVector refs); -DimensionGeometry isValidMultiEdge3d(DrawViewPart* dvp, ReferenceVector refs); -DimensionGeometry isValidSingleEdge3d(DrawViewPart* dvp, ReferenceEntry ref); -DimensionGeometry isValidSingleFace3d(DrawViewPart* dvp, ReferenceEntry ref); -DimensionGeometry isValidHybrid3d(DrawViewPart* dvp, ReferenceVector refs); +DimensionGeometry isValidVertexes3d(DrawViewPart* dvp, const ReferenceVector& refs); +DimensionGeometry isValidMultiEdge3d(DrawViewPart* dvp, const ReferenceVector& refs); +DimensionGeometry isValidSingleEdge3d(DrawViewPart* dvp, const ReferenceEntry& ref); +DimensionGeometry isValidSingleFace3d(DrawViewPart* dvp, const ReferenceEntry& ref); +DimensionGeometry isValidHybrid3d(DrawViewPart* dvp, const ReferenceVector& refs); long int mapGeometryTypeToDimType(long int dimType, DimensionGeometry geometry2d, DimensionGeometry geometry3d);