X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomAlgoAPI%2FGeomAlgoAPI_Cylinder.cpp;h=cf980671f9260643391e1e3703d606cf2b1a2c89;hb=97917d3698f5a2f7fc9596e7c755ff8f6751e373;hp=4ee724e50e60798fb092d570aa0756fc39467696;hpb=ccd1d538ff04366093c86220b22b53c4b7370f14;p=modules%2Fshaper.git diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_Cylinder.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_Cylinder.cpp index 4ee724e50..cf980671f 100644 --- a/src/GeomAlgoAPI/GeomAlgoAPI_Cylinder.cpp +++ b/src/GeomAlgoAPI/GeomAlgoAPI_Cylinder.cpp @@ -1,8 +1,21 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: GeomAlgoAPI_Cylinder.cpp -// Created: 05 Jan 2016 -// Author: Clarisse Genrault (CEA) +// Copyright (C) 2014-2019 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 @@ -13,20 +26,12 @@ #include -#include - -//================================================================================================= -GeomAlgoAPI_Cylinder::GeomAlgoAPI_Cylinder() -{ -} - //================================================================================================= GeomAlgoAPI_Cylinder::GeomAlgoAPI_Cylinder(std::shared_ptr theAxis, const double theRadius, const double theHeight) { withAngle = false; - //myBasePoint = theBasePoint; myAxis = theAxis; myRadius = theRadius; myHeight = theHeight; @@ -49,7 +54,7 @@ GeomAlgoAPI_Cylinder::GeomAlgoAPI_Cylinder(std::shared_ptr theAxis, bool GeomAlgoAPI_Cylinder::check() { if (!myAxis) { - myError = "Cylinder builder :: axis is invalid."; + myError = "Cylinder builder :: axis is not valid."; return false; } if (myRadius < Precision::Confusion()) { @@ -77,20 +82,21 @@ bool GeomAlgoAPI_Cylinder::check() void GeomAlgoAPI_Cylinder::build() { myCreatedFaces.clear(); - + const gp_Ax2& anAxis = myAxis->impl(); - + // Construct the cylinder BRepPrimAPI_MakeCylinder *aCylinderMaker; - + if (withAngle) { - aCylinderMaker = new BRepPrimAPI_MakeCylinder(anAxis, myRadius, myHeight, myAngle * M_PI / 180.); + aCylinderMaker = + new BRepPrimAPI_MakeCylinder(anAxis, myRadius, myHeight, myAngle * M_PI / 180.); } else { - aCylinderMaker = new BRepPrimAPI_MakeCylinder(anAxis, myRadius, myHeight); + aCylinderMaker = new BRepPrimAPI_MakeCylinder(anAxis, myRadius, myHeight); } - + aCylinderMaker->Build(); - + if (!aCylinderMaker->IsDone()) { return; } @@ -105,8 +111,8 @@ void GeomAlgoAPI_Cylinder::build() myError = "Cylinder builder :: resulting shape is null."; return; } - + setImpl(aCylinderMaker); - + setDone(true); }