X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPrimitivesAPI%2FPrimitivesAPI_Cylinder.cpp;h=94e21413002077e5e9d393889241ac79c885fc60;hb=59610176acaef6df307f9a2ec24fe3a14bfaef0b;hp=7d342b9141b112709f49a322f15698773a2e7fcf;hpb=9c3cac874af848af973114e20622b8dddb7947ab;p=modules%2Fshaper.git diff --git a/src/PrimitivesAPI/PrimitivesAPI_Cylinder.cpp b/src/PrimitivesAPI/PrimitivesAPI_Cylinder.cpp index 7d342b914..94e214130 100644 --- a/src/PrimitivesAPI/PrimitivesAPI_Cylinder.cpp +++ b/src/PrimitivesAPI/PrimitivesAPI_Cylinder.cpp @@ -1,8 +1,21 @@ -// Copyright (C) 2014-201x CEA/DEN, EDF R&D --> - -// File: PrimitivesAPI_Cylinder.cpp -// Created: 12 Jan 2017 -// Author: Clarisse Genrault +// 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 "PrimitivesAPI_Cylinder.h" @@ -19,10 +32,10 @@ PrimitivesAPI_Cylinder::PrimitivesAPI_Cylinder(const std::shared_ptr& theFeature, - const ModelHighAPI_Selection& theBasePoint, - const ModelHighAPI_Selection& theAxis, - const ModelHighAPI_Double& theRadius, - const ModelHighAPI_Double& theHeight) + const ModelHighAPI_Selection& theBasePoint, + const ModelHighAPI_Selection& theAxis, + const ModelHighAPI_Double& theRadius, + const ModelHighAPI_Double& theHeight) : ModelHighAPI_Interface(theFeature) { if (initialize()) { @@ -35,11 +48,11 @@ PrimitivesAPI_Cylinder::PrimitivesAPI_Cylinder(const std::shared_ptr& theFeature, - const ModelHighAPI_Selection& theBasePoint, - const ModelHighAPI_Selection& theAxis, - const ModelHighAPI_Double& theRadius, - const ModelHighAPI_Double& theHeight, - const ModelHighAPI_Double& theAngle) + const ModelHighAPI_Selection& theBasePoint, + const ModelHighAPI_Selection& theAxis, + const ModelHighAPI_Double& theRadius, + const ModelHighAPI_Double& theHeight, + const ModelHighAPI_Double& theAngle) : ModelHighAPI_Interface(theFeature) { if (initialize()) { @@ -124,8 +137,8 @@ CylinderPtr addCylinder(const std::shared_ptr& thePart, const ModelHighAPI_Double& theRadius, const ModelHighAPI_Double& theHeight) { - ModelHighAPI_Selection aBasePoint("VERT", "Origin"); - ModelHighAPI_Selection anAxis("EDGE", "OZ"); + ModelHighAPI_Selection aBasePoint("VERTEX", L"PartSet/Origin"); + ModelHighAPI_Selection anAxis("EDGE", L"PartSet/OZ"); std::shared_ptr aFeature = thePart->addFeature(PrimitivesAPI_Cylinder::ID()); return CylinderPtr(new PrimitivesAPI_Cylinder(aFeature, aBasePoint, anAxis, theRadius, theHeight)); @@ -137,9 +150,9 @@ CylinderPtr addCylinder(const std::shared_ptr& thePart, const ModelHighAPI_Double& theHeight, const ModelHighAPI_Double& theAngle) { - ModelHighAPI_Selection aBasePoint("VERT", "Origin"); - ModelHighAPI_Selection anAxis("EDGE", "OZ"); + ModelHighAPI_Selection aBasePoint("VERTEX", L"PartSet/Origin"); + ModelHighAPI_Selection anAxis("EDGE", L"PartSet/OZ"); std::shared_ptr aFeature = thePart->addFeature(PrimitivesAPI_Cylinder::ID()); return CylinderPtr(new PrimitivesAPI_Cylinder(aFeature, aBasePoint, anAxis, - theRadius, theHeight)); -} \ No newline at end of file + theRadius, theHeight, theAngle)); +}