+// Copyright (C) 2014-2019 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
+//
+
#include <SketchSolver_ConstraintMulti.h>
#include <SketchSolver_Error.h>
#include <SketchSolver_Manager.h>
-////#include <SketchPlugin_Arc.h>
-////
-////#include <ModelAPI_AttributeDouble.h>
+#include <GeomDataAPI_Point2D.h>
#include <ModelAPI_AttributeInteger.h>
#include <ModelAPI_AttributeRefAttr.h>
#include <ModelAPI_AttributeRefList.h>
-////#include <ModelAPI_ResultConstruction.h>
-////
-////#include <GeomAPI_Dir2d.h>
-////#include <GeomAPI_XY.h>
-////
-////#include <math.h>
-
-void SketchSolver_ConstraintMulti::getEntitiesAndCopies(
- std::list< std::list<EntityWrapperPtr> >& theEntAndCopies)
+#include <SketchPlugin_Arc.h>
+#include <SketchPlugin_Circle.h>
+#include <SketchPlugin_Line.h>
+#include <SketchPlugin_Point.h>
+#include <SketchPlugin_IntersectionPoint.h>
+
+static void createCopiedEntity(const FeaturePtr& theFeature, const StoragePtr& theStorage)
+{
+ EntityWrapperPtr anEntity = theStorage->entity(theFeature);
+ if (anEntity) {
+ std::shared_ptr<SketchPlugin_Feature> aSketchFeature =
+ std::dynamic_pointer_cast<SketchPlugin_Feature>(theFeature);
+ if (!anEntity->isExternal() && aSketchFeature->isCopy())
+ theStorage->makeExternal(anEntity);
+ }
+}
+
+void SketchSolver_ConstraintMulti::getEntities(std::list<EntityWrapperPtr>& theEntities)
{
- DataPtr aData = myBaseConstraint->data();
+ myAdjusted = false;
// Lists of objects and number of copies
- AttributeRefListPtr anInitialRefList = std::dynamic_pointer_cast<ModelAPI_AttributeRefList>(
- aData->attribute(SketchPlugin_Constraint::ENTITY_A()));
+ AttributeRefListPtr anInitialRefList =
+ myBaseConstraint->reflist(SketchPlugin_Constraint::ENTITY_A());
myNumberOfObjects = anInitialRefList->size();
- myNumberOfCopies = aData->integer(nameNbObjects())->value() - 1;
+ myNumberOfCopies = myBaseConstraint->integer(nameNbObjects())->value() - 1;
if (myNumberOfCopies <= 0)
return;
- AttributeRefListPtr aRefList = std::dynamic_pointer_cast<ModelAPI_AttributeRefList>(
- aData->attribute(SketchPlugin_Constraint::ENTITY_B()));
+ AttributeRefListPtr aRefList =
+ myBaseConstraint->reflist(SketchPlugin_Constraint::ENTITY_B());
if (!aRefList || aRefList->size() == 0) {
myErrorMsg = SketchSolver_Error::INCORRECT_ATTRIBUTE();
return;
}
FeaturePtr aFeature;
- std::list<EntityWrapperPtr> anEntities; // list of transformed entities
std::list<ObjectPtr> anObjectList = aRefList->list();
std::list<ObjectPtr>::iterator anObjIt = anObjectList.begin();
+ // execute for the feature is not called yet
+ if ((myNumberOfCopies + 1) * myNumberOfObjects != aRefList->size())
+ myNumberOfCopies = aRefList->size() / myNumberOfObjects - 1;
+
while (anObjIt != anObjectList.end()) {
- anEntities.clear();
- for (int i = 0; i <= myNumberOfCopies && anObjIt != anObjectList.end(); ++i, ++anObjIt) {
- aFeature = ModelAPI_Feature::feature(*anObjIt);
- if (!aFeature)
- continue;
+ aFeature = ModelAPI_Feature::feature(*anObjIt++);
+ if (!aFeature)
+ continue;
- myStorage->update(aFeature);
- anEntities.push_back(myStorage->entity(aFeature));
+ // the entity is not created, so it is a copy in "multi" constraint, force its creation
+ if (!myStorage->update(aFeature))
+ myStorage->update(aFeature, true);
+ theEntities.push_back(myStorage->entity(aFeature));
+ myOriginalFeatures.insert(aFeature);
+ for (int i = 0; i < myNumberOfCopies && anObjIt != anObjectList.end(); ++i, ++anObjIt) {
+ // just add copied features into the list of objects
+ aFeature = ModelAPI_Feature::feature(*anObjIt);
+ if (aFeature) {
+ createCopiedEntity(aFeature, myStorage);
+ myCopiedFeatures.insert(aFeature);
+ }
}
- if (!anEntities.empty())
- theEntAndCopies.push_back(anEntities);
}
}
+bool SketchSolver_ConstraintMulti::remove()
+{
+ myStorage->unsubscribeUpdates(this);
-////void SketchSolver_ConstraintMulti::processEntities(const std::vector< std::vector<Slvs_hEntity> >& theEntAndCopies)
-////{
-//// // Keep all objects unchanged (only initial object may be changed by user)
-//// myCircsAndCopies.clear();
-//// std::vector<std::vector<Slvs_hEntity> >::const_iterator anEntIt = theEntAndCopies.begin();
-//// std::vector<Slvs_hEntity>::const_iterator aCpIt;
-//// for (; anEntIt != theEntAndCopies.end(); ++anEntIt) {
-//// std::vector<Slvs_hEntity> aCircs;
-//// aCpIt = anEntIt->begin();
-//// // Obtain initial points
-//// Slvs_Entity anInitial = myStorage->getEntity(*aCpIt);
-//// if (anInitial.type == SLVS_E_POINT_IN_2D || anInitial.type == SLVS_E_POINT_IN_3D)
-//// myInitialPoints.insert(anInitial.h);
-//// else {
-//// for (int i = 0; i < 4 && anInitial.point[i] != SLVS_E_UNKNOWN; i++)
-//// myInitialPoints.insert(anInitial.point[i]);
-//// }
-////
-//// // Fix the copies
-//// for (++aCpIt; aCpIt != anEntIt->end(); ++aCpIt) {
-//// const Slvs_Entity& anEntity = myStorage->getEntity(*aCpIt);
-//// std::vector<Slvs_hConstraint> aNewConstr;
-//// if (anEntity.type == SLVS_E_CIRCLE) {
-//// aCircs.push_back(anEntity.distance);
-//// // for circles we fix only center
-//// aNewConstr = myStorage->fixEntity(anEntity.point[0]);
-//// } else
-//// aNewConstr = myStorage->fixEntity(*aCpIt);
-//// if (anEntity.type == SLVS_E_ARC_OF_CIRCLE)
-//// aCircs.push_back(anEntity.h);
-//// mySlvsConstraints.insert(mySlvsConstraints.end(), aNewConstr.begin(), aNewConstr.end());
-//// }
-////
-//// if (!aCircs.empty()) {
-//// if (anInitial.type == SLVS_E_CIRCLE)
-//// aCircs.insert(aCircs.begin(), anInitial.distance);
-//// else
-//// aCircs.insert(aCircs.begin(), anInitial.h);
-//// myCircsAndCopies.push_back(aCircs);
-//// }
-//// }
-////}
-
-void SketchSolver_ConstraintMulti::update(bool isForce)
+ // "Multi" constraint has been removed, thus all copy features become non-copied,
+ // add them once again to be a common feature
+ std::set<FeaturePtr>::iterator anIt = myCopiedFeatures.begin();
+ for (; anIt != myCopiedFeatures.end(); ++anIt) {
+ EntityWrapperPtr anEntity = myStorage->entity(*anIt);
+ if (anEntity) {
+ std::shared_ptr<SketchPlugin_Feature> aSketchFeature =
+ std::dynamic_pointer_cast<SketchPlugin_Feature>(*anIt);
+ if (anEntity->isExternal() && !aSketchFeature->isExternal())
+ myStorage->makeNonExternal(anEntity);
+ } else if ((*anIt)->data() && (*anIt)->data()->isValid())
+ myStorage->update(*anIt, true);
+ }
+
+ myOriginalFeatures.clear();
+ myCopiedFeatures.clear();
+ return SketchSolver_Constraint::remove();
+}
+
+void SketchSolver_ConstraintMulti::update()
{
cleanErrorMsg();
- AttributeRefListPtr anInitialRefList = std::dynamic_pointer_cast<ModelAPI_AttributeRefList>(
- myBaseConstraint->attribute(SketchPlugin_Constraint::ENTITY_A()));
+ AttributeRefListPtr anInitialRefList =
+ myBaseConstraint->reflist(SketchPlugin_Constraint::ENTITY_A());
AttributeIntegerPtr aNbObjects = myBaseConstraint->integer(nameNbObjects());
- if (anInitialRefList->size() != myNumberOfObjects || aNbObjects->value()-1 != myNumberOfCopies) {
+ if (!anInitialRefList || !aNbObjects)
+ return; // the "Multi" constraint is in queue to remove
+ bool isUpdated =
+ anInitialRefList->size() != myNumberOfObjects || aNbObjects->value()-1 != myNumberOfCopies;
+ if (!isUpdated) {
+ // additional check that the features and their copies are changed
+ AttributeRefListPtr aRefList =
+ myBaseConstraint->reflist(SketchPlugin_Constraint::ENTITY_B());
+ if (aRefList && aRefList->size() != 0) {
+ FeaturePtr aFeature;
+ std::list<ObjectPtr> anObjectList = aRefList->list();
+ std::list<ObjectPtr>::iterator anObjIt = anObjectList.begin();
+ for (; anObjIt != anObjectList.end(); ++anObjIt) {
+ aFeature = ModelAPI_Feature::feature(*anObjIt);
+ if (aFeature && myOriginalFeatures.find(aFeature) == myOriginalFeatures.end() &&
+ myCopiedFeatures.find(aFeature) == myCopiedFeatures.end()) {
+ isUpdated = true;
+ break;
+ }
+ }
+ } else
+ isUpdated = true;
+ }
+ if (isUpdated) {
remove();
process();
- return;
}
- // update derivative object
+ // update derived object
updateLocal();
- if (isForce)
- myAdjusted = false;
- // update parent object
- SketchSolver_Constraint::update();
+ adjustConstraint();
}
-////bool SketchSolver_ConstraintMulti::remove()
-////{
-//// cleanErrorMsg();
-//// if (theConstraint && theConstraint != myBaseConstraint)
-//// return false;
-//// bool isFullyRemoved = true;
-//// std::vector<Slvs_hEntity>::iterator aCIter = mySlvsConstraints.begin();
-//// for (; aCIter != mySlvsConstraints.end(); aCIter++)
-//// isFullyRemoved = myStorage->removeConstraint(*aCIter) && isFullyRemoved;
-//// mySlvsConstraints.clear();
-////
-//// std::map<FeaturePtr, Slvs_hEntity>::iterator aFeatIt = myFeatureMap.begin();
-//// for (; aFeatIt != myFeatureMap.end(); aFeatIt++)
-//// myStorage->removeEntity(aFeatIt->second);
-//// myStorage->removeUnusedEntities();
-////
-//// std::map<FeaturePtr, Slvs_hEntity> aFeatureMapCopy = myFeatureMap;
-////
-//// if (isFullyRemoved) {
-//// myFeatureMap.clear();
-//// myAttributeMap.clear();
-//// myValueMap.clear();
-//// } else
-//// cleanRemovedEntities();
-////
-//// // Restore initial features
-//// std::map<FeaturePtr, Slvs_hEntity>::iterator aFIter = aFeatureMapCopy.begin();
-//// for (; aFIter != aFeatureMapCopy.end(); ++aFIter)
-//// {
-//// if (myFeatureMap.find(aFIter->first) != myFeatureMap.end())
-//// continue; // the feature was not removed
-//// Slvs_hEntity anEntity = myGroup->getFeatureId(aFIter->first);
-//// if (anEntity != SLVS_E_UNKNOWN)
-//// myFeatureMap[aFIter->first] = anEntity;
-//// }
-////
-//// // Clear list of rotated points
-//// myPointsAndCopies.clear();
-//// myInitialPoints.clear();
-////
-//// return true;
-////}
-
-////void SketchSolver_ConstraintMulti::addFeature(FeaturePtr theFeature)
-////{
-//// SketchSolver_Constraint::addFeature(theFeature);
-////
-//// std::map<FeaturePtr, Slvs_hEntity>::iterator aFeatIt = myFeatureMap.find(theFeature);
-//// if (aFeatIt == myFeatureMap.end())
-//// return;
-////
-//// // store list of points of the feature
-//// const Slvs_Entity& theEntity = myStorage->getEntity(aFeatIt->second);
-//// for (int i = 0; i < 4; i++)
-//// if (theEntity.point[i] != SLVS_E_UNKNOWN)
-//// myPointsJustUpdated.insert(theEntity.point[i]);
-////}
-
void SketchSolver_ConstraintMulti::adjustConstraint()
{
- if (myAdjusted)
- return; // constraint already adjusted, don't do it once again
-
- BuilderPtr aBuilder = SketchSolver_Manager::instance()->builder();
-
- const std::list<ConstraintWrapperPtr>& aConstraints = myStorage->constraint(myBaseConstraint);
- std::list<ConstraintWrapperPtr>::const_iterator anIt = aConstraints.begin();
- for (; anIt != aConstraints.end(); ++anIt)
- aBuilder->adjustConstraint(*anIt);
- myStorage->addConstraint(myBaseConstraint, aConstraints);
-
-//// double aRelCoord[2] = {0.0, 0.0}; // relative coordinates of point
-//// double anAbsCoord[2] = {0.0, 0.0}; // absolute coordinates of point
-////
-//// std::list<Slvs_Constraint> aCoincident = myStorage->getConstraintsByType(SLVS_C_POINTS_COINCIDENT);
-//// std::list<Slvs_Constraint>::const_iterator aCoIt;
-////
-//// // Update positions of all points to satisfy angles
-//// std::vector< std::vector<Slvs_hEntity> >::const_iterator aPointsIter = myPointsAndCopies.begin();
-//// std::vector<Slvs_hEntity>::const_iterator aCopyIter;
-//// for (; aPointsIter != myPointsAndCopies.end(); ++aPointsIter) {
-//// aCopyIter = aPointsIter->begin();
-//// const Slvs_Entity& anInitial = myStorage->getEntity(*aCopyIter);
-//// for (int i = 0; i < 2; i++)
-//// anAbsCoord[i] = myStorage->getParameter(anInitial.param[i]).val;
-//// getRelative(anAbsCoord[0], anAbsCoord[1], aRelCoord[0], aRelCoord[1]);
-////
-//// // if the point is coincident with another one which is temporary fixed (moved by user),
-//// // we will update its position correspondingly
-//// Slvs_hConstraint aFixed;
-//// for (aCoIt = aCoincident.begin(); aCoIt != aCoincident.end(); ++aCoIt) {
-//// if ((aCoIt->ptA == anInitial.h && myInitialPoints.find(aCoIt->ptB) != myInitialPoints.end()) ||
-//// (aCoIt->ptB == anInitial.h && myInitialPoints.find(aCoIt->ptA) != myInitialPoints.end())) {
-//// Slvs_hEntity anOtherId = aCoIt->ptA == anInitial.h ? aCoIt->ptB : aCoIt->ptA;
-//// if (!myStorage->isTemporary(aFixed) &&
-//// myPointsJustUpdated.find(anOtherId) == myPointsJustUpdated.end())
-//// continue; // nothing to change
-////
-//// const Slvs_Entity& anOtherPnt = myStorage->getEntity(anOtherId);
-//// for (int i = 0; i < 2; i++) {
-//// Slvs_Param anInitParam = myStorage->getParameter(anInitial.param[i]);
-//// const Slvs_Param& anOtherParam = myStorage->getParameter(anOtherPnt.param[i]);
-//// anInitParam.val = anOtherParam.val;
-//// myStorage->updateParameter(anInitParam);
-//// anAbsCoord[i] = anOtherParam.val;
-//// }
-//// getRelative(anAbsCoord[0], anAbsCoord[1], aRelCoord[0], aRelCoord[1]);
-//// }
-//// }
-////
-//// // update copied points
-//// aCopyIter = aPointsIter->begin();
-//// for (++aCopyIter; aCopyIter != aPointsIter->end(); ++aCopyIter) {
-//// // transform coordinates
-//// transformRelative(aRelCoord[0], aRelCoord[1]);
-//// getAbsolute(aRelCoord[0], aRelCoord[1], anAbsCoord[0], anAbsCoord[1]);
-////
-//// const Slvs_Entity& aTarget = myStorage->getEntity(*aCopyIter);
-//// for (int i = 0; i < 2; i++) {
-//// Slvs_Param aParam = myStorage->getParameter(aTarget.param[i]);
-//// aParam.val = anAbsCoord[i];
-//// myStorage->updateParameter(aParam);
-//// }
-//// }
-//// }
-////
-//// std::list<Slvs_Constraint> aDiamConstr;
-//// for (aPointsIter = myCircsAndCopies.begin(); aPointsIter != myCircsAndCopies.end(); ++aPointsIter) {
-//// aCopyIter = aPointsIter->begin();
-//// const Slvs_Entity& anInitial = myStorage->getEntity(*aCopyIter);
-//// if (anInitial.type == SLVS_E_DISTANCE) {
-//// const Slvs_Param& anInitRad = myStorage->getParameter(anInitial.param[0]);
-//// for (++aCopyIter; aCopyIter != aPointsIter->end(); ++aCopyIter) {
-//// const Slvs_Entity& aCopy = myStorage->getEntity(*aCopyIter);
-//// Slvs_Param aCopyRad = myStorage->getParameter(aCopy.param[0]);
-//// aCopyRad.val = anInitRad.val;
-//// myStorage->updateParameter(aCopyRad);
-//// }
-//// } else if (anInitial.type == SLVS_E_ARC_OF_CIRCLE) {
-//// const Slvs_Entity& aCenterEnt = myStorage->getEntity(anInitial.point[0]);
-//// const Slvs_Entity& aStartEnt = myStorage->getEntity(anInitial.point[1]);
-////
-//// if (aDiamConstr.empty())
-//// aDiamConstr = myStorage->getConstraintsByType(SLVS_C_DIAMETER);
-//// // Calculate diameter of initial arc
-//// double aDiam = 0.0;
-//// for (int i = 0; i < 2; i++) {
-//// double d = myStorage->getParameter(aStartEnt.param[i]).val -
-//// myStorage->getParameter(aCenterEnt.param[i]).val;
-//// aDiam += d * d;
-//// }
-//// aDiam = sqrt(aDiam) * 2.0;
-//// // Update the Diameter constraints of copied arcs
-//// for (++aCopyIter; aCopyIter != aPointsIter->end(); ++aCopyIter) {
-//// std::list<Slvs_Constraint>::iterator aDCIt = aDiamConstr.begin();
-//// for (; aDCIt != aDiamConstr.end(); ++aDCIt)
-//// if (aDCIt->entityA == *aCopyIter) {
-//// aDCIt->valA = aDiam;
-//// myStorage->updateConstraint(*aDCIt);
-//// aDiamConstr.erase(aDCIt);
-//// break;
-//// }
-//// }
-//// }
-//// }
-////
-//// myPointsJustUpdated.clear();
+ AttributeRefListPtr aRefList =
+ myBaseConstraint->reflist(SketchPlugin_Constraint::ENTITY_B());
+ if (!aRefList || aRefList->size() == 0) {
+ myErrorMsg = SketchSolver_Error::INCORRECT_ATTRIBUTE();
+ return;
+ }
+
+ FeaturePtr anOriginal, aFeature;
+ std::list<double>::iterator aXIt, aYIt;
+
+ std::list<ObjectPtr> anObjectList = aRefList->list();
+ std::list<ObjectPtr>::iterator anObjIt = anObjectList.begin();
+ while (anObjIt != anObjectList.end()) {
+ anOriginal = ModelAPI_Feature::feature(*anObjIt++);
+ if (!anOriginal)
+ continue;
+
+ // Fill lists of coordinates of points composing a feature
+ std::list<double> aX, aY;
+ double aXCoord, aYCoord;
+ std::list<AttributePtr> aPoints =
+ anOriginal->data()->attributes(GeomDataAPI_Point2D::typeId());
+ std::list<AttributePtr>::iterator aPtIt = aPoints.begin();
+ for (; aPtIt != aPoints.end(); ++aPtIt) {
+ AttributePoint2DPtr aPoint2D = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(*aPtIt);
+ if (aPoint2D->isInitialized()) {
+ aXCoord = aPoint2D->x();
+ aYCoord = aPoint2D->y();
+ getRelative(aXCoord, aYCoord, aXCoord, aYCoord);
+ } else
+ aXCoord = aYCoord = 0;
+
+ aX.push_back(aXCoord);
+ aY.push_back(aYCoord);
+ }
+
+ // Calculate positions of copied features
+ for (int i = 0; i < myNumberOfCopies && anObjIt != anObjectList.end(); ++i, ++anObjIt) {
+ aFeature = ModelAPI_Feature::feature(*anObjIt);
+ if (!aFeature)
+ continue;
+
+ if (myIsEventsBlocked)
+ aFeature->data()->blockSendAttributeUpdated(true);
+
+ if (aFeature->getKind() == SketchPlugin_Circle::ID()) // update circle's radius
+ aFeature->real(SketchPlugin_Circle::RADIUS_ID())->setValue(
+ anOriginal->real(SketchPlugin_Circle::RADIUS_ID())->value());
+
+ aPoints = aFeature->data()->attributes(GeomDataAPI_Point2D::typeId());
+ for (aPtIt = aPoints.begin(), aXIt = aX.begin(), aYIt = aY.begin();
+ aPtIt != aPoints.end(); ++aXIt, ++aYIt, ++aPtIt) {
+ if (!(*aPtIt)->isInitialized())
+ continue;
+ transformRelative(*aXIt, *aYIt);
+ getAbsolute(*aXIt, *aYIt, aXCoord, aYCoord);
+
+ AttributePoint2DPtr aPoint2D =
+ std::dynamic_pointer_cast<GeomDataAPI_Point2D>(*aPtIt);
+ aPoint2D->setValue(aXCoord, aYCoord);
+ }
+
+ // update transformed entity if it exists in the storage
+ if (myStorage->entity(aFeature))
+ myStorage->update(aFeature);
+ }
+ }
+
myAdjusted = true;
}
-////void SketchSolver_ConstraintMulti::checkCoincidence()
-////{
-//// std::vector< std::vector<Slvs_hEntity> > aFilteredPoints; // points are filtered by their positions
-////
-//// std::vector< std::vector<Slvs_hEntity> >::const_iterator aPCIt = myPointsAndCopies.begin();
-//// std::vector<Slvs_hEntity>::const_iterator aCIt;
-//// for (; aPCIt != myPointsAndCopies.end(); ++aPCIt) {
-//// aCIt = aPCIt->begin();
-//// // Skip first element, focus the copies only
-//// for (++aCIt; aCIt != aPCIt->end(); ++aCIt) {
-//// std::vector< std::vector<Slvs_hEntity> >::iterator aFilterIt = aFilteredPoints.begin();
-//// for (; aFilterIt != aFilteredPoints.end(); ++aFilterIt)
-//// if (myStorage->isEqual(*aCIt, aFilterIt->front())) {
-//// aFilterIt->push_back(*aCIt);
-//// break;
-//// }
-//// if (aFilterIt == aFilteredPoints.end()) {
-//// std::vector<Slvs_hEntity> aNewFilter(1, *aCIt);
-//// aFilteredPoints.push_back(aNewFilter);
-//// }
-//// }
-//// }
-////
-//// // Check the coicidence of filtered points and remove extra fixation.
-//// // Also check separated points which are not fixed.
-//// std::vector< std::vector<Slvs_hEntity> >::iterator aFPIt = aFilteredPoints.begin();
-//// for (; aFPIt != aFilteredPoints.end(); ++aFPIt) {
-//// if (aFPIt->size() <= 1)
-//// continue;
-//// std::vector<Slvs_hEntity>::iterator anIt1, anIt2;
-//// for (anIt1 = aFPIt->begin(); anIt1 != aFPIt->end(); ++anIt1) {
-//// for (anIt2 = anIt1 + 1; anIt2 != aFPIt->end(); ++anIt2) {
-//// Slvs_hConstraint aFixed1, aFixed2;
-//// bool isFixed1 = myStorage->isPointFixed(*anIt1, aFixed1);
-//// bool isFixed2 = myStorage->isPointFixed(*anIt2, aFixed2);
-//// if (myStorage->isCoincident(*anIt1, *anIt2)) {
-//// if (!isFixed1 && isFixed2) {
-//// Slvs_hEntity aTmp = *anIt1;
-//// *anIt1 = *anIt2;
-//// *anIt2 = aTmp;
-//// } else if (isFixed1 && isFixed2) {
-//// // remove fixing of the second point
-//// myStorage->removeConstraint(aFixed2);
-//// std::vector<Slvs_hConstraint>::iterator aRemoveIt = mySlvsConstraints.begin();
-//// for (; aRemoveIt != mySlvsConstraints.end(); ++aRemoveIt)
-//// if (*aRemoveIt == aFixed2) {
-//// mySlvsConstraints.erase(aRemoveIt);
-//// break;
-//// }
-//// }
-//// } else {
-//// bool isFixed[2] = {
-//// myStorage->isPointFixed(*anIt1, aFixed1, true),
-//// myStorage->isPointFixed(*anIt2, aFixed2, true)
-//// };
-////
-//// Slvs_hEntity aPoint[2] = {*anIt1, *anIt2};
-//// for (int i = 0; i < 2; i++)
-//// if (!isFixed[i]) {
-//// Slvs_Constraint aConstraint = Slvs_MakeConstraint(SLVS_C_UNKNOWN, myGroup->getId(),
-//// SLVS_C_WHERE_DRAGGED, myGroup->getWorkplaneId(), 0.0,
-//// aPoint[i], SLVS_E_UNKNOWN, SLVS_E_UNKNOWN, SLVS_E_UNKNOWN);
-//// aConstraint.h = myStorage->addConstraint(aConstraint);
-//// mySlvsConstraints.push_back(aConstraint.h);
-//// }
-//// }
-//// }
-//// }
-//// }
-////}
+void SketchSolver_ConstraintMulti::notify(const FeaturePtr& theFeature,
+ PlaneGCSSolver_Update*)
+{
+ if (myOriginalFeatures.find(theFeature) == myOriginalFeatures.end() &&
+ myCopiedFeatures.find(theFeature) == myCopiedFeatures.end())
+ return; // the feature is not used by constraint => nothing to update
+
+ if (myIsProcessingNotify)
+ return; // "notify" is already processing
+
+ // do not adjust "multi"-constraint if the number of objects is changed,
+ // wait until the constraint is updated (issue #2425: changing number of copies by parameter)
+ if (myNumberOfCopies + 1 == myBaseConstraint->integer(nameNbObjects())->value()) {
+ myIsProcessingNotify = true;
+
+ // update derivative object
+ updateLocal();
+ myAdjusted = false;
+ adjustConstraint();
+
+ myIsProcessingNotify = false;
+ }
+}
+
+void SketchSolver_ConstraintMulti::blockEvents(bool isBlocked)
+{
+ myIsEventsBlocked = isBlocked;
+
+ std::set<FeaturePtr>::iterator anIt = myOriginalFeatures.begin();
+ for (; anIt != myOriginalFeatures.end(); ++anIt)
+ (*anIt)->data()->blockSendAttributeUpdated(isBlocked);
+ for (anIt = myCopiedFeatures.begin(); anIt != myCopiedFeatures.end(); ++anIt)
+ (*anIt)->data()->blockSendAttributeUpdated(isBlocked);
+
+ SketchSolver_Constraint::blockEvents(isBlocked);
+}
