X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomAlgoAPI%2FGeomAlgoAPI_Placement.h;h=7fa31bcd55e2c40c5c0396f45f07b47b380c33a4;hb=f0cec241aae9ca16d86e166f45cb5c4987d2c792;hp=1e1e88e49c1e045a0fb968ce331dec0ec2b4ef95;hpb=9aad36a6b453e73b05356af4662a66a32cb71f1e;p=modules%2Fshaper.git

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_Placement.h b/src/GeomAlgoAPI/GeomAlgoAPI_Placement.h
index 1e1e88e49..7fa31bcd5 100644
--- a/src/GeomAlgoAPI/GeomAlgoAPI_Placement.h
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_Placement.h
@@ -8,57 +8,36 @@
 #define GeomAlgoAPI_Placement_H_
 
 #include <GeomAlgoAPI.h>
-#include <GeomAPI_Shape.h>
-#include <GeomAPI_Dir.h>
-#include <GeomAPI_Face.h>
 #include <GeomAlgoAPI_MakeShape.h>
-#include <GeomAPI_DataMapOfShapeShape.h>
-#include <memory>
 
-/**\class GeomAlgoAPI_Placement
- * \ingroup DataAlgo
- * \brief Creates the copied object which sub-element is placed on the given element
- */
-class GeomAlgoAPI_Placement : public GeomAPI_Interface
+#include <GeomAPI_Shape.h>
+#include <GeomAPI_Trsf.h>
+
+/// \class GeomAlgoAPI_Placement
+/// \ingroup DataAlgo
+/// \brief Creates the copied object which sub-element is placed on the given element
+class GeomAlgoAPI_Placement : public GeomAlgoAPI_MakeShape
 {
 public:
-  /** \brief Creates an object which is obtained from current object by transformation calculated
-   *         as a movement of the source object to be coincident with the destination object
-   *  \param[in] theSourceSolid  a shape to be moved
-   *  \param[in] theDestSolid    invariant shape
-   *  \param[in] theSourceShape  a shape on the solid to be made coincident with destination object
-   *  \param[in] theDestShape    destination object
-   *  \param[in] theIsReverse    indicates that the solid materials should be on the same side against the destination plane
-   *  \param[in] theIsCentering  indicates the planes should be centered
-   */
-  GEOMALGOAPI_EXPORT GeomAlgoAPI_Placement(std::shared_ptr<GeomAPI_Shape> theSourceSolid,
-                                           std::shared_ptr<GeomAPI_Shape> theDestSolid,
-                                           std::shared_ptr<GeomAPI_Shape> theSourceShape,
-                                           std::shared_ptr<GeomAPI_Shape> theDestShape,
-                                           bool theIsReverse = false,
-                                           bool theIsCentering = false);
-
-  /// Returns True if algorithm succeed
-  GEOMALGOAPI_EXPORT const bool isDone() const
-  { return myDone; }
-
-  ///  Returns True if resulting shape is valid
-  GEOMALGOAPI_EXPORT const bool isValid() const;
-
-  /// Returns True if resulting shape has volume
-  GEOMALGOAPI_EXPORT const bool hasVolume() const;
-
-  /// Returns result of the Placement algorithm which may be a Solid or a Face
-  GEOMALGOAPI_EXPORT const std::shared_ptr<GeomAPI_Shape>& shape () const;
-
-  /// Returns map of sub-shapes of the result. To be used for History keeping
-  GEOMALGOAPI_EXPORT void  mapOfShapes (GeomAPI_DataMapOfShapeShape& theMap) const;
-
-  /// Return interface for for History processing
-  GEOMALGOAPI_EXPORT GeomAlgoAPI_MakeShape* makeShape () const;
-
-  /// Destructor
-  GEOMALGOAPI_EXPORT virtual ~GeomAlgoAPI_Placement();
+  /// \brief Creates an object which is obtained from current object by transformation calculated
+  ///        as a movement of the source object to be coincident with the destination object
+  /// \param[in] theSourceSolid  a shape to be moved
+  /// \param[in] theDestSolid    invariant shape
+  /// \param[in] theSourceShape  a shape on the solid to be made coincident with destination object
+  /// \param[in] theDestShape    destination object
+  /// \param[in] theIsReverse    indicates that the solid materials should be on the same side against the destination plane
+  /// \param[in] theIsCentering  indicates the planes should be centered
+  /// \param[in] theSimpleTransform makes just transformation of shape without changing of topology or geometry
+  GEOMALGOAPI_EXPORT GeomAlgoAPI_Placement(const std::shared_ptr<GeomAPI_Shape> theSourceSolid,
+                                           const std::shared_ptr<GeomAPI_Shape> theDestSolid,
+                                           const std::shared_ptr<GeomAPI_Shape> theSourceShape,
+                                           const std::shared_ptr<GeomAPI_Shape> theDestShape,
+                                           const bool theIsReverse = false,
+                                           const bool theIsCentering = false,
+                                           const bool theSimpleTransform = false);
+
+  /// Returns the simple transformation
+  GEOMALGOAPI_EXPORT std::shared_ptr<GeomAPI_Trsf> transformation() const;
 
 private:
   /// builds resulting shape
@@ -66,14 +45,12 @@ private:
              const std::shared_ptr<GeomAPI_Shape>& theDestSolid,
              const std::shared_ptr<GeomAPI_Shape>& theSourceShape,
              const std::shared_ptr<GeomAPI_Shape>& theDestShape,
-             bool theIsReverse,
-             bool theIsCentering);
+             const bool theIsReverse,
+             const bool theIsCentering,
+             const bool theSimpleTransform);
 
-  /// fields
-  bool myDone;
-  std::shared_ptr<GeomAPI_Shape> myShape;
-  GeomAPI_DataMapOfShapeShape myMap;
-  GeomAlgoAPI_MakeShape * myMkShape;
+private:
+  std::shared_ptr<GeomAPI_Trsf> myTrsf; ///< transformation of the shape in case theSimpleTransform
 };
 
 #endif