First phase of SketchSolver refactoring

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

diff --git a/src/SketchSolver/SketchSolver_ConstraintCoincidence.h b/src/SketchSolver/SketchSolver_ConstraintCoincidence.h
index f726020c766e3e76bb1112bd8a1288523e152541..5ff02a1b6a2b6b807f9dcc337f1ccd309a0eab45 100644 (file)
--- a/src/SketchSolver/SketchSolver_ConstraintCoincidence.h
+++ b/src/SketchSolver/SketchSolver_ConstraintCoincidence.h
@@ -9,7 +9,6 @@
 
 #include "SketchSolver.h"
 #include <SketchSolver_Constraint.h>
-#include <SketchSolver_Storage.h>
 
 /** \class   SketchSolver_ConstraintCoincidence
  *  \ingroup Plugins
@@ -18,38 +17,55 @@
 class SketchSolver_ConstraintCoincidence : public SketchSolver_Constraint
 {
 public:
-  SketchSolver_ConstraintCoincidence(ConstraintPtr theConstraint) :
+  /// Constructor based on SketchPlugin constraint
+  SKETCHSOLVER_EXPORT SketchSolver_ConstraintCoincidence(ConstraintPtr theConstraint) :
       SketchSolver_Constraint(theConstraint)
   {}
 
-  virtual int getType() const
-  { return SLVS_C_POINTS_COINCIDENT; }
+////  /// \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 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 Checks the constraint is used by current object
+////  virtual bool hasConstraint(ConstraintPtr theConstraint) const;
+////
+////  /// \brief Return list of SketchPlugin constraints attached to this object
+////  virtual std::list<ConstraintPtr> constraints() const;
+////
+////  /// \brief Verifies the two Coincidence constraints are intersects (have shared point)
+////  bool isCoincide(std::shared_ptr<SketchSolver_ConstraintCoincidence> theConstraint) const;
+////
+////  /// \brief Append all data of coincidence constraint to the current
+////  void attach(std::shared_ptr<SketchSolver_ConstraintCoincidence> theConstraint);
 
-  /// \brief Checks the constraint is used by current object
-  virtual bool hasConstraint(ConstraintPtr theConstraint) const;
+protected:
+////  /// \brief Converts SketchPlugin constraint to a list of SolveSpace constraints
+////  virtual void process();
 
-  /// \brief Return list of SketchPlugin constraints attached to this object
-  virtual std::list<ConstraintPtr> constraints() const;
+  /// \brief Generate list of attributes of constraint in order useful for 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<EntityWrapperPtr>& theAttributes);
 
-  /// \brief Verifies the two Coincidence constraints are intersects (have shared point)
-  bool isCoincide(std::shared_ptr<SketchSolver_ConstraintCoincidence> theConstraint) const;
-
-  /// \brief Append all data of coincidence constaint to the current
-  void attach(std::shared_ptr<SketchSolver_ConstraintCoincidence> theConstraint);
-
-private:
-  /// \brief Creates new coincidence constraint
-  Slvs_hConstraint addConstraint(Slvs_hEntity thePoint1, Slvs_hEntity thePoint2);
-
-  /// \brief Create full SolveSpace structure according to given constraint
-  void addConstraint(ConstraintPtr theConstraint);
-
-private:
-  std::map<Slvs_hConstraint, ConstraintPtr> myExtraCoincidence; ///< multiple coincidence of points
+////  /// \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);
+////
+////private:
+////  /// \brief Creates new coincidence constraint
+////  Slvs_hConstraint addConstraint(Slvs_hEntity thePoint1, Slvs_hEntity thePoint2);
+////
+////  /// \brief Create full SolveSpace structure according to given constraint
+////  void addConstraint(ConstraintPtr theConstraint);
+////
+////  /// \brief Create constraint of point coincident to the line or circle
+////  Slvs_hConstraint addPointOnEntity(Slvs_hEntity thePoint, Slvs_hEntity theEntity);
+////
+////private:
+////  int myType; ///< type of constraint (applicable SLVS_C_POINTS_COINCIDENT or SLVS_C_PT_ON_LINE or SLVS_C_PT_ON_CIRCLE)
+////  std::map<ConstraintPtr, Slvs_hConstraint> myExtraCoincidence; ///< multiple coincidence of points
+////  std::set<AttributePtr> myCoincidentPoints; ///< list of points under the Coincidence constraint
 };
 
 #endif