X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2FFeaturesPlugin_Rotation.h;h=ce064ca2176c484f32f38380680ed0c904dea0c8;hb=95bf0a0de36129d80569e2b4634650b9cc38733e;hp=57316316603250344466403abca713cc1103d097;hpb=2ba159c01a53a7810d82ec5795b4b3be96308fdf;p=modules%2Fshaper.git

diff --git a/src/FeaturesPlugin/FeaturesPlugin_Rotation.h b/src/FeaturesPlugin/FeaturesPlugin_Rotation.h
index 573163166..ce064ca21 100755
--- a/src/FeaturesPlugin/FeaturesPlugin_Rotation.h
+++ b/src/FeaturesPlugin/FeaturesPlugin_Rotation.h
@@ -1,8 +1,22 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        FeaturesPlugin_Rotation.h
-// Created:     12 May 2015
-// Author:      Dmitry Bobylev
+// Copyright (C) 2014-2017  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<mailto:webmaster.salome@opencascade.com>
+//
 
 #ifndef FeaturesPlugin_Rotation_H_
 #define FeaturesPlugin_Rotation_H_
@@ -13,10 +27,9 @@
 
 #include <GeomAlgoAPI_Rotation.h>
 
-/** \class FeaturesPlugin_Rotation
- *  \ingroup Plugins
- *  \brief Feature for rotation objects around the axis.
- */
+/// \class FeaturesPlugin_Rotation
+/// \ingroup Plugins
+/// \brief Feature for rotation objects around the axis.
 class FeaturesPlugin_Rotation : public ModelAPI_Feature
 {
  public:
@@ -27,6 +40,27 @@ class FeaturesPlugin_Rotation : public ModelAPI_Feature
     return MY_ROTATION_ID;
   }
 
+  /// Attribute name for creation method.
+  inline static const std::string& CREATION_METHOD()
+  {
+    static const std::string MY_CREATION_METHOD_ID("CreationMethod");
+    return MY_CREATION_METHOD_ID;
+  }
+
+  /// Attribute name for creation method "ByAxisAndAngle".
+  inline static const std::string& CREATION_METHOD_BY_ANGLE()
+  {
+    static const std::string MY_CREATION_METHOD_ID("ByAxisAndAngle");
+    return MY_CREATION_METHOD_ID;
+  }
+
+  /// Attribute name for creation method "ByThreePoints".
+  inline static const std::string& CREATION_METHOD_BY_THREE_POINTS()
+  {
+    static const std::string MY_CREATION_METHOD_ID("ByThreePoints");
+    return MY_CREATION_METHOD_ID;
+  }
+
   /// Attribute name of referenced objects.
   inline static const std::string& OBJECTS_LIST_ID()
   {
@@ -48,6 +82,27 @@ class FeaturesPlugin_Rotation : public ModelAPI_Feature
     return MY_ANGLE_ID;
   }
 
+  /// Attribute name of a center point.
+  inline static const std::string& CENTER_POINT_ID()
+  {
+    static const std::string MY_CENTER_POINT_ID("center_point");
+    return MY_CENTER_POINT_ID;
+  }
+
+  /// Attribute name of a center point.
+  inline static const std::string& START_POINT_ID()
+  {
+    static const std::string MY_START_POINT_ID("start_point");
+    return MY_START_POINT_ID;
+  }
+
+  /// Attribute name of a center point.
+  inline static const std::string& END_POINT_ID()
+  {
+    static const std::string MY_END_POINT_ID("end_point");
+    return MY_END_POINT_ID;
+  }
+
   /// \return the kind of a feature.
   FEATURESPLUGIN_EXPORT virtual const std::string& getKind()
   {
@@ -65,7 +120,13 @@ class FeaturesPlugin_Rotation : public ModelAPI_Feature
   FeaturesPlugin_Rotation();
 
 private:
-  void LoadNamingDS(const GeomAlgoAPI_Rotation& theRotaionAlgo,
+  ///Perform the rotation using an axis and an angle.
+  void performTranslationByAxisAndAngle();
+
+  ///Perform the rotation using a center and two points.
+  void performTranslationByThreePoints();
+
+  void loadNamingDS(GeomAlgoAPI_Rotation& theRotaionAlgo,
                     std::shared_ptr<ModelAPI_ResultBody> theResultBody,
                     std::shared_ptr<GeomAPI_Shape> theBaseShape);
 };