X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomAlgoAPI%2FGeomAlgoAPI_Box.cpp;h=1dcc9fa97598539ecabe9f714740eba5ad9fd0ef;hb=f1fdc6c4b73b4f4c80c83c5a795e370ab0d7fc26;hp=7543812f29e1b0bc3a4b1186c8bc383d00f6499b;hpb=8438647a5fb5186e3b5893fd69092792edef9ca8;p=modules%2Fshaper.git diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_Box.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_Box.cpp index 7543812f2..1dcc9fa97 100644 --- a/src/GeomAlgoAPI/GeomAlgoAPI_Box.cpp +++ b/src/GeomAlgoAPI/GeomAlgoAPI_Box.cpp @@ -1,8 +1,21 @@ -// Copyright (C) 2014-2016 CEA/DEN, EDF R&D - -// File: GeomAlgoAPI_Box.cpp -// Created: 10 Mar 2016 -// Author: Clarisse Genrault (CEA) +// Copyright (C) 2014-2021 CEA/DEN, EDF R&D +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include @@ -26,7 +39,6 @@ GeomAlgoAPI_Box::GeomAlgoAPI_Box(const double theDx, const double theDy, const d //================================================================================================= GeomAlgoAPI_Box::GeomAlgoAPI_Box(std::shared_ptr theFirstPoint, std::shared_ptr theSecondPoint) -:GeomAlgoAPI_Box() { myFirstPoint = theFirstPoint; mySecondPoint = theSecondPoint; @@ -38,22 +50,22 @@ bool GeomAlgoAPI_Box::check() { if (myMethodType == MethodType::BOX_DIM) { if (myDx < Precision::Confusion()) { - myError = "Box builder with dimensions :: Dx is null."; + myError = "Box builder with dimensions :: Dx is null or negative."; return false; } else if (myDy < Precision::Confusion()) { - myError = "Box builder with dimensions :: Dy is null."; + myError = "Box builder with dimensions :: Dy is null or negative."; return false; } else if (myDz < Precision::Confusion()) { - myError = "Box builder with dimensions :: Dz is null."; + myError = "Box builder with dimensions :: Dz is null or negative."; return false; } } else if (myMethodType == MethodType::BOX_POINTS) { if (!myFirstPoint.get()) { - myError = "Box builder with points :: the first point is not a correct"; + myError = "Box builder with points :: the first point is not valid."; return false; } if (!mySecondPoint.get()) { - myError = "Box builder with points :: the second point is not a correct"; + myError = "Box builder with points :: the second point is not valid."; return false; } if (myFirstPoint->distance(mySecondPoint) < Precision::Confusion()) { @@ -66,7 +78,8 @@ bool GeomAlgoAPI_Box::check() if (fabs(aDiffX) < Precision::Confusion() || fabs(aDiffY) < Precision::Confusion() || fabs(aDiffZ) < Precision::Confusion()) { - myError = "The points belong both to one of the OXY, OYZ or OZX planes"; + myError = + "Box builder with points :: the points belong both to one of the OXY, OYZ or OZX planes."; return false; } } else { @@ -93,66 +106,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 +178,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; }