X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2FGeomAlgoAPI%2FGeomAlgoAPI_Translation.h;h=32aaf1dec844a37d2e11f07808b04e91e8109211;hb=80bda53bbcc350bdb7b6b5f4c25ab8e817f565d7;hp=fe6f0a7d67ed482e16b347854083dd5c5448af37;hpb=81cc2c23e3109a51d178e63fe5b8a0a4625287b6;p=modules%2Fshaper.git

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_Translation.h b/src/GeomAlgoAPI/GeomAlgoAPI_Translation.h
index fe6f0a7d6..32aaf1dec 100644
--- a/src/GeomAlgoAPI/GeomAlgoAPI_Translation.h
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_Translation.h
@@ -1,33 +1,37 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        GeomAlgoAPI_Translation.h
-// Created:     8 June 2015
-// Author:      Dmitry Bobylev
+// Copyright (C) 2014-2020  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 GeomAlgoAPI_Translation_H_
 #define GeomAlgoAPI_Translation_H_
 
 #include <GeomAlgoAPI.h>
-#include <GeomAlgoAPI_MakeShape.h>
+#include <GeomAlgoAPI_Transform.h>
 
-#include <GeomAPI_Ax1.h>
-#include <GeomAPI_Shape.h>
+class GeomAPI_Ax1;
+class GeomAPI_Pnt;
 
 /// \class GeomAlgoAPI_Translation
 /// \ingroup DataAlgo
 /// \brief Creates a copy of the object by moving it along the axis.
-class GeomAlgoAPI_Translation : public GeomAlgoAPI_MakeShape
+class GeomAlgoAPI_Translation : public GeomAlgoAPI_Transform
 {
 public:
-  /// Type of translation operation
-  enum MethodType {
-    BY_DISTANCE, ///< Translation by axis and distance
-    BY_DIM,      ///< Translation by dimensions in X, Y and Z
-    BY_POINTS    ///< Translation by two points
-  };
-  
   /// \brief Creates an object which is obtained from current object by moving it along the axis.
   /// \param[in] theSourceShape  a shape to be moved.
   /// \param[in] theAxis         movement axis.
@@ -35,8 +39,8 @@ public:
   GEOMALGOAPI_EXPORT GeomAlgoAPI_Translation(std::shared_ptr<GeomAPI_Shape> theSourceShape,
                                              std::shared_ptr<GeomAPI_Ax1>   theAxis,
                                              double                         theDistance);
-  
-  /// \brief Creates an object which is obtained from current object by moving it along a vector 
+
+  /// \brief Creates an object which is obtained from current object by moving it along a vector
   ///        defined by its dimensions in X, Y and Z.
   /// \param[in] theSourceShape  the shape to be moved.
   /// \param[in] theDX           the movement dimension in X.
@@ -46,21 +50,15 @@ public:
                                              double                         theDx,
                                              double                         theDy,
                                              double                         theDz);
-  
-  /// Checks if data for the translation execution is OK.
-  GEOMALGOAPI_EXPORT bool check();
-  
-  /// Execute the translation.
-  GEOMALGOAPI_EXPORT void build();
 
-private:
-  MethodType myMethodType; /// Type of method used.
-  std::shared_ptr<GeomAPI_Shape> mySourceShape; /// Shape to be moved.
-  std::shared_ptr<GeomAPI_Ax1> myAxis; /// Movement axis.
-  double myDistance; /// Movement distance.
-  double myDx; /// Movement dimension on X.
-  double myDy; /// Movement dimension on Y.
-  double myDz; /// Movement dimension on Z.
+  /// \brief Creates an object which is obtained from current object by moving it along a vector
+  ///        defined by two points.
+  /// \param[in] theSourceShape  the shape to be moved.
+  /// \param[in] theStartPoint   the movement start point.
+  /// \param[in] theEndPoint     the movement end point.
+  GEOMALGOAPI_EXPORT GeomAlgoAPI_Translation(std::shared_ptr<GeomAPI_Shape> theSourceShape,
+                                             std::shared_ptr<GeomAPI_Pnt>   theStartPoint,
+                                             std::shared_ptr<GeomAPI_Pnt>   theEndPoint);
 };
 
 #endif