X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchSolver%2FSketchSolver_ConstraintMultiRotation.h;h=10087cc67b6b124ca5804b82fc2e668c303bd68f;hb=4f565b2204d3fba046aa8c851abada2a5a17bf6c;hp=94355ba5bf2777876ad5cf7918de579091b19f8e;hpb=d4c4c30796ce288f2e81205e0555457542f2e5be;p=modules%2Fshaper.git

diff --git a/src/SketchSolver/SketchSolver_ConstraintMultiRotation.h b/src/SketchSolver/SketchSolver_ConstraintMultiRotation.h
index 94355ba5b..10087cc67 100644
--- a/src/SketchSolver/SketchSolver_ConstraintMultiRotation.h
+++ b/src/SketchSolver/SketchSolver_ConstraintMultiRotation.h
@@ -10,6 +10,8 @@
 #include "SketchSolver.h"
 #include <SketchSolver_ConstraintMulti.h>
 
+#include "GeomDataAPI_Point2D.h"
+
 /** \class   SketchSolver_ConstraintMultiRotation
  *  \ingroup Plugins
  *  \brief   Convert rotated features to the list of SolveSpace constraints
@@ -17,25 +19,22 @@
 class SketchSolver_ConstraintMultiRotation : public SketchSolver_ConstraintMulti
 {
 public:
+  /// Constructor based on SketchPlugin constraint
   SketchSolver_ConstraintMultiRotation(ConstraintPtr theConstraint) :
       SketchSolver_ConstraintMulti(theConstraint)
   {}
 
-  virtual int getType() const
-  { return SLVS_C_MULTI_ROTATION; }
-
 protected:
   /// \brief Converts SketchPlugin constraint to a list of SolveSpace constraints
   virtual void process();
 
   /// \brief Generate list of rotated entities
-  /// \param[out] theCenter   ID of central point of rotation
+  /// \param[out] theCenter   central point of rotation
   /// \param[out] theAngle    rotation angle
-  /// \param[out] thePoints   list of IDs of initial points and their rotated copies
-  /// \param[out] theEntities list of IDs of entities and their rotated copies
-  void getAttributes(Slvs_hEntity& theCenter, double& theAngle,
-                     std::vector< std::vector<Slvs_hEntity> >& thePoints,
-                     std::vector< std::vector<Slvs_hEntity> >& theEntities);
+  /// \param[out] theFullValue  applying translation using the disstance as a full or single value
+  /// \param[out] theEntities list of base entities
+  void getAttributes(EntityWrapperPtr& theCenter, double& theAngle, bool& theFullValue,
+                     std::list<EntityWrapperPtr>& theEntities);
 
   /// \brief This method is used in derived objects to check consistence of constraint.
   virtual void adjustConstraint();
@@ -51,16 +50,15 @@ private:
   /// \brief Apply transformation for relative coordinates
   virtual void transformRelative(double& theX, double& theY);
 
-private:
   /// \brief Returns name of NUMBER_OF_COPIES parameter for corresponding feature
-  virtual const std::string& nameNbCopies();
+  virtual const std::string& nameNbObjects();
 
 private:
-  Slvs_hEntity myRotationCenter; ///< ID of center of rotation
-  double       myAngle;           ///< angle of rotation
+  AttributePoint2DPtr myCenterPointAttribute; ///< a center of rotation
+  double              myAngle;           ///< angle of rotation
 
   double myCenterCoord[2]; ///< coordinates of rotation center
-  double myRotationVal[2]; ///< sinus and cosinus of rotation angle
+  double myRotationVal[2]; ///< sinus and cosine of rotation angle
 };
 
 #endif