X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchSolver%2FSketchSolver_ConstraintCoincidence.h;h=965c4d7e6cd709b77b2f7268651b9e5e6a0ce70a;hb=6b48364b1da91a4958ce92d392e8bc49a3cbd7a2;hp=a5c885ade5863fccdce77842f18904c6acb5ff5a;hpb=7f92207f4b32a1c02462c40f002e8d7d870529f1;p=modules%2Fshaper.git

diff --git a/src/SketchSolver/SketchSolver_ConstraintCoincidence.h b/src/SketchSolver/SketchSolver_ConstraintCoincidence.h
index a5c885ade..965c4d7e6 100644
--- a/src/SketchSolver/SketchSolver_ConstraintCoincidence.h
+++ b/src/SketchSolver/SketchSolver_ConstraintCoincidence.h
@@ -1,15 +1,27 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:    SketchSolver_ConstraintCoincidence.h
-// Created: 29 Mar 2015
-// Author:  Artem ZHIDKOV
+// Copyright (C) 2014-2017  CEA/DEN, EDF R&D
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.salome-platform.org/ or
+// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+//
 
 #ifndef SketchSolver_ConstraintCoincidence_H_
 #define SketchSolver_ConstraintCoincidence_H_
 
-#include "SketchSolver.h"
 #include <SketchSolver_Constraint.h>
-#include <SketchSolver_Storage.h>
 
 /** \class   SketchSolver_ConstraintCoincidence
  *  \ingroup Plugins
@@ -18,43 +30,32 @@
 class SketchSolver_ConstraintCoincidence : public SketchSolver_Constraint
 {
 public:
+  /// Constructor based on SketchPlugin constraint
   SketchSolver_ConstraintCoincidence(ConstraintPtr theConstraint) :
-      SketchSolver_Constraint(theConstraint)
+      SketchSolver_Constraint(theConstraint),
+      myInSolver(false)
   {}
 
-  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 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 Notify this object about the feature is changed somewhere
+  virtual void notify(const FeaturePtr&      theFeature,
+                      PlaneGCSSolver_Update* theUpdater);
 
-  /// \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();
 
-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 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(EntityWrapperPtr&              theValue,
+                             std::vector<EntityWrapperPtr>& theAttributes);
 
-private:
-  std::map<Slvs_hConstraint, ConstraintPtr> 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