X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchSolver%2FSketchSolver_ConstraintMultiRotation.h;h=94355ba5bf2777876ad5cf7918de579091b19f8e;hb=23898b690da4986d891bde5b124bbcec7e8144f1;hp=e9d0bd14798726ae9362be3826538cbfd502a263;hpb=3d063c74ca0ff72184f77d74df198c3bf0730aff;p=modules%2Fshaper.git

diff --git a/src/SketchSolver/SketchSolver_ConstraintMultiRotation.h b/src/SketchSolver/SketchSolver_ConstraintMultiRotation.h
index e9d0bd147..94355ba5b 100644
--- a/src/SketchSolver/SketchSolver_ConstraintMultiRotation.h
+++ b/src/SketchSolver/SketchSolver_ConstraintMultiRotation.h
@@ -8,58 +8,59 @@
 #define SketchSolver_ConstraintMultiRotation_H_
 
 #include "SketchSolver.h"
-#include <SketchSolver_Constraint.h>
+#include <SketchSolver_ConstraintMulti.h>
 
 /** \class   SketchSolver_ConstraintMultiRotation
  *  \ingroup Plugins
  *  \brief   Convert rotated features to the list of SolveSpace constraints
  */
-class SketchSolver_ConstraintMultiRotation : public SketchSolver_Constraint
+class SketchSolver_ConstraintMultiRotation : public SketchSolver_ConstraintMulti
 {
 public:
   SketchSolver_ConstraintMultiRotation(ConstraintPtr theConstraint) :
-      SketchSolver_Constraint(theConstraint),
-      myNumberOfObjects(0),
-      myNumberOfCopies(0)
+      SketchSolver_ConstraintMulti(theConstraint)
   {}
 
   virtual int getType() const
   { return SLVS_C_MULTI_ROTATION; }
 
-  /// \brief Update constraint
-  virtual void update(ConstraintPtr theConstraint = ConstraintPtr());
-
-  /// \brief Tries to remove constraint
-  /// \return \c false, if current constraint contains another SketchPlugin constraints (like for multiple coincidence)
-  virtual bool remove(ConstraintPtr theConstraint = ConstraintPtr());
-
 protected:
   /// \brief Converts SketchPlugin constraint to a list of SolveSpace constraints
   virtual void process();
 
-  /// \brief Generate list of attributes of constraint in order useful for SolveSpace constraints
-  /// \param[out] theValue      numerical characteristic of constraint (e.g. distance)
-  /// \param[out] theAttributes list of attributes to be filled
-  virtual void getAttributes(double& theValue, std::vector<Slvs_hEntity>& theAttributes)
-  { /* do nothing here */ }
-
   /// \brief Generate list of rotated entities
   /// \param[out] theCenter   ID of central point of rotation
   /// \param[out] theAngle    rotation angle
   /// \param[out] thePoints   list of IDs of initial points and their rotated copies
-  /// \param[out] theCircular list of IDs of arcs and circles and their 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> >& theCircular);
+                     std::vector< std::vector<Slvs_hEntity> >& thePoints,
+                     std::vector< std::vector<Slvs_hEntity> >& theEntities);
 
   /// \brief This method is used in derived objects to check consistence of constraint.
   virtual void adjustConstraint();
 
+  /// \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& nameNbCopies();
+
 private:
-  size_t myNumberOfObjects; ///< number of previous initial objects
-  size_t myNumberOfCopies;  ///< number of previous copies of initial objects
   Slvs_hEntity myRotationCenter; ///< ID of center of rotation
-  double myAngle;           ///< angle of rotation
+  double       myAngle;           ///< angle of rotation
+
+  double myCenterCoord[2]; ///< coordinates of rotation center
+  double myRotationVal[2]; ///< sinus and cosinus of rotation angle
 };
 
 #endif