+// Copyright (C) 2014-2023 CEA, EDF
+//
+// 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
+//
+
#include <SketchSolver_ConstraintCoincidence.h>
#include <SketchSolver_Error.h>
-#include <SketchSolver_Group.h>
+#include <PlaneGCSSolver_PointArrayWrapper.h>
+#include <PlaneGCSSolver_Storage.h>
+#include <PlaneGCSSolver_Tools.h>
+#include <PlaneGCSSolver_UpdateCoincidence.h>
+
+#include <GeomAPI_BSpline2d.h>
+#include <GeomAPI_Pnt2d.h>
+
+#include <GeomDataAPI_Point2D.h>
+
+#include <ModelAPI_AttributeInteger.h>
-#include <map>
+#include <SketchPlugin_Arc.h>
+#include <SketchPlugin_ConstraintCoincidenceInternal.h>
+#include <SketchPlugin_Ellipse.h>
+#include <SketchPlugin_EllipticArc.h>
+#include <SketchPlugin_Line.h>
+#include <SketchPlugin_Point.h>
-bool SketchSolver_ConstraintCoincidence::hasConstraint(ConstraintPtr theConstraint) const
+static void getCoincidentFeatureExtremities(const ConstraintPtr& theConstraint,
+ const StoragePtr& theStorage,
+ EntityWrapperPtr theExtremities[2])
{
- if (myBaseConstraint == theConstraint)
- return true;
- std::map<Slvs_hConstraint, ConstraintPtr>::const_iterator anIt = myExtraCoincidence.begin();
- for (; anIt != myExtraCoincidence.end(); anIt++)
- if (anIt->second == theConstraint)
- return true;
- return false;
+ for (int i = 0; i < CONSTRAINT_ATTR_SIZE; ++i) {
+ AttributeRefAttrPtr aRefAttr = theConstraint->refattr(SketchPlugin_Constraint::ATTRIBUTE(i));
+ if (!aRefAttr || !aRefAttr->isObject())
+ continue;
+
+ FeaturePtr aFeature = ModelAPI_Feature::feature(aRefAttr->object());
+ if (!aFeature)
+ continue;
+
+ if (aFeature->getKind() == SketchPlugin_Line::ID()) {
+ theExtremities[0] = theStorage->entity(aFeature->attribute(SketchPlugin_Line::START_ID()));
+ theExtremities[1] = theStorage->entity(aFeature->attribute(SketchPlugin_Line::END_ID()));
+ } else if (aFeature->getKind() == SketchPlugin_Arc::ID()) {
+ theExtremities[0] = theStorage->entity(aFeature->attribute(SketchPlugin_Arc::START_ID()));
+ theExtremities[1] = theStorage->entity(aFeature->attribute(SketchPlugin_Arc::END_ID()));
+ } else if (aFeature->getKind() == SketchPlugin_EllipticArc::ID()) {
+ theExtremities[0] = theStorage->entity(
+ aFeature->attribute(SketchPlugin_EllipticArc::START_POINT_ID()));
+ theExtremities[1] = theStorage->entity(
+ aFeature->attribute(SketchPlugin_EllipticArc::END_POINT_ID()));
+ }
+ }
}
-std::list<ConstraintPtr> SketchSolver_ConstraintCoincidence::constraints() const
+static void getPointOwnerAndParent(const AttributeRefAttrPtr theRefAttr,
+ AttributePoint2DPtr& thePoint,
+ FeaturePtr& theOwner,
+ FeaturePtr& theParent)
{
- std::list<ConstraintPtr> aConstraints;
- aConstraints.push_back(myBaseConstraint);
- std::map<Slvs_hConstraint, ConstraintPtr>::const_iterator anIt = myExtraCoincidence.begin();
- for (; anIt != myExtraCoincidence.end(); anIt++)
- aConstraints.push_back(anIt->second);
- return aConstraints;
+ AttributePtr anAttr = theRefAttr->attr();
+ if (theRefAttr->isObject()) {
+ FeaturePtr anOwner = ModelAPI_Feature::feature(theRefAttr->object());
+ if (anOwner && anOwner->getKind() == SketchPlugin_Point::ID())
+ anAttr = anOwner->attribute(SketchPlugin_Point::COORD_ID());
+ else
+ return;
+ }
+ thePoint = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(anAttr);
+ if (thePoint) {
+ theOwner = ModelAPI_Feature::feature(thePoint->owner());
+ if (theOwner) {
+ AttributeReferencePtr aParentRef =
+ theOwner->reference(SketchPlugin_SketchEntity::PARENT_ID());
+ theParent = aParentRef ? ModelAPI_Feature::feature(aParentRef->value()) : FeaturePtr();
+ }
+ }
}
-bool SketchSolver_ConstraintCoincidence::isCoincide(
- std::shared_ptr<SketchSolver_ConstraintCoincidence> theConstraint) const
+static void ellipseDiameters(FeaturePtr theEllipse,
+ std::pair<std::string, std::string>& theMajorAxis,
+ std::pair<std::string, std::string>& theMinorAxis)
{
- std::set<AttributePtr>::const_iterator anAttrIter = theConstraint->myCoincidentPoints.begin();
- for (; anAttrIter != theConstraint->myCoincidentPoints.end(); anAttrIter++)
- if (myCoincidentPoints.find(*anAttrIter) != myCoincidentPoints.end())
- return true;
- return false;
+ if (theEllipse->getKind() == SketchPlugin_Ellipse::ID()) {
+ theMajorAxis.first = SketchPlugin_Ellipse::MAJOR_AXIS_START_ID();
+ theMajorAxis.second = SketchPlugin_Ellipse::MAJOR_AXIS_END_ID();
+ theMinorAxis.first = SketchPlugin_Ellipse::MINOR_AXIS_START_ID();
+ theMinorAxis.second = SketchPlugin_Ellipse::MINOR_AXIS_END_ID();
+ } else if (theEllipse->getKind() == SketchPlugin_EllipticArc::ID()) {
+ theMajorAxis.first = SketchPlugin_EllipticArc::MAJOR_AXIS_START_ID();
+ theMajorAxis.second = SketchPlugin_EllipticArc::MAJOR_AXIS_END_ID();
+ theMinorAxis.first = SketchPlugin_EllipticArc::MINOR_AXIS_START_ID();
+ theMinorAxis.second = SketchPlugin_EllipticArc::MINOR_AXIS_END_ID();
+ }
}
-void SketchSolver_ConstraintCoincidence::attach(
- std::shared_ptr<SketchSolver_ConstraintCoincidence> theConstraint)
+static void findDiameterOnEllipse(FeaturePtr theConstruction,
+ FeaturePtr theEllipse,
+ AttributePtr& theStart,
+ AttributePtr& theEnd)
{
- cleanErrorMsg();
- Slvs_Constraint aBaseCoincidence = myStorage->getConstraint(mySlvsConstraints.front());
- // Remove constraints from theConstraint
- std::vector<Slvs_hConstraint>::iterator aCIter = theConstraint->mySlvsConstraints.begin();
- for (; aCIter != theConstraint->mySlvsConstraints.end(); aCIter++)
- theConstraint->myStorage->removeConstraint(*aCIter);
-
- if (myStorage == theConstraint->myStorage) {
- // Clean removed items
- std::set<Slvs_hParam> aRemParams;
- std::set<Slvs_hEntity> aRemEnts;
- std::set<Slvs_hConstraint> aRemConstr;
- theConstraint->myStorage->getRemoved(aRemParams, aRemEnts, aRemConstr);
- }
-
- // Copy data.
- addConstraint(theConstraint->myBaseConstraint);
- std::map<Slvs_hConstraint, ConstraintPtr>::iterator aConstrIter =
- theConstraint->myExtraCoincidence.begin();
- for (; aConstrIter != theConstraint->myExtraCoincidence.end(); aConstrIter++)
- addConstraint(aConstrIter->second);
- // Clear the lists to not remove the entities on destruction
- theConstraint->mySlvsConstraints.clear();
- theConstraint->myFeatureMap.clear();
- theConstraint->myAttributeMap.clear();
+ AttributePtr anEllipseAttr;
+ const std::set<AttributePtr>& aRefs = theConstruction->data()->refsToMe();
+ for (std::set<AttributePtr>::const_iterator aRefIt = aRefs.begin();
+ aRefIt != aRefs.end(); ++aRefIt) {
+ FeaturePtr anOwner = ModelAPI_Feature::feature((*aRefIt)->owner());
+ if (anOwner && anOwner->getKind() == SketchPlugin_ConstraintCoincidenceInternal::ID()) {
+ AttributeRefAttrPtr aRefAttr;
+ if ((*aRefIt)->id() == SketchPlugin_Constraint::ENTITY_A())
+ aRefAttr = anOwner->refattr(SketchPlugin_Constraint::ENTITY_B());
+ else
+ aRefAttr = anOwner->refattr(SketchPlugin_Constraint::ENTITY_A());
+ anEllipseAttr = aRefAttr->attr();
+ break;
+ }
+ }
+ if (!anEllipseAttr)
+ return;
+
+ std::pair<std::string, std::string> aMajorAxis, aMinorAxis;
+ ellipseDiameters(theEllipse, aMajorAxis, aMinorAxis);
+ if (anEllipseAttr->id() == aMajorAxis.first) {
+ theStart = anEllipseAttr;
+ theEnd = theEllipse->attribute(aMajorAxis.second);
+ }
+ else if (anEllipseAttr->id() == aMajorAxis.second) {
+ theStart = theEllipse->attribute(aMajorAxis.first);
+ theEnd = anEllipseAttr;
+ }
+ else if (anEllipseAttr->id() == aMinorAxis.first) {
+ theStart = anEllipseAttr;
+ theEnd = theEllipse->attribute(aMinorAxis.second);
+ }
+ else if (anEllipseAttr->id() == aMinorAxis.second) {
+ theStart = theEllipse->attribute(aMinorAxis.first);
+ theEnd = anEllipseAttr;
+ }
}
-Slvs_hConstraint SketchSolver_ConstraintCoincidence::addConstraint(
- Slvs_hEntity thePoint1, Slvs_hEntity thePoint2)
+static void processEllipticArcExtremities(SketchSolver_ConstraintType& theType,
+ const ConstraintPtr& theConstraint,
+ const StoragePtr& theStorage,
+ std::vector<EntityWrapperPtr>& theAttributes,
+ EntityWrapperPtr theExtremities[2])
{
- bool hasDuplicated = myStorage->hasDuplicatedConstraint();
- Slvs_Constraint aNewConstraint = Slvs_MakeConstraint(SLVS_E_UNKNOWN, myGroup->getId(),
- SLVS_C_POINTS_COINCIDENT, myGroup->getWorkplaneId(), 0.0, thePoint1, thePoint2,
- SLVS_E_UNKNOWN, SLVS_E_UNKNOWN);
- Slvs_hConstraint aNewID = myStorage->addConstraint(aNewConstraint);
- if (!hasDuplicated && myStorage->hasDuplicatedConstraint()) {
- // the duplicated constraint appears
- myStorage->removeConstraint(aNewID);
- return SLVS_E_UNKNOWN;
- }
- mySlvsConstraints.push_back(aNewID);
- return aNewID;
+ AttributePoint2DPtr aPointA, aPointB;
+ FeaturePtr anOwnerA, anOwnerB;
+ FeaturePtr aParentA, aParentB;
+ getPointOwnerAndParent(theConstraint->refattr(SketchPlugin_Constraint::ENTITY_A()),
+ aPointA, anOwnerA, aParentA);
+ getPointOwnerAndParent(theConstraint->refattr(SketchPlugin_Constraint::ENTITY_B()),
+ aPointB, anOwnerB, aParentB);
+
+ AttributePtr anAxisStart, anAxisEnd, aPoint;
+ FeaturePtr aConstruction, anEllipticArc;
+ if (aParentA && aParentA == anOwnerB) {
+ aPoint = aPointB;
+ aConstruction = anOwnerA;
+ anEllipticArc = anOwnerB;
+ }
+ else if (aParentB && aParentB == anOwnerA) {
+ aPoint = aPointA;
+ aConstruction = anOwnerB;
+ anEllipticArc = anOwnerA;
+ }
+
+ if (!anEllipticArc || anEllipticArc->getKind() != SketchPlugin_EllipticArc::ID() ||
+ (aPoint->id() != SketchPlugin_EllipticArc::START_POINT_ID() &&
+ aPoint->id() != SketchPlugin_EllipticArc::END_POINT_ID()))
+ return;
+
+ findDiameterOnEllipse(aConstruction, anEllipticArc, anAxisStart, anAxisEnd);
+
+ if (anAxisStart && anAxisEnd) {
+ theAttributes[0] = theStorage->entity(aPoint);
+ theAttributes[1] = theStorage->entity(anAxisStart);
+ theAttributes[2] = theStorage->entity(anAxisEnd);
+ theType = CONSTRAINT_PT_ON_CURVE;
+ getCoincidentFeatureExtremities(theConstraint, theStorage, theExtremities);
+ }
}
-void SketchSolver_ConstraintCoincidence::addConstraint(ConstraintPtr theConstraint)
+static void getPointFromArray(EntityWrapperPtr& theArray,
+ const ConstraintPtr& theConstraint,
+ const std::string& theIndexAttrId)
{
- std::list<AttributePtr> anAttrList =
- theConstraint->data()->attributes(ModelAPI_AttributeRefAttr::typeId());
- std::list<AttributePtr>::iterator anIter = anAttrList.begin();
- std::vector<Slvs_hEntity> anEntities;
- for (; anIter != anAttrList.end(); anIter++) {
- AttributeRefAttrPtr aRefAttr = std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>(*anIter);
- if (!aRefAttr || aRefAttr->isObject() ||
- myAttributeMap.find(aRefAttr->attr()) != myAttributeMap.end())
- continue;
- int aType;
- Slvs_hEntity anEntityID = myGroup->getAttributeId(aRefAttr->attr());
- if (anEntityID == SLVS_E_UNKNOWN)
- anEntityID = changeEntity(aRefAttr->attr(), aType);
- anEntities.push_back(anEntityID);
- myCoincidentPoints.insert(aRefAttr->attr());
- }
-
- Slvs_Constraint aBaseCoincidence = myStorage->getConstraint(mySlvsConstraints.front());
- Slvs_hConstraint aNewConstr = SLVS_E_UNKNOWN;
- std::vector<Slvs_hEntity>::iterator anEntIter = anEntities.begin();
- for (; anEntIter != anEntities.end(); anEntIter++)
- aNewConstr = addConstraint(aBaseCoincidence.ptA, *anEntIter);
- myExtraCoincidence[aNewConstr] = theConstraint;
+ if (theArray && theArray->type() == ENTITY_POINT_ARRAY) {
+ AttributeIntegerPtr anIndexAttr = theConstraint->integer(theIndexAttrId);
+ if (anIndexAttr) {
+ PointArrayWrapperPtr aPointsArray =
+ std::dynamic_pointer_cast<PlaneGCSSolver_PointArrayWrapper>(theArray);
+ theArray = aPointsArray->value(anIndexAttr->value());
+ }
+ }
}
+
void SketchSolver_ConstraintCoincidence::process()
{
- SketchSolver_Constraint::process();
-
- // Fill the list of coincident points
- std::list<AttributePtr> anAttrList =
- myBaseConstraint->data()->attributes(ModelAPI_AttributeRefAttr::typeId());
- std::list<AttributePtr>::iterator anIt = anAttrList.begin();
- for (; anIt != anAttrList.end(); anIt++) {
- AttributeRefAttrPtr aRefAttr = std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>(*anIt);
- if (!aRefAttr || aRefAttr->isObject())
- continue;
- myCoincidentPoints.insert(aRefAttr->attr());
+ cleanErrorMsg();
+ if (!myBaseConstraint || !myStorage) {
+ // Not enough parameters are assigned
+ return;
+ }
+
+ EntityWrapperPtr aValue;
+ std::vector<EntityWrapperPtr> anAttributes;
+ getAttributes(aValue, anAttributes);
+ if (!myErrorMsg.empty())
+ return;
+ if (anAttributes.empty()) {
+ myErrorMsg = SketchSolver_Error::INCORRECT_ATTRIBUTE();
+ return;
}
+
+ mySolverConstraint = PlaneGCSSolver_Tools::createConstraint(
+ myBaseConstraint, getType(),
+ myAuxValue, anAttributes[0], anAttributes[1], anAttributes[2], anAttributes[3]);
+
+ myStorage->subscribeUpdates(this, PlaneGCSSolver_UpdateCoincidence::GROUP());
+ myStorage->notify(myBaseConstraint);
}
-bool SketchSolver_ConstraintCoincidence::remove(ConstraintPtr theConstraint)
+bool SketchSolver_ConstraintCoincidence::remove()
{
- cleanErrorMsg();
- if (mySlvsConstraints.empty())
- return true;
- ConstraintPtr aConstraint = theConstraint ? theConstraint : myBaseConstraint;
- int aPos = -1; // position of constraint in the list (-1 for base constraint)
- std::map<Slvs_hConstraint, ConstraintPtr>::iterator anExtraIt;
- if (aConstraint != myBaseConstraint) {
- anExtraIt = myExtraCoincidence.begin();
- for (aPos = 0; anExtraIt != myExtraCoincidence.end(); anExtraIt++, aPos++)
- if (anExtraIt->second == aConstraint)
- break;
- if (aPos >= (int)myExtraCoincidence.size())
- return false; // there is no constraint, which is specified to remove
+ myInSolver = false;
+ myFeatureExtremities[0] = EntityWrapperPtr();
+ myFeatureExtremities[1] = EntityWrapperPtr();
+ if (myAuxValue) {
+ std::shared_ptr<PlaneGCSSolver_Storage> aStorage =
+ std::dynamic_pointer_cast<PlaneGCSSolver_Storage>(myStorage);
+ GCS::SET_pD aParams;
+ aParams.insert(myAuxValue->scalar());
+ aStorage->removeParameters(aParams);
+ }
+ return SketchSolver_Constraint::remove();
+}
+
+void SketchSolver_ConstraintCoincidence::getAttributes(
+ EntityWrapperPtr& theValue,
+ std::vector<EntityWrapperPtr>& theAttributes)
+{
+ SketchSolver_Constraint::getAttributes(theValue, theAttributes);
+ if (!myErrorMsg.empty() || !theAttributes[0]) {
+ theAttributes.clear();
+ return;
+ }
+
+ if (theAttributes[1]) {
+ myType = CONSTRAINT_PT_PT_COINCIDENT;
+ // if elliptic arc boundary point is connected with one of ellipse characteristics,
+ // it should be changed from point-point coincidence to coincidence between point
+ // and axis of the ellipse to decrease only 1 DoF instead of 2 DoF and avoid overconstraint.
+ processEllipticArcExtremities(myType, myBaseConstraint, myStorage,
+ theAttributes, myFeatureExtremities);
+ } else if (theAttributes[2]) {
+ myType = CONSTRAINT_PT_ON_CURVE;
+ // point-on-bspline requires additional parameter
+ if (theAttributes[2]->type() == ENTITY_BSPLINE) {
+ std::shared_ptr<PlaneGCSSolver_Storage> aStorage =
+ std::dynamic_pointer_cast<PlaneGCSSolver_Storage>(myStorage);
+ myAuxValue.reset(new PlaneGCSSolver_ScalarWrapper(aStorage->createParameter()));
+ // calculate the parameter of the point on B-spline nearest to the constrained point.
+ GeomPnt2dPtr aPoint = PlaneGCSSolver_Tools::point(theAttributes[0]);
+ std::shared_ptr<GeomAPI_BSpline2d> aSpline = PlaneGCSSolver_Tools::bspline(theAttributes[2]);
+ if (aPoint && aSpline)
+ aSpline->parameter(aPoint, 1.e100, *myAuxValue->scalar());
+ }
else {
- bool isEmpty = anExtraIt->first == SLVS_E_UNKNOWN;
- myExtraCoincidence.erase(anExtraIt);
- if (isEmpty)
- return false;
+ // obtain extremity points of the coincident feature for further checking of multi-coincidence
+ getCoincidentFeatureExtremities(myBaseConstraint, myStorage, myFeatureExtremities);
}
- }
+ } else
+ myErrorMsg = SketchSolver_Error::INCORRECT_ATTRIBUTE();
- bool isFullyRemoved = myStorage->removeConstraint(mySlvsConstraints[aPos+1]);
- mySlvsConstraints.erase(mySlvsConstraints.begin() + (1+aPos));
- if (aPos < 0 && !myExtraCoincidence.empty()) {
- anExtraIt = myExtraCoincidence.begin();
- // Remove invalid constraints
- while (anExtraIt != myExtraCoincidence.end()) {
- if (!anExtraIt->second->data() || !anExtraIt->second->data()->isValid()) {
- std::map<Slvs_hConstraint, ConstraintPtr>::iterator aTempIt = anExtraIt++;
- if (aTempIt->first != SLVS_E_UNKNOWN) {
- myStorage->removeConstraint(aTempIt->first);
- std::vector<Slvs_hConstraint>::iterator anIt = mySlvsConstraints.begin();
- for (; anIt != mySlvsConstraints.end(); anIt++)
- if (*anIt == aTempIt->first) {
- mySlvsConstraints.erase(anIt);
- break;
- }
- }
- myExtraCoincidence.erase(aTempIt);
- continue;
+ // process internal coincidence with a point in the array of points
+ getPointFromArray(theAttributes[0], myBaseConstraint,
+ SketchPlugin_ConstraintCoincidenceInternal::INDEX_ENTITY_A());
+ getPointFromArray(theAttributes[1], myBaseConstraint,
+ SketchPlugin_ConstraintCoincidenceInternal::INDEX_ENTITY_B());
+}
+
+void SketchSolver_ConstraintCoincidence::notify(const FeaturePtr& theFeature,
+ PlaneGCSSolver_Update* theUpdater)
+{
+ PlaneGCSSolver_UpdateCoincidence* anUpdater =
+ static_cast<PlaneGCSSolver_UpdateCoincidence*>(theUpdater);
+ bool isAccepted = anUpdater->addCoincidence(myAttributes.front(), myAttributes.back());
+ // additionally process internal coincidence, set point coincident with ellipse/elliptic arc
+ // for correct processing further coincidences set by the user
+ if (isAccepted &&
+ myBaseConstraint->getKind() == SketchPlugin_ConstraintCoincidenceInternal::ID()) {
+ AttributeRefAttrPtr aRefAttrA = myBaseConstraint->refattr(SketchPlugin_Constraint::ENTITY_A());
+ AttributeRefAttrPtr aRefAttrB = myBaseConstraint->refattr(SketchPlugin_Constraint::ENTITY_B());
+ if (aRefAttrA && aRefAttrB) {
+ AttributePoint2DPtr anAttrA, anAttrB;
+ FeaturePtr anOwnerA, anOwnerB;
+ FeaturePtr aParentA, aParentB;
+ getPointOwnerAndParent(aRefAttrA, anAttrA, anOwnerA, aParentA);
+ getPointOwnerAndParent(aRefAttrB, anAttrB, anOwnerB, aParentB);
+
+ EntityWrapperPtr aPoint, anEntity;
+ if (aParentA == anOwnerB) {
+ aPoint = myStorage->entity(anAttrA);
+ anEntity = myStorage->entity(anOwnerB);
}
- anExtraIt++;
- }
- // Find first non-extra conststraint
- anExtraIt = myExtraCoincidence.begin();
- while (anExtraIt != myExtraCoincidence.end() && anExtraIt->first == SLVS_E_UNKNOWN)
- anExtraIt++;
- if (anExtraIt != myExtraCoincidence.end()) {
- // Need to specify another base coincidence constraint
- myBaseConstraint = anExtraIt->second;
- myExtraCoincidence.erase(anExtraIt);
- std::vector<Slvs_hConstraint>::iterator aCIter = mySlvsConstraints.begin();
- Slvs_Constraint aBase = myStorage->getConstraint(*aCIter);
- for (++aCIter; aCIter != mySlvsConstraints.end(); aCIter++) {
- Slvs_Constraint aConstr = myStorage->getConstraint(*aCIter);
- aConstr.ptA = aBase.ptA;
- myStorage->updateConstraint(aConstr);
+ else if (aParentB == anOwnerA) {
+ aPoint = myStorage->entity(anAttrB);
+ anEntity = myStorage->entity(anOwnerA);
}
+ if (aPoint && anEntity)
+ anUpdater->addCoincidence(aPoint, anEntity);
}
}
- // Clear removed attributes
- std::set<Slvs_hParam> aParamRemoved;
- std::set<Slvs_hEntity> anEntRemoved;
- std::set<Slvs_hConstraint> aConstrRemoved;
- myStorage->getRemoved(aParamRemoved, anEntRemoved, aConstrRemoved);
- std::map<AttributePtr, Slvs_hEntity>::iterator anAttrIter = myAttributeMap.begin();
- while (anAttrIter != myAttributeMap.end()) {
- if (anEntRemoved.find(anAttrIter->second) != anEntRemoved.end()) {
- std::map<AttributePtr, Slvs_hEntity>::iterator aTempIt = anAttrIter++;
- myCoincidentPoints.erase(aTempIt->first);
- myAttributeMap.erase(aTempIt);
- continue;
- }
- anAttrIter++;
+
+ // additionally check the point is coincident to extremity of coincident feature
+ if (myFeatureExtremities[0] && myFeatureExtremities[1]) {
+ EntityWrapperPtr aPoint =
+ myAttributes.front()->type() == ENTITY_POINT ? myAttributes.front() : myAttributes.back();
+
+ for (int i = 0; i < 2; ++i)
+ isAccepted = isAccepted && !anUpdater->isPointOnEntity(aPoint, myFeatureExtremities[i]);
}
- // Go through remaining extra coincidence and try to add or remove them
- anExtraIt = myExtraCoincidence.begin();
- while (anExtraIt != myExtraCoincidence.end()) {
- if (anExtraIt->first == SLVS_E_UNKNOWN) {
- if (!anExtraIt->second->data() || !anExtraIt->second->data()->isValid()) {
- std::map<Slvs_hConstraint, ConstraintPtr>::iterator aTempIt = anExtraIt++;
- myExtraCoincidence.erase(aTempIt);
- continue;
- }
- if (mySlvsConstraints.empty()) {
- myBaseConstraint = anExtraIt->second;
- std::map<Slvs_hConstraint, ConstraintPtr>::iterator aTempIt = anExtraIt++;
- myExtraCoincidence.erase(aTempIt);
- process();
- continue;
- } else
- addConstraint(anExtraIt->second);
+ if (isAccepted) {
+ if (!myInSolver) {
+ myInSolver = true;
+ myStorage->addConstraint(myBaseConstraint, mySolverConstraint);
+ }
+ } else {
+ if (myInSolver) {
+ myInSolver = false;
+ myStorage->removeConstraint(myBaseConstraint);
}
- anExtraIt++;
}
- return mySlvsConstraints.empty();
}
+void SketchSolver_ConstraintCoincidence::adjustConstraint()
+{
+ if (myBaseConstraint->getKind() == SketchPlugin_ConstraintCoincidenceInternal::ID()) {
+ AttributeIntegerPtr anIndexA = myBaseConstraint->integer(
+ SketchPlugin_ConstraintCoincidenceInternal::INDEX_ENTITY_A());
+ AttributeIntegerPtr anIndexB = myBaseConstraint->integer(
+ SketchPlugin_ConstraintCoincidenceInternal::INDEX_ENTITY_B());
+ if ((anIndexA && anIndexA->isInitialized()) ||
+ (anIndexB && anIndexB->isInitialized())) {
+ remove();
+ process();
+ }
+ }
+}