Task 2.4. Ability to modify the radius of circles and arcs of circle with the mouse

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

diff --git a/src/SketchSolver/SketchSolver_ConstraintCoincidence.h b/src/SketchSolver/SketchSolver_ConstraintCoincidence.h
index efb01572d063fa923a1fff61237a4728eb014a65..0a3ea83e8bd38d3d71fca682647aa9d6acf0edf5 100644 (file)
--- a/src/SketchSolver/SketchSolver_ConstraintCoincidence.h
+++ b/src/SketchSolver/SketchSolver_ConstraintCoincidence.h
@@ -7,9 +7,7 @@
 #ifndef SketchSolver_ConstraintCoincidence_H_
 #define SketchSolver_ConstraintCoincidence_H_
 
-#include "SketchSolver.h"
 #include <SketchSolver_Constraint.h>
-#include <SketchSolver_Storage.h>
 
 /** \class   SketchSolver_ConstraintCoincidence
  *  \ingroup Plugins
@@ -21,51 +19,29 @@ public:
   /// Constructor based on SketchPlugin constraint
   SketchSolver_ConstraintCoincidence(ConstraintPtr theConstraint) :
       SketchSolver_Constraint(theConstraint),
-      myType(SLVS_C_UNKNOWN)
+      myInSolver(false)
   {}
 
-  virtual int getType() const
-  { return myType; }
+  /// \brief Notify this object about the feature is changed somewhere
+  virtual void notify(const FeaturePtr&      theFeature,
+                      PlaneGCSSolver_Update* theUpdater);
 
-  /// \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 constaint to the current
-  void attach(std::shared_ptr<SketchSolver_ConstraintCoincidence> theConstraint);
+  /// \brief Remove constraint
+  virtual bool remove();
 
 protected:
-  /// \brief Converts SketchPlugin constraint to a list of SolveSpace constraints
+  /// \brief Converts SketchPlugin constraint to a list of solver constraints
   virtual void process();
 
-  /// \brief Generate list of attributes of constraint in order useful for SolveSpace constraints
+  /// \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<Slvs_hEntity>& theAttributes);
+  virtual void getAttributes(EntityWrapperPtr&              theValue,
+                             std::vector<EntityWrapperPtr>& 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 concident 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
+protected:
+  bool myInSolver; ///< shows the constraint is added to the solver
+  EntityWrapperPtr myFeatureExtremities[2]; ///< extremities of a feature, a point is coincident to
 };
 
 #endif