X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FFeaturesPlugin%2FFeaturesPlugin_Translation.h;h=88efef2ed74595a8587c7e4173490eb83129407e;hb=05e2e4a31fa248d71445c40e35eeafa44f5d3b1b;hp=da144ab2057eeb6e465f5450faae476c3335d0c1;hpb=2c892f5ecdcdbdce82da2b0bbd8f0c878971a076;p=modules%2Fshaper.git

diff --git a/src/FeaturesPlugin/FeaturesPlugin_Translation.h b/src/FeaturesPlugin/FeaturesPlugin_Translation.h
index da144ab20..88efef2ed 100644
--- a/src/FeaturesPlugin/FeaturesPlugin_Translation.h
+++ b/src/FeaturesPlugin/FeaturesPlugin_Translation.h
@@ -1,10 +1,21 @@
-// Copyright (C) 2014-2016 CEA/DEN, EDF R&D
-
-// File:        FeaturesPlugin_Translation.h
-// Created:     8 June 2015
-// Author:      Dmitry Bobylev
+// Copyright (C) 2014-2022  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
 //
-// Modified by Clarisse Genrault (CEA) : 17 Nov 2016
 
 #ifndef FeaturesPlugin_Translation_H_
 #define FeaturesPlugin_Translation_H_
@@ -13,7 +24,7 @@
 
 #include <ModelAPI_Feature.h>
 
-#include <GeomAlgoAPI_Translation.h>
+class GeomAPI_Trsf;
 
 /// \class FeaturesPlugin_Translation
 /// \ingroup Plugins
@@ -49,6 +60,13 @@ class FeaturesPlugin_Translation : public ModelAPI_Feature
     return MY_CREATION_METHOD_ID;
   }
 
+  /// Attribute name for creation method "ByTwoPoints".
+  inline static const std::string& CREATION_METHOD_BY_TWO_POINTS()
+  {
+    static const std::string MY_CREATION_METHOD_ID("ByTwoPoints");
+    return MY_CREATION_METHOD_ID;
+  }
+
   /// Attribute name of referenced objects.
   inline static const std::string& OBJECTS_LIST_ID()
   {
@@ -69,21 +87,21 @@ class FeaturesPlugin_Translation : public ModelAPI_Feature
     static const std::string MY_DISTANCE_ID("distance");
     return MY_DISTANCE_ID;
   }
-  
+
   /// Attribute name of dimension in X.
   inline static const std::string& DX_ID()
   {
     static const std::string MY_DX_ID("dx");
     return MY_DX_ID;
   }
-  
+
   /// Attribute name of dimension in Y.
   inline static const std::string& DY_ID()
   {
     static const std::string MY_DY_ID("dy");
     return MY_DY_ID;
   }
-  
+
   /// Attribute name of dimension in Z.
   inline static const std::string& DZ_ID()
   {
@@ -91,6 +109,20 @@ class FeaturesPlugin_Translation : public ModelAPI_Feature
     return MY_DZ_ID;
   }
 
+  /// Attribute name of start 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 end 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()
   {
@@ -98,7 +130,7 @@ class FeaturesPlugin_Translation : public ModelAPI_Feature
     return MY_KIND;
   }
 
-  /// Creates a new part document if needed.
+  /// Performs the algorithm and stores results it in the data structure.
   FEATURESPLUGIN_EXPORT virtual void execute();
 
   /// Request for initialization of data model of the feature: adding all attributes.
@@ -108,15 +140,17 @@ class FeaturesPlugin_Translation : public ModelAPI_Feature
   FeaturesPlugin_Translation();
 
 private:
-  ///Perform the translation using an axis and a distance.
-  void performTranslationByAxisAndDistance();
-  
-  ///Perform the translation using three dimensions X, Y and Z
-  void performTranslationByDimensions();
-  
-  void loadNamingDS(GeomAlgoAPI_Translation& theTranslationAlgo,
-                    std::shared_ptr<ModelAPI_ResultBody> theResultBody,
-                    std::shared_ptr<GeomAPI_Shape> theBaseShape);
+  /// Calculate the translation using an axis and a distance.
+  std::shared_ptr<GeomAPI_Trsf> translationByAxisAndDistance();
+
+  /// Calculate the translation using three dimensions X, Y and Z
+  std::shared_ptr<GeomAPI_Trsf> translationByDimensions();
+
+  /// Calculate the translation usind two points
+  std::shared_ptr<GeomAPI_Trsf> translationByTwoPoints();
+
+  /// Perform the translation
+  void performTranslation(const std::shared_ptr<GeomAPI_Trsf>& theTrsf);
 };
 
 #endif