X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomAlgoAPI%2FGeomAlgoAPI_Box.cpp;h=1dcc9fa97598539ecabe9f714740eba5ad9fd0ef;hb=f1fdc6c4b73b4f4c80c83c5a795e370ab0d7fc26;hp=8beb67f56b33b0266f40be7215b6efb48645836f;hpb=43d6338d29f7db73bf2ce8caf160b4c451afb81f;p=modules%2Fshaper.git diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_Box.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_Box.cpp index 8beb67f56..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) -: { 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 {