SketchSolver library refactoring

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

diff --git a/src/SketchSolver/SketchSolver_Storage.h b/src/SketchSolver/SketchSolver_Storage.h
index 0317f930f3073ca4fc2c90575c390797a688b16c..fe206107e219ed588e09696a772240680d4b0b40 100644 (file)
--- a/src/SketchSolver/SketchSolver_Storage.h
+++ b/src/SketchSolver/SketchSolver_Storage.h
@@ -60,8 +60,12 @@ public:
   /// \brief Returns the entity by its ID
   const Slvs_Entity& getEntity(const Slvs_hEntity& theEntityID) const;
 
+  /// \brief Verifies the current point or another coincident one is fixed
+  /// \return the ID of the Fixed constraint or SLVS_E_UNKNOWN
+  Slvs_hConstraint isPointFixed(const Slvs_hEntity& thePointID) const;
+
   /** \brief Add new constraint to the current group
-   *  \param[in] theConstraint  SolveSpace constraint
+   *  \param[in] theConstraint   SolveSpace's constraint
    *  \return the ID of added constraint
    */
   Slvs_hConstraint addConstraint(const Slvs_Constraint& theConstraint);
@@ -99,15 +103,22 @@ public:
   /// \brief Initialize constraint solver by the entities collected by current storage
   void initializeSolver(SketchSolver_Solver& theSolver);
 
+private:
+  /// \brief Store coincident points
+  void addCoincidentPoints(const Slvs_hEntity& thePoint1, const Slvs_hEntity& thePoint2);
+  /// \brief Remove point from lists of coincidence
+  void removeCoincidentPoint(const Slvs_hEntity& thePoint);
+
 private:
   Slvs_hParam myParamMaxID; ///< current parameter index (may differs with the number of parameters)
-  std::vector<Slvs_Param> myParameters; ///< list of parameters used in the current group of constraints
+  std::vector<Slvs_Param> myParameters; ///< list of parameters used in the current group of constraints (sorted by the identifier)
   Slvs_hEntity myEntityMaxID; ///< current entity index (may differs with the number of entities)
-  std::vector<Slvs_Entity> myEntities; ///< list of entities used in the current group of constraints
+  std::vector<Slvs_Entity> myEntities; ///< list of entities used in the current group of constraints (sorted by the identifier)
   Slvs_hConstraint myConstrMaxID; ///< current constraint index (may differs with the number of constraints)
-  std::vector<Slvs_Constraint> myConstraints; ///< list of constraints used in the current group
+  std::vector<Slvs_Constraint> myConstraints; ///< list of constraints used in the current group (sorted by the identifier)
 
-  std::vector<Slvs_hEntity> myFixedPoints; ///< identifiers of entities which relate to temporary constraints
+  std::vector< std::set<Slvs_hEntity> > myCoincidentPoints; ///< lists of coincident points
+  Slvs_hConstraint myFixed; ///< identifier of one of temporary constraints to fix separate point
 
   bool myNeedToResolve; ///< parameters are changed and group needs to be resolved