Make the copies fixed in multi-rotation, multi-translation (issue #1471)

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

diff --git a/src/SketchSolver/SketchSolver_ConstraintMultiTranslation.h b/src/SketchSolver/SketchSolver_ConstraintMultiTranslation.h
index c9f10147def434dcc90e67d1937686b2e1bcf17b..7c93d6d0e156c29df701e66d74ee16713bd26568 100644 (file)
--- a/src/SketchSolver/SketchSolver_ConstraintMultiTranslation.h
+++ b/src/SketchSolver/SketchSolver_ConstraintMultiTranslation.h
@@ -10,6 +10,8 @@
 #include "SketchSolver.h"
 #include <SketchSolver_ConstraintMulti.h>
 
+#include "GeomDataAPI_Point2D.h"
+
 /** \class   SketchSolver_ConstraintMultiTranslation
  *  \ingroup Plugins
  *  \brief   Convert translated features to the list of SolveSpace constraints
@@ -19,32 +21,26 @@ class SketchSolver_ConstraintMultiTranslation : public SketchSolver_ConstraintMu
 public:
   /// Constructor based on SketchPlugin constraint
   SketchSolver_ConstraintMultiTranslation(ConstraintPtr theConstraint) :
-      SketchSolver_ConstraintMulti(theConstraint),
-      myTranslationLine(SLVS_E_UNKNOWN)
+      SketchSolver_ConstraintMulti(theConstraint)
   {}
 
-  virtual int getType() const
-  { return SLVS_C_MULTI_TRANSLATION; }
-
 protected:
   /// \brief Converts SketchPlugin constraint to a list of SolveSpace constraints
   virtual void process();
 
   /// \brief Generate list of translated entities
-  /// \param[out] theStartPoint ID of start point of translation
-  /// \param[out] theEndPoint   ID of final point of translation
-  /// \param[out] thePoints     list of IDs of initial points and their translated copies
-  /// \param[out] theEntities   list of IDs of entities and their translated copies
-  void getAttributes(Slvs_hEntity& theStartPoint, Slvs_hEntity& theEndPoint,
-                     std::vector< std::vector<Slvs_hEntity> >& thePoints,
-                     std::vector< std::vector<Slvs_hEntity> >& theEntities);
+  /// \param[out] theStartPoint start point of translation
+  /// \param[out] theEndPoint   final point of translation
+  /// \param[out] theFullValue  applying translation using the distance as a full or single value
+  /// \param[out] theEntities   list of base entities
+  void getAttributes(EntityWrapperPtr& theStartPoint, EntityWrapperPtr& theEndPoint,
+                     bool& theFullValue, std::list<EntityWrapperPtr>& 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()
-  {}
+  virtual void updateLocal();
 
 private:
   /// \brief Convert absolute coordinates to relative coordinates
@@ -54,12 +50,12 @@ 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& nameNbObjects();
 
 private:
-  Slvs_hEntity myTranslationLine; ///< ID of translation line
+  AttributePoint2DPtr myStartPointAttribute;
+  AttributePoint2DPtr myEndPointAttribute;
 
   double myDelta[2]; ///< increment of translation
 };