X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPrimitivesAPI%2FPrimitivesAPI_Cylinder.cpp;h=36666e63264665dcd043dc69cfb9f21418e6431c;hb=fc72d43b677baa05ae7fd317346fd8b723b799ed;hp=debf4b0541fe06fbb6e3364ec746ef188a5589dd;hpb=45ea4b0ea4a0d15133b47d8e2bc55c8a24ed402e;p=modules%2Fshaper.git

diff --git a/src/PrimitivesAPI/PrimitivesAPI_Cylinder.cpp b/src/PrimitivesAPI/PrimitivesAPI_Cylinder.cpp
index debf4b054..36666e632 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-2023  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,13 +32,14 @@ PrimitivesAPI_Cylinder::PrimitivesAPI_Cylinder(const std::shared_ptr<ModelAPI_Fe
 
 //==================================================================================================
 PrimitivesAPI_Cylinder::PrimitivesAPI_Cylinder(const std::shared_ptr<ModelAPI_Feature>& 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()) {
+    fillAttribute(PrimitivesPlugin_Cylinder::CREATION_METHOD_CYLINDER(), creationMethod());
     fillAttribute(theBasePoint, basePoint());
     fillAttribute(theAxis, axis());
     setSizes(theRadius, theHeight);
@@ -34,14 +48,15 @@ PrimitivesAPI_Cylinder::PrimitivesAPI_Cylinder(const std::shared_ptr<ModelAPI_Fe
 
 //==================================================================================================
 PrimitivesAPI_Cylinder::PrimitivesAPI_Cylinder(const std::shared_ptr<ModelAPI_Feature>& 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()) {
+    fillAttribute(PrimitivesPlugin_Cylinder::CREATION_METHOD_CYLINDER_PORTION(), creationMethod());
     fillAttribute(theBasePoint, basePoint());
     fillAttribute(theAxis, axis());
     fillAttribute(theAngle, angle());
@@ -122,8 +137,8 @@ CylinderPtr addCylinder(const std::shared_ptr<ModelAPI_Document>& 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<ModelAPI_Feature> aFeature = thePart->addFeature(PrimitivesAPI_Cylinder::ID());
   return CylinderPtr(new PrimitivesAPI_Cylinder(aFeature, aBasePoint, anAxis,
                                                 theRadius, theHeight));
@@ -135,9 +150,9 @@ CylinderPtr addCylinder(const std::shared_ptr<ModelAPI_Document>& 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<ModelAPI_Feature> 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));
+}