From 3ca4af54bc24494fa2c0d1c903f145631c143929 Mon Sep 17 00:00:00 2001 From: mpv Date: Wed, 2 Oct 2019 13:51:12 +0300 Subject: [PATCH] Fixing the coding rules issues. --- src/FeaturesPlugin/FeaturesPlugin_Chamfer.cpp | 12 ++++--- src/GeomAlgoAPI/GeomAlgoAPI_Chamfer.cpp | 28 +++++++-------- src/GeomAlgoAPI/GeomAlgoAPI_Chamfer.h | 36 ++++++++++--------- 3 files changed, 42 insertions(+), 34 deletions(-) diff --git a/src/FeaturesPlugin/FeaturesPlugin_Chamfer.cpp b/src/FeaturesPlugin/FeaturesPlugin_Chamfer.cpp index 0419b57e0..ecfc217e4 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_Chamfer.cpp +++ b/src/FeaturesPlugin/FeaturesPlugin_Chamfer.cpp @@ -87,8 +87,10 @@ FeaturesPlugin_Chamfer::FeaturesPlugin_Chamfer() void FeaturesPlugin_Chamfer::initAttributes() { - data()->addAttribute(FeaturesPlugin_Chamfer::CREATION_METHOD(), ModelAPI_AttributeString::typeId()); - data()->addAttribute(FeaturesPlugin_Chamfer::OBJECT_LIST_ID(), ModelAPI_AttributeSelectionList::typeId()); + data()->addAttribute(FeaturesPlugin_Chamfer::CREATION_METHOD(), + ModelAPI_AttributeString::typeId()); + data()->addAttribute(FeaturesPlugin_Chamfer::OBJECT_LIST_ID(), + ModelAPI_AttributeSelectionList::typeId()); data()->addAttribute(FeaturesPlugin_Chamfer::D1_ID(), ModelAPI_AttributeDouble::typeId()); data()->addAttribute(FeaturesPlugin_Chamfer::D2_ID(), ModelAPI_AttributeDouble::typeId()); data()->addAttribute(FeaturesPlugin_Chamfer::D_ID(), ModelAPI_AttributeDouble::typeId()); @@ -185,9 +187,11 @@ void FeaturesPlugin_Chamfer::execute() ListOfShape aFilletEdges = selectEdges(aFilletEdgesAndVertices); if (aCreationMethod->value() == CREATION_METHOD_DISTANCE_DISTANCE()) { - aChamferBuilder.reset(new GeomAlgoAPI_Chamfer(aSolid, aFilletEdges, aMapEdgeFace, true, aD1, aD2)); + aChamferBuilder.reset(new GeomAlgoAPI_Chamfer( + aSolid, aFilletEdges, aMapEdgeFace, true, aD1, aD2)); } else { - aChamferBuilder.reset(new GeomAlgoAPI_Chamfer(aSolid, aFilletEdges, aMapEdgeFace, false, aD, anAngle)); + aChamferBuilder.reset(new GeomAlgoAPI_Chamfer( + aSolid, aFilletEdges, aMapEdgeFace, false, aD, anAngle)); } if (GeomAlgoAPI_Tools::AlgoError::isAlgorithmFailed(aChamferBuilder, getKind(), anError)) { diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_Chamfer.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_Chamfer.cpp index ecba849a9..ef52c2393 100644 --- a/src/GeomAlgoAPI/GeomAlgoAPI_Chamfer.cpp +++ b/src/GeomAlgoAPI/GeomAlgoAPI_Chamfer.cpp @@ -30,21 +30,21 @@ //================================================================================================= GeomAlgoAPI_Chamfer::GeomAlgoAPI_Chamfer(const GeomShapePtr& theBaseSolid, const ListOfShape& theChamferShapes, - const std::map aMapEdgeFace, + const std::map theMapEdgeFace, const bool performDistances, - const double aVal1, - const double aVal2) + const double theVal1, + const double theVal2) { - build(theBaseSolid, theChamferShapes, aMapEdgeFace, performDistances, aVal1, aVal2); + build(theBaseSolid, theChamferShapes, theMapEdgeFace, performDistances, theVal1, theVal2); } //================================================================================================= void GeomAlgoAPI_Chamfer::build(const GeomShapePtr& theBaseSolid, const ListOfShape& theChamferShapes, - const std::map aMapEdgeFace, + const std::map theMapEdgeFace, const bool performDistances, - const double aVal1, - const double aVal2) + const double theVal1, + const double theVal2) { TopoDS_Shape aShapeBase = theBaseSolid->impl(); TopTools_IndexedDataMapOfShapeListOfShape M; @@ -60,24 +60,24 @@ void GeomAlgoAPI_Chamfer::build(const GeomShapePtr& theBaseSolid, anIt != theChamferShapes.end(); ++anIt) { if ((*anIt)->isEdge()) { TopoDS_Edge E = (*anIt)->impl(); - if (aMapEdgeFace.find(*anIt) != aMapEdgeFace.end()) { - //TopoDS_Face F = (aMapEdgeFace[*anIt])->impl(); - TopoDS_Face F = (aMapEdgeFace.at(*anIt))->impl(); + if (theMapEdgeFace.find(*anIt) != theMapEdgeFace.end()) { + //TopoDS_Face F = (theMapEdgeFace[*anIt])->impl(); + TopoDS_Face F = (theMapEdgeFace.at(*anIt))->impl(); if (!BRepTools::IsReallyClosed(E,F) && !BRep_Tool::Degenerated(E) && M.FindFromKey(E).Extent() == 2) { if (performDistances) { - aChamferBuilder->Add(aVal1, aVal2, E, F); + aChamferBuilder->Add(theVal1, theVal2, E, F); } else { - aChamferBuilder->AddDA(aVal1, aVal2 * M_PI / 180., E, F); + aChamferBuilder->AddDA(theVal1, theVal2 * M_PI / 180., E, F); } } } else { const TopTools_ListOfShape& aFacesList = M.FindFromKey(E); TopoDS_Face F = TopoDS::Face(aFacesList.First()); if (performDistances) { - aChamferBuilder->Add(aVal1, aVal2, E, F); + aChamferBuilder->Add(theVal1, theVal2, E, F); } else { - aChamferBuilder->AddDA(aVal1, aVal2 * M_PI / 180., E, F); + aChamferBuilder->AddDA(theVal1, theVal2 * M_PI / 180., E, F); } } } diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_Chamfer.h b/src/GeomAlgoAPI/GeomAlgoAPI_Chamfer.h index 4061ef24f..a5f97e300 100644 --- a/src/GeomAlgoAPI/GeomAlgoAPI_Chamfer.h +++ b/src/GeomAlgoAPI/GeomAlgoAPI_Chamfer.h @@ -36,31 +36,35 @@ public: /// Run chamfer operation with two distances or with a distance and an angle . /// \param theBaseSolid a changing solid /// \param theChamferShapes list of edges the chamfer is performed on - /// \param aMapEdgeFace map that associates an edge to a face when the chamfer is applied to a face - /// \param performDistances boolean that indicates whether the operation is performed with two distances or not - /// \param aVal1 double D1 if performDistances is true or D - /// \param aVal2 double D2 if performDistances is true or Angle + /// \param theMapEdgeFace map that associates an edge to a face when the chamfer is applied + /// to a face + /// \param performDistances boolean that indicates whether the operation is performed with + /// two distances or not + /// \param theVal1 double D1 if performDistances is true or D + /// \param theVal2 double D2 if performDistances is true or Angle GEOMALGOAPI_EXPORT GeomAlgoAPI_Chamfer(const GeomShapePtr& theBaseSolid, const ListOfShape& theChamferShapes, - const std::map aMapEdgeFace, + const std::map theMapEdgeFace, const bool performDistances, - const double aVal1, - const double aVal2); + const double theVal1, + const double theVal2); private: /// Perform chamfer operation. - /// \param theBaseSolid a changing solid - /// \param theChamferShapes list of edges the chamfer is performed on - /// \param aMapEdgeFace map that associates an edge to a face when the chamfer is applied to a face - /// \param performDistances boolean that indicates whether the operation is performed with two distances or not - /// \param aVal1 double D1 if performDistances is true or D - /// \param aVal2 double D2 if performDistances is true or Angle + /// \param theBaseSolid a changing solid + /// \param theChamferShapes list of edges the chamfer is performed on + /// \param theMapEdgeFace map that associates an edge to a face when the chamfer is applied + /// to a face + /// \param performDistances boolean that indicates whether the operation is performed with two + /// distances or not + /// \param theVal1 double D1 if performDistances is true or D + /// \param theVal2 double D2 if performDistances is true or Angle GEOMALGOAPI_EXPORT void build(const GeomShapePtr& theBaseSolid, const ListOfShape& theChamferShapes, - const std::map aMapEdgeFace, + const std::map theMapEdgeFace, const bool performDistances, - const double aVal1, - const double aVal2); + const double theVal1, + const double theVal2); }; #endif -- 2.39.2