Revert "First phase of SketchSolver refactoring"

[modules/shaper.git] / src / SketchSolver / SketchSolver_ConstraintMultiRotation.h

diff --git a/src/SketchSolver/SketchSolver_ConstraintMultiRotation.h b/src/SketchSolver/SketchSolver_ConstraintMultiRotation.h
index 8ebda4584f969c6c978ce896694ccb4c32abb125..86966e522110d56d67cc83212aa824b9c77779be 100644 (file)
--- a/src/SketchSolver/SketchSolver_ConstraintMultiRotation.h
+++ b/src/SketchSolver/SketchSolver_ConstraintMultiRotation.h
@@ -22,19 +22,21 @@ public:
       SketchSolver_ConstraintMulti(theConstraint)
   {}
 
-////  virtual int getType() const
-////  { return SLVS_C_MULTI_ROTATION; }
+  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   central point of rotation
+  /// \param[out] theCenter   ID of central point of rotation
   /// \param[out] theAngle    rotation angle
-  /// \param[out] theEntities list of entities and their rotated copies
-  void getAttributes(EntityWrapperPtr& theCenter, double& theAngle,
-                     std::list< std::list<EntityWrapperPtr> >& theEntities);
+  /// \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);
 
   /// \brief This method is used in derived objects to check consistence of constraint.
   virtual void adjustConstraint();
@@ -42,24 +44,24 @@ 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 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
+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 cosine of rotation angle
+
+  double myCenterCoord[2]; ///< coordinates of rotation center
+  double myRotationVal[2]; ///< sinus and cosinus of rotation angle
 };
 
 #endif