X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchSolver%2FSketchSolver_Storage.cpp;h=c63d28e437a662c61818cf2c85b400e6f0f3516d;hb=eef14b29d313b9dd16453d12f20aa02383ee139c;hp=acefc6396f92eab1282fd7eda5deec61f8910077;hpb=f7b1a2df009368da963a7f20849d88ccf05d75af;p=modules%2Fshaper.git diff --git a/src/SketchSolver/SketchSolver_Storage.cpp b/src/SketchSolver/SketchSolver_Storage.cpp index acefc6396..c63d28e43 100644 --- a/src/SketchSolver/SketchSolver_Storage.cpp +++ b/src/SketchSolver/SketchSolver_Storage.cpp @@ -12,6 +12,10 @@ #include #include #include +#include +#include +#include +#include /// \brief Verify two vectors of constraints are equal. @@ -71,12 +75,34 @@ void SketchSolver_Storage::addConstraint( for (; aCIt != theSolverConstraints.end(); ++aCIt) update(*aCIt); } - myConstraintMap[theConstraint] = theSolverConstraints; + + if (!theSolverConstraints.empty() || aFound == myConstraintMap.end()) + myConstraintMap[theConstraint] = theSolverConstraints; // block events if necessary - if (myEventsBlocked && theConstraint->data() && theConstraint->data()->isValid()) + if (myEventsBlocked && theConstraint && theConstraint->data() && theConstraint->data()->isValid()) theConstraint->data()->blockSendAttributeUpdated(myEventsBlocked); } +static std::list pointAttributes(FeaturePtr theFeature) +{ + std::list aPoints; + if (theFeature->getKind() == SketchPlugin_Arc::ID()) { + aPoints.push_back(theFeature->attribute(SketchPlugin_Arc::CENTER_ID())); + aPoints.push_back(theFeature->attribute(SketchPlugin_Arc::START_ID())); + aPoints.push_back(theFeature->attribute(SketchPlugin_Arc::END_ID())); + } + else if (theFeature->getKind() == SketchPlugin_Circle::ID()) + aPoints.push_back(theFeature->attribute(SketchPlugin_Circle::CENTER_ID())); + else if (theFeature->getKind() == SketchPlugin_Line::ID()) { + aPoints.push_back(theFeature->attribute(SketchPlugin_Line::START_ID())); + aPoints.push_back(theFeature->attribute(SketchPlugin_Line::END_ID())); + } + else if (theFeature->getKind() == SketchPlugin_Point::ID() || + theFeature->getKind() == SketchPlugin_IntersectionPoint::ID()) + aPoints.push_back(theFeature->attribute(SketchPlugin_Point::COORD_ID())); + return aPoints; +} + void SketchSolver_Storage::addEntity(FeaturePtr theFeature, EntityWrapperPtr theSolverEntity) { @@ -87,11 +113,10 @@ void SketchSolver_Storage::addEntity(FeaturePtr theFeature, if (!theSolverEntity) { // feature links to the empty entity, add its attributes - std::list aPntAttrs = - theFeature->data()->attributes(GeomDataAPI_Point2D::typeId()); + std::list aPntAttrs = pointAttributes(theFeature); std::list::const_iterator anAttrIt = aPntAttrs.begin(); for (; anAttrIt != aPntAttrs.end(); ++anAttrIt) - addEntity(*anAttrIt, EntityWrapperPtr()); + addEntity(*anAttrIt, EntityWrapperPtr()); if (aFound == myFeatureMap.end()) myFeatureMap[theFeature] = theSolverEntity; } else @@ -128,8 +153,7 @@ bool SketchSolver_Storage::update(FeaturePtr theFeature, const GroupID& theGroup // Reserve the feature in the map of features (do not want to add several copies of it) myFeatureMap[theFeature] = aRelated; // Firstly, create/update its attributes - std::list anAttrs = - theFeature->data()->attributes(GeomDataAPI_Point2D::typeId()); + std::list anAttrs = pointAttributes(theFeature); std::list::const_iterator anIt = anAttrs.begin(); for (; anIt != anAttrs.end(); ++anIt) { isUpdated = update(*anIt, theGroup) || isUpdated; @@ -150,6 +174,11 @@ bool SketchSolver_Storage::update(FeaturePtr theFeature, const GroupID& theGroup // Secondly, convert feature BuilderPtr aBuilder = SketchSolver_Manager::instance()->builder(); GroupID aGroup = theGroup != GID_UNKNOWN ? theGroup : myGroupID; + // Check external feature + std::shared_ptr aSketchFeature = + std::dynamic_pointer_cast(theFeature); + if (aSketchFeature && aSketchFeature->isExternal()) + aGroup = GID_OUTOFGROUP; aRelated = aBuilder->createFeature(theFeature, aSubs, aGroup); if (!aRelated) return false; @@ -182,13 +211,20 @@ bool SketchSolver_Storage::update(AttributePtr theAttribute, const GroupID& theG if (aFeature->attribute(SketchPlugin_Arc::CENTER_ID())->isInitialized() && aFeature->attribute(SketchPlugin_Arc::START_ID())->isInitialized() && aFeature->attribute(SketchPlugin_Arc::END_ID())->isInitialized()) { -//// myFeatureMap[aFeature] = EntityWrapperPtr(); return SketchSolver_Storage::update(aFeature); + } else { + myFeatureMap[aFeature] = EntityWrapperPtr(); + myExistArc = true; } } } BuilderPtr aBuilder = SketchSolver_Manager::instance()->builder(); GroupID aGroup = theGroup != GID_UNKNOWN ? theGroup : myGroupID; + // Check attribute of external features + std::shared_ptr aSketchFeature = + std::dynamic_pointer_cast(theAttribute->owner()); + if (aSketchFeature && aSketchFeature->isExternal()) + aGroup = GID_OUTOFGROUP; aRelated = aBuilder->createAttribute(anAttribute, aGroup); if (!aRelated) return false; @@ -271,6 +307,8 @@ bool SketchSolver_Storage::removeConstraint(ConstraintPtr theConstraint) template static bool isUsed(ConstraintWrapperPtr theConstraint, ENT_TYPE theEntity) { + if (!theConstraint || !theEntity) + return false; std::list::const_iterator anEntIt = theConstraint->entities().begin(); for (; anEntIt != theConstraint->entities().end(); ++anEntIt) if ((*anEntIt)->isBase(theEntity)) @@ -280,6 +318,8 @@ static bool isUsed(ConstraintWrapperPtr theConstraint, ENT_TYPE theEntity) static bool isUsed(EntityWrapperPtr theFeature, AttributePtr theSubEntity) { + if (!theFeature || !theSubEntity) + return false; std::list::const_iterator aSubIt = theFeature->subEntities().begin(); for (; aSubIt != theFeature->subEntities().end(); ++aSubIt) if ((*aSubIt)->isBase(theSubEntity)) @@ -287,6 +327,22 @@ static bool isUsed(EntityWrapperPtr theFeature, AttributePtr theSubEntity) return false; } +static bool isUsed(ConstraintPtr theConstraint, AttributePtr theAttribute) +{ + if (!theConstraint || !theAttribute) + return false; + std::list anAttrList = theConstraint->data()->attributes(std::string()); + std::list::const_iterator anIt = anAttrList.begin(); + for (; anIt != anAttrList.end(); ++anIt) { + if (*anIt == theAttribute) + return true; + AttributeRefAttrPtr aRefAttr = std::dynamic_pointer_cast(*anIt); + if (aRefAttr && !aRefAttr->isObject() && aRefAttr->attr() == theAttribute) + return true; + } + return false; +} + bool SketchSolver_Storage::isUsed(FeaturePtr theFeature) const { if (myFeatureMap.find(theFeature) != myFeatureMap.end()) @@ -300,7 +356,7 @@ bool SketchSolver_Storage::isUsed(FeaturePtr theFeature) const if (::isUsed(*aCWIt, theFeature)) return true; // check attributes - std::list anAttrList = theFeature->data()->attributes(GeomDataAPI_Point2D::typeId()); + std::list anAttrList = pointAttributes(theFeature); std::list::const_iterator anIt = anAttrList.begin(); for (; anIt != anAttrList.end(); ++anIt) if (isUsed(*anIt)) @@ -325,10 +381,15 @@ bool SketchSolver_Storage::isUsed(AttributePtr theAttribute) const std::map >::const_iterator aCIt = myConstraintMap.begin(); std::list::const_iterator aCWIt; - for (; aCIt != myConstraintMap.end(); ++aCIt) + for (; aCIt != myConstraintMap.end(); ++aCIt) { for (aCWIt = aCIt->second.begin(); aCWIt != aCIt->second.end(); ++aCWIt) if (::isUsed(*aCWIt, anAttribute)) return true; + // Additional check for the Fixed constraints, which have no wrapper associated. + if (aCIt->first->getKind() == SketchPlugin_ConstraintRigid::ID() && + ::isUsed(aCIt->first, anAttribute)) + return true; + } // check in features std::map::const_iterator aFIt = myFeatureMap.begin(); for (; aFIt != myFeatureMap.end(); ++aFIt) @@ -342,13 +403,13 @@ bool SketchSolver_Storage::removeEntity(FeaturePtr theFeature) { std::map::iterator aFound = myFeatureMap.find(theFeature); if (aFound == myFeatureMap.end()) - return false; // feature not found, nothing to delete + return true; // feature not found, nothing to delete EntityWrapperPtr anEntity = aFound->second; myFeatureMap.erase(aFound); // Check if the feature is not used by constraints, remove it - if (!isUsed(theFeature) && remove(anEntity)) + if (!anEntity || (!isUsed(theFeature) && remove(anEntity))) return true; // feature is not removed, revert operation @@ -361,13 +422,13 @@ bool SketchSolver_Storage::removeEntity(AttributePtr theAttribute) { std::map::iterator aFound = myAttributeMap.find(theAttribute); if (aFound == myAttributeMap.end()) - return false; // attribute not found, nothing to delete + return true; // attribute not found, nothing to delete EntityWrapperPtr anEntity = aFound->second; myAttributeMap.erase(aFound); // Check if the attribute is not used by constraints and features, remove it - if (!isUsed(theAttribute) && remove(anEntity)) + if (!anEntity || (!isUsed(theAttribute) && remove(anEntity))) return true; // attribute is not removed, revert operation @@ -572,6 +633,22 @@ void SketchSolver_Storage::setSketch(const EntityWrapperPtr& theSketch) addEntity(FeaturePtr(), theSketch); } +void SketchSolver_Storage::processArcs() +{ + myExistArc = false; + std::map::iterator aFIt = myFeatureMap.begin(); + for (; aFIt != myFeatureMap.end(); ++aFIt) + if (!aFIt->second && aFIt->first->getKind() == SketchPlugin_Arc::ID()) { + // Additional checking the attributes are initialized + if (aFIt->first->attribute(SketchPlugin_Arc::CENTER_ID())->isInitialized() && + aFIt->first->attribute(SketchPlugin_Arc::START_ID())->isInitialized() && + aFIt->first->attribute(SketchPlugin_Arc::END_ID())->isInitialized()) + update(aFIt->first); + else + myExistArc = true; + } +} + void SketchSolver_Storage::blockEvents(bool isBlocked) { if (isBlocked == myEventsBlocked) @@ -596,6 +673,21 @@ void SketchSolver_Storage::blockEvents(bool isBlocked) myEventsBlocked = isBlocked; } +std::set SketchSolver_Storage::getConflictingConstraints(SolverPtr theSolver) const +{ + std::set aConflicting; + std::map >::const_iterator + aConstrIt = myConstraintMap.begin(); + for (; aConstrIt != myConstraintMap.end(); ++aConstrIt) { + std::list::const_iterator anIt = aConstrIt->second.begin(); + for (; anIt != aConstrIt->second.end(); ++anIt) + if (theSolver->isConflicting((*anIt)->id())) { + aConflicting.insert(aConstrIt->first); + break; + } + } + return aConflicting; +}