+ if (aFound1 == aFound2 || aFound1 == theGroups.end() || aFound2 == theGroups.end())
+ return; // nothing to merge
+
+ aFound1->insert(aFound2->begin(), aFound2->end());
+ theGroups.erase(aFound2);
+}
+
+bool SketchSolver_Storage::removeCoincidence(ConstraintWrapperPtr theConstraint)
+{
+ std::list<EntityWrapperPtr> aPoints = theConstraint->entities();
+ std::list<EntityWrapperPtr>::const_iterator aPIt;
+
+ CoincidentPointsMap::iterator aPtPtIt = myCoincidentPoints.begin();
+ for (; aPtPtIt != myCoincidentPoints.end(); ++aPtPtIt) {
+ for (aPIt = aPoints.begin(); aPIt != aPoints.end(); ++aPIt)
+ if (aPtPtIt->first == *aPIt ||
+ aPtPtIt->second.find(*aPIt) != aPtPtIt->second.end())
+ break;
+ if (aPIt != aPoints.end())
+ break;
+ }
+
+ if (aPtPtIt == myCoincidentPoints.end())
+ return true; // already removed
+
+ // Removing of coincidence may split this group of coincident point to several groups.
+ // Find all of them and also the points which become alone.
+ std::list< std::set<EntityWrapperPtr> > aCoincGroups;
+ std::set<EntityWrapperPtr> aGroup;
+ aGroup.insert(aPtPtIt->first);
+ aCoincGroups.push_back(aGroup);
+ std::set<EntityWrapperPtr>::const_iterator aTempIt = aPtPtIt->second.begin();
+ for (; aTempIt != aPtPtIt->second.end(); ++aTempIt) {
+ aGroup.clear();
+ aGroup.insert(*aTempIt);
+ aCoincGroups.push_back(aGroup);
+ }
+
+ std::map<ConstraintPtr, std::list<ConstraintWrapperPtr> >::iterator
+ aConstrIt = myConstraintMap.begin();
+ for (; aConstrIt != myConstraintMap.end(); ++aConstrIt) {
+ if (aConstrIt->first->getKind() != SketchPlugin_ConstraintCoincidence::ID())
+ continue;
+
+ AttributeRefAttrPtr aRefAttr[2] = {
+ aConstrIt->first->refattr(SketchPlugin_Constraint::ENTITY_A()),
+ aConstrIt->first->refattr(SketchPlugin_Constraint::ENTITY_B())
+ };
+ AttributePtr anAttr[2];
+ if (aConstrIt->first->data()->isValid()) {
+ if (!aRefAttr[0] || !aRefAttr[1])
+ continue;
+
+ for (int i = 0; i < 2; ++i) {
+ if (aRefAttr[i]->isObject()) {
+ FeaturePtr aFeature = ModelAPI_Feature::feature(aRefAttr[i]->object());
+ if (!aFeature || (aFeature->getKind() != SketchPlugin_Point::ID() &&
+ aFeature->getKind() != SketchPlugin_IntersectionPoint::ID()))
+ continue;
+ anAttr[i] = aFeature->attribute(SketchPlugin_Point::COORD_ID());
+ } else
+ anAttr[i] = aRefAttr[i]->attr();
+ }
+ } else {
+ // obtain attributes from the constraint wrapper
+ // if SketchPlugin_Constraint has invalid data (already removed)
+ ConstraintWrapperPtr aWrapper = aConstrIt->second.front();
+ anAttr[0] = aWrapper->entities().front()->baseAttribute();
+ anAttr[1] = aWrapper->entities().back()->baseAttribute();
+ }
+
+ EntityWrapperPtr anEntities[2];
+ for (int i = 0; i < 2; ++i) {
+ std::map<AttributePtr, EntityWrapperPtr>::iterator
+ aFound = myAttributeMap.find(anAttr[i]);
+ if (aFound != myAttributeMap.end())
+ anEntities[i] = aFound->second;
+ }
+ mergeGroups(aCoincGroups, anEntities[0], anEntities[1]);
+ }
+
+ // Collect alone points and build them new instances
+ std::list<EntityWrapperPtr> aShutOffList;
+ BuilderPtr aBuilder = SketchSolver_Manager::instance()->builder();
+ std::map<EntityWrapperPtr, EntityWrapperPtr> aNotCoinc;
+ std::list<std::set<EntityWrapperPtr> >::iterator aGroupIt = aCoincGroups.begin();
+ while (aGroupIt != aCoincGroups.end()) {
+ if (aGroupIt->size() == 1) {
+ EntityWrapperPtr aPoint = *aGroupIt->begin();
+ aShutOffList.push_back(aPoint);
+ aNotCoinc[aPoint] =
+ aBuilder->createAttribute(aPoint->baseAttribute(), myGroupID, mySketchID);
+ std::list<std::set<EntityWrapperPtr> >::iterator aRemoveIt = aGroupIt++;
+ aCoincGroups.erase(aRemoveIt);
+ } else // point is not alone
+ ++aGroupIt;
+ }
+
+ if (aNotCoinc.empty() && aCoincGroups.size() == 1)
+ return false;
+
+ // Find all features and constraints uses non-coincident points
+ replaceEntities(aNotCoinc);
+
+ // Remove not coincident points and points in separated groups
+ if (!aCoincGroups.empty()) {
+ aGroupIt = aCoincGroups.begin();
+ for (++aGroupIt; aGroupIt != aCoincGroups.end(); ++aGroupIt)
+ aShutOffList.insert(aShutOffList.end(), aGroupIt->begin(), aGroupIt->end());
+ }
+ std::list<EntityWrapperPtr>::iterator aNotCIt = aShutOffList.begin();
+ for (; aNotCIt != aShutOffList.end(); ++aNotCIt) {
+ if (aPtPtIt->second.size() <= 1) {
+ myCoincidentPoints.erase(aPtPtIt);
+ break;