X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchSolver%2FSketchSolver_ConstraintMultiTranslation.h;h=7c93d6d0e156c29df701e66d74ee16713bd26568;hb=383021cb51c4720904096ca851db5ee79255b402;hp=10d44dbf1051eae40db2908622f0ee6b5acef943;hpb=58c49c9bea03fb99e7d94fdbe2f95516b76e593a;p=modules%2Fshaper.git

diff --git a/src/SketchSolver/SketchSolver_ConstraintMultiTranslation.h b/src/SketchSolver/SketchSolver_ConstraintMultiTranslation.h
index 10d44dbf1..7c93d6d0e 100644
--- a/src/SketchSolver/SketchSolver_ConstraintMultiTranslation.h
+++ b/src/SketchSolver/SketchSolver_ConstraintMultiTranslation.h
@@ -8,66 +8,56 @@
 #define SketchSolver_ConstraintMultiTranslation_H_
 
 #include "SketchSolver.h"
-#include <SketchSolver_Constraint.h>
+#include <SketchSolver_ConstraintMulti.h>
+
+#include "GeomDataAPI_Point2D.h"
 
 /** \class   SketchSolver_ConstraintMultiTranslation
  *  \ingroup Plugins
  *  \brief   Convert translated features to the list of SolveSpace constraints
  */
-class SketchSolver_ConstraintMultiTranslation : public SketchSolver_Constraint
+class SketchSolver_ConstraintMultiTranslation : public SketchSolver_ConstraintMulti
 {
 public:
+  /// Constructor based on SketchPlugin constraint
   SketchSolver_ConstraintMultiTranslation(ConstraintPtr theConstraint) :
-      SketchSolver_Constraint(theConstraint),
-      myNumberOfObjects(0),
-      myNumberOfCopies(0),
-      myTranslationLine(SLVS_E_UNKNOWN)
+      SketchSolver_ConstraintMulti(theConstraint)
   {}
 
-  virtual int getType() const
-  { return SLVS_C_MULTI_TRANSLATION; }
-
-  /// \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());
-
-  /// \brief Adds a feature to constraint and create its analogue in SolveSpace
-  virtual void addFeature(FeaturePtr theFeature);
-
 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 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();
+
+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);
+
+  /// \brief Returns name of NUMBER_OF_COPIES parameter for corresponding feature
+  virtual const std::string& nameNbObjects();
+
 private:
-  size_t myNumberOfObjects; ///< number of previous initial objects
-  size_t myNumberOfCopies;  ///< number of previous copies of initial objects
-  Slvs_hEntity myTranslationLine; ///< ID of translation line
-  std::vector< std::vector<Slvs_hEntity> > myPointsAndCopies; ///< list of initial points and their translated copies
-  std::vector< std::vector<Slvs_hEntity> > myCircsAndCopies;  ///< list of circles and their copies (to change their radii together)
+  AttributePoint2DPtr myStartPointAttribute;
+  AttributePoint2DPtr myEndPointAttribute;
 
-  std::set<Slvs_hEntity> myPointsJustUpdated; ///< list of points touched by user
-  std::set<Slvs_hEntity> myInitialPoints;     ///< list of points containig initial objects
+  double myDelta[2]; ///< increment of translation
 };
 
 #endif