Fixing the coding rules issues.

diff --git a/src/FeaturesPlugin/FeaturesPlugin_Chamfer.cpp b/src/FeaturesPlugin/FeaturesPlugin_Chamfer.cpp
index 47ebd45f1b2d0fb5cfa4cf34965c7e1650697044..a06099927213505d1066bf49bf0e9d7a3b768885 100644 (file)
--- 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 15fe660838fb4dfa279f62286ddbb999854918f6..e0e24bcb204e28dd6fd51c834afb4de92cf3aabd 100644 (file)
--- 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<GeomShapePtr, GeomShapePtr> aMapEdgeFace,
+                                         const std::map<GeomShapePtr, GeomShapePtr> 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<GeomShapePtr, GeomShapePtr> aMapEdgeFace,
+                                const std::map<GeomShapePtr, GeomShapePtr> theMapEdgeFace,
                                 const bool performDistances,
-                                const double aVal1,
-                                const double aVal2)
+                                const double theVal1,
+                                const double theVal2)
 {
   TopoDS_Shape aShapeBase = theBaseSolid->impl<TopoDS_Shape>();
   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<TopoDS_Edge>();
-      if (aMapEdgeFace.find(*anIt) != aMapEdgeFace.end()) {
-        //TopoDS_Face F = (aMapEdgeFace[*anIt])->impl<TopoDS_Face>();
-        TopoDS_Face F = (aMapEdgeFace.at(*anIt))->impl<TopoDS_Face>();
+      if (theMapEdgeFace.find(*anIt) != theMapEdgeFace.end()) {
+        //TopoDS_Face F = (theMapEdgeFace[*anIt])->impl<TopoDS_Face>();
+        TopoDS_Face F = (theMapEdgeFace.at(*anIt))->impl<TopoDS_Face>();
         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 034966bb71702d03f665655f80ff0c3064e54b29..4b2de3125a29d58577a5853e861d00378d9a089f 100644 (file)
--- 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<GeomShapePtr, GeomShapePtr> aMapEdgeFace,
+                                         const std::map<GeomShapePtr, GeomShapePtr> 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<GeomShapePtr, GeomShapePtr> aMapEdgeFace,
+                                const std::map<GeomShapePtr, GeomShapePtr> theMapEdgeFace,
                                 const bool performDistances,
-                                const double aVal1,
-                                const double aVal2);
+                                const double theVal1,
+                                const double theVal2);
 };
 
 #endif