X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchSolver%2FSketchSolver_ConstraintMultiRotation.h;h=6d241f92df261b2b2929157e667242f429b65ca6;hb=8cd56d486b6e96b8814002f9f0f4acadd6cea11b;hp=86966e522110d56d67cc83212aa824b9c77779be;hpb=8f10db487ef409d859a62aa6e2235a17d9b56723;p=modules%2Fshaper.git

diff --git a/src/SketchSolver/SketchSolver_ConstraintMultiRotation.h b/src/SketchSolver/SketchSolver_ConstraintMultiRotation.h
index 86966e522..6d241f92d 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
@@ -22,21 +24,17 @@ public:
       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 entities and their rotated copies
+  void getAttributes(EntityWrapperPtr& theCenter, double& theAngle, bool& theFullValue,
+                     std::list< std::list<EntityWrapperPtr> >& theEntities);
 
   /// \brief This method is used in derived objects to check consistence of constraint.
   virtual void adjustConstraint();
@@ -44,24 +42,13 @@ protected:
   /// \brief Update parameters (called from base class)
   virtual void updateLocal();
 
-private:
-  /// \brief Convert absolute coordinates to relative coordinates
-  virtual void getRelative(double theAbsX, double theAbsY, double& theRelX, double& theRelY);
-  /// \brief Convert relative coordinates to absolute coordinates
-  virtual void getAbsolute(double theRelX, double theRelY, double& theAbsX, double& theAbsY);
-  /// \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& nameNbObjects();
 
-private:
-  Slvs_hEntity myRotationCenter; ///< ID of center of rotation
-  double       myAngle;           ///< angle of rotation
-
-  double myCenterCoord[2]; ///< coordinates of rotation center
-  double myRotationVal[2]; ///< sinus and cosinus of rotation angle
+  AttributePoint2DPtr myCenterPointAttribute; ///< a center of rotation
+  double              myAngle;           ///< angle of rotation
+  bool                myIsFullValue;     ///< value whether the angle is a full or single for objects
 };
 
 #endif