From: Clarisse Genrault Date: Thu, 17 Nov 2016 08:55:45 +0000 (+0100) Subject: Deleting whitespace of endof lines. X-Git-Tag: V_2.6.0~84 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=7e5b8f1a137a13ad1eb2d7996274b85284a8e0d7;p=modules%2Fshaper.git Deleting whitespace of endof lines. --- diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_Box.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_Box.cpp index 7543812f2..7020115ab 100644 --- a/src/GeomAlgoAPI/GeomAlgoAPI_Box.cpp +++ b/src/GeomAlgoAPI/GeomAlgoAPI_Box.cpp @@ -93,66 +93,65 @@ void GeomAlgoAPI_Box::build() void GeomAlgoAPI_Box::buildWithDimensions() { myCreatedFaces.clear(); - + // Construct the box BRepPrimAPI_MakeBox *aBoxMaker = new BRepPrimAPI_MakeBox(myDx, myDy, myDz); aBoxMaker->Build(); - + // Test the algorithm if (!aBoxMaker->IsDone()) { myError = "Box builder with dimensions :: algorithm failed."; return; } - + TopoDS_Shape aResult = aBoxMaker->Shape(); std::shared_ptr aShape(new GeomAPI_Shape()); aShape->setImpl(new TopoDS_Shape(aResult)); setShape(aShape); - + // Test on the shapes if (!aShape.get() || aShape->isNull()) { myError = "Box builder with dimensions :: resulting shape is null."; return; } - + setImpl(aBoxMaker); - + setDone(true); } - //================================================================================================= void GeomAlgoAPI_Box::buildWithPoints() { myCreatedFaces.clear(); - + const gp_Pnt& aFirstPoint = myFirstPoint->impl(); const gp_Pnt& aSecondPoint = mySecondPoint->impl(); // Construct the box BRepPrimAPI_MakeBox *aBoxMaker = new BRepPrimAPI_MakeBox(aFirstPoint, aSecondPoint); aBoxMaker->Build(); - + // Test the algorithm if(!aBoxMaker->IsDone()) { myError = "Box builder with two points :: algorithm failed."; return; } - + TopoDS_Shape aResult = aBoxMaker->Shape(); - + std::shared_ptr aShape(new GeomAPI_Shape()); aShape->setImpl(new TopoDS_Shape(aResult)); setShape(aShape); - + // Tests on the shape if (!aShape.get() || aShape->isNull()) { myError = "Box builder with two points :: resulting shape is null."; return; } - + setImpl(aBoxMaker); - + setDone(true); } @@ -166,16 +165,16 @@ void GeomAlgoAPI_Box::prepareNamingFaces() std::shared_ptr aShapeBack(new GeomAPI_Shape); aShapeBack->setImpl(new TopoDS_Shape(aBoxMaker.BackFace())); myCreatedFaces["Back"] = aShapeBack; - std::shared_ptr aShapeTop(new GeomAPI_Shape); + std::shared_ptr aShapeTop(new GeomAPI_Shape); aShapeTop->setImpl(new TopoDS_Shape(aBoxMaker.TopFace())); myCreatedFaces["Top"] = aShapeTop; - std::shared_ptr aShapeBottom(new GeomAPI_Shape); + std::shared_ptr aShapeBottom(new GeomAPI_Shape); aShapeBottom->setImpl(new TopoDS_Shape(aBoxMaker.BottomFace())); myCreatedFaces["Bottom"] = aShapeBottom; - std::shared_ptr aShapeLeft(new GeomAPI_Shape); + std::shared_ptr aShapeLeft(new GeomAPI_Shape); aShapeLeft->setImpl(new TopoDS_Shape(aBoxMaker.LeftFace())); myCreatedFaces["Left"] = aShapeLeft; - std::shared_ptr aShapeRight(new GeomAPI_Shape); + std::shared_ptr aShapeRight(new GeomAPI_Shape); aShapeRight->setImpl(new TopoDS_Shape(aBoxMaker.RightFace())); myCreatedFaces["Right"] = aShapeRight; } diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_Box.h b/src/GeomAlgoAPI/GeomAlgoAPI_Box.h index c01213131..c47af8b46 100644 --- a/src/GeomAlgoAPI/GeomAlgoAPI_Box.h +++ b/src/GeomAlgoAPI/GeomAlgoAPI_Box.h @@ -22,27 +22,27 @@ class GeomAlgoAPI_Box : public GeomAlgoAPI_MakeShape BOX_DIM, ///< Box with dimensions BOX_POINTS, ///< Box with points }; - + GEOMALGOAPI_EXPORT GeomAlgoAPI_Box(); - + /// Creates a box using the dimensions. /// \param theDx The dimension on X /// \param theDy The dimension on Y /// \param theDz The dimension on Z GEOMALGOAPI_EXPORT GeomAlgoAPI_Box(const double theDx, const double theDy, const double theDz); - + /// Creates a box using the two points that defined a diagonal. /// \param theFirstPoint One extermity of the diagonal /// \param theSecondPoint The other extremity of the diagonal GEOMALGOAPI_EXPORT GeomAlgoAPI_Box(std::shared_ptr theFirstPoint, std::shared_ptr theSecondPoint); - + /// Checks if data for the box construction is OK. GEOMALGOAPI_EXPORT bool check(); - + /// Builds the box. GEOMALGOAPI_EXPORT void build(); - + /// Prepare the naming (redifined because it is specific for a box). GEOMALGOAPI_EXPORT void prepareNamingFaces(); @@ -51,7 +51,7 @@ class GeomAlgoAPI_Box : public GeomAlgoAPI_MakeShape void buildWithDimensions(); /// Builds the box with two points void buildWithPoints(); - + double myDx; /// Dimension on X to create a box. double myDy; /// Dimension on Y to create a box. double myDz; /// Dimension Z to create a box.