+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
// File: SketchSolver_ConstraintGroup.cpp
// Created: 27 May 2014
// Author: Artem ZHIDKOV
/// Tolerance for value of parameters
const double tolerance = 1.e-10;
-/*
+/**
* Collects all sketch solver error' codes
* as inline static functions
- * TODO: Move this class into a separate file
*/
+ // TODO: Move this class into a separate file
class SketchSolver_Error
{
public:
// ========================================================
SketchSolver_ConstraintGroup::SketchSolver_ConstraintGroup(
- boost::shared_ptr<ModelAPI_CompositeFeature> theWorkplane)
+ std::shared_ptr<ModelAPI_CompositeFeature> theWorkplane)
: myID(++myGroupIndexer),
myParamMaxID(0),
myEntityMaxID(0),
// Purpose: verify the group is based on the given workplane
// ============================================================================
bool SketchSolver_ConstraintGroup::isBaseWorkplane(
- boost::shared_ptr<ModelAPI_CompositeFeature> theWorkplane) const
+ std::shared_ptr<ModelAPI_CompositeFeature> theWorkplane) const
{
return theWorkplane == mySketch;
}
// Purpose: verify are there any entities in the group used by given constraint
// ============================================================================
bool SketchSolver_ConstraintGroup::isInteract(
- boost::shared_ptr<SketchPlugin_Feature> theFeature) const
+ std::shared_ptr<SketchPlugin_Feature> theFeature) const
{
// Check the group is empty
if (isEmpty())
return true;
+ // Check if the feature is already in the group
+ if (myEntityFeatMap.find(theFeature) != myEntityFeatMap.end())
+ return true;
+ std::shared_ptr<SketchPlugin_Constraint> aConstr =
+ std::dynamic_pointer_cast<SketchPlugin_Constraint>(theFeature);
+ if (aConstr && myConstraintMap.find(aConstr) != myConstraintMap.end())
+ return true;
+
// Go through the attributes and verify if some of them already in the group
- std::list<boost::shared_ptr<ModelAPI_Attribute>>
+ std::list<std::shared_ptr<ModelAPI_Attribute>>
anAttrList = theFeature->data()->attributes(std::string());
- std::list<boost::shared_ptr<ModelAPI_Attribute>>::const_iterator
+ std::list<std::shared_ptr<ModelAPI_Attribute>>::const_iterator
anAttrIter = anAttrList.begin();
for ( ; anAttrIter != anAttrList.end(); anAttrIter++) {
- boost::shared_ptr<ModelAPI_AttributeRefAttr> aCAttrRef =
- boost::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>(*anAttrIter);
+ std::shared_ptr<ModelAPI_AttributeRefAttr> aCAttrRef =
+ std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>(*anAttrIter);
if (!aCAttrRef || !aCAttrRef->isObject()) {
- boost::shared_ptr<ModelAPI_Attribute> anAttr =
+ std::shared_ptr<ModelAPI_Attribute> anAttr =
aCAttrRef ? aCAttrRef->attr() : *anAttrIter;
if (myEntityAttrMap.find(anAttr) != myEntityAttrMap.end())
return true;
} else {
- ResultConstructionPtr aRC = boost::dynamic_pointer_cast<ModelAPI_ResultConstruction>(
+ ResultConstructionPtr aRC = std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(
aCAttrRef->object());
if (!aRC)
continue;
- boost::shared_ptr<ModelAPI_Document> aDoc = aRC->document();
+ std::shared_ptr<ModelAPI_Document> aDoc = aRC->document();
FeaturePtr aFeature = aDoc->feature(aRC);
if (myEntityFeatMap.find(aFeature) != myEntityFeatMap.end())
return true;
// search attributes of a feature to be parameters of constraint
- std::list<boost::shared_ptr<ModelAPI_Attribute> > aFeatAttrList =
+ std::list<std::shared_ptr<ModelAPI_Attribute> > aFeatAttrList =
aFeature->data()->attributes(std::string());
- std::list<boost::shared_ptr<ModelAPI_Attribute> >::const_iterator aFAIter = aFeatAttrList
+ std::list<std::shared_ptr<ModelAPI_Attribute> >::const_iterator aFAIter = aFeatAttrList
.begin();
for (; aFAIter != aFeatAttrList.end(); aFAIter++)
if (myEntityAttrMap.find(*aFAIter) != myEntityAttrMap.end())
// point coordinates
int aPtPos = Search(theConstraint.ptA, myEntities);
int aPtParamPos = Search(myEntities[aPtPos].param[0], myParams);
- boost::shared_ptr<GeomAPI_XY> aPoint(
+ std::shared_ptr<GeomAPI_XY> aPoint(
new GeomAPI_XY(myParams[aPtParamPos].val, myParams[aPtParamPos + 1].val));
// line coordinates
int aLnPos = Search(theConstraint.entityA, myEntities);
aPtPos = Search(myEntities[aLnPos].point[0], myEntities);
aPtParamPos = Search(myEntities[aPtPos].param[0], myParams);
- boost::shared_ptr<GeomAPI_XY> aStart(
+ std::shared_ptr<GeomAPI_XY> aStart(
new GeomAPI_XY(-myParams[aPtParamPos].val, -myParams[aPtParamPos + 1].val));
aPtPos = Search(myEntities[aLnPos].point[1], myEntities);
aPtParamPos = Search(myEntities[aPtPos].param[0], myParams);
- boost::shared_ptr<GeomAPI_XY> aEnd(
+ std::shared_ptr<GeomAPI_XY> aEnd(
new GeomAPI_XY(myParams[aPtParamPos].val, myParams[aPtParamPos + 1].val));
aEnd = aEnd->added(aStart);
// Purpose: create/update the constraint in the group
// ============================================================================
bool SketchSolver_ConstraintGroup::changeConstraint(
- boost::shared_ptr<SketchPlugin_Constraint> theConstraint)
+ std::shared_ptr<SketchPlugin_Constraint> theConstraint)
{
// There is no workplane yet, something wrong
if (myWorkplane.h == SLVS_E_UNKNOWN)
// Create constraint parameters
double aDistance = 0.0; // scalar value of the constraint
- AttributeDoublePtr aDistAttr = boost::dynamic_pointer_cast<ModelAPI_AttributeDouble>(
+ AttributeDoublePtr aDistAttr = std::dynamic_pointer_cast<ModelAPI_AttributeDouble>(
theConstraint->data()->attribute(SketchPlugin_Constraint::VALUE()));
if (aDistAttr) {
aDistance = aDistAttr->value();
+ // Issue #196: checking the positivity of the distance constraint
+ if (aDistance < tolerance &&
+ (aConstrType == SLVS_C_PT_PT_DISTANCE || aConstrType == SLVS_C_PT_LINE_DISTANCE))
+ return false;
// SketchPlugin circle defined by its radius, but SolveSpace uses constraint for diameter
if (aConstrType == SLVS_C_DIAMETER)
aDistance *= 2.0;
Slvs_hEntity aConstrEnt[CONSTRAINT_ATTR_SIZE]; // parameters of the constraint
for (unsigned int indAttr = 0; indAttr < CONSTRAINT_ATTR_SIZE; indAttr++) {
aConstrEnt[indAttr] = SLVS_E_UNKNOWN;
- boost::shared_ptr<ModelAPI_AttributeRefAttr> aConstrAttr = boost::dynamic_pointer_cast<
+ std::shared_ptr<ModelAPI_AttributeRefAttr> aConstrAttr = std::dynamic_pointer_cast<
ModelAPI_AttributeRefAttr>(
theConstraint->data()->attribute(aConstraintAttributes[indAttr]));
if (!aConstrAttr)
// Convert the object of the attribute to the feature
FeaturePtr aFeature;
if (aConstrAttr->isObject() && aConstrAttr->object()) {
- ResultConstructionPtr aRC = boost::dynamic_pointer_cast<ModelAPI_ResultConstruction>(
+ ResultConstructionPtr aRC = std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(
aConstrAttr->object());
if (!aRC)
continue;
- boost::shared_ptr<ModelAPI_Document> aDoc = aRC->document();
+ std::shared_ptr<ModelAPI_Document> aDoc = aRC->document();
aFeature = aDoc->feature(aRC);
}
// For the length constraint the start and end points of the line should be added to the entities list instead of line
if (aConstrType == SLVS_C_PT_PT_DISTANCE
&& theConstraint->getKind().compare(SketchPlugin_ConstraintLength::ID()) == 0) {
- Slvs_hEntity aLineEnt = changeEntity(aFeature);
+ Slvs_hEntity aLineEnt = changeEntityFeature(aFeature);
int aEntPos = Search(aLineEnt, myEntities);
aConstrEnt[indAttr++] = myEntities[aEntPos].point[0];
aConstrEnt[indAttr++] = myEntities[aEntPos].point[1];
aConstrEnt[indAttr++] = 0;
break; // there should be no other entities
} else if (aConstrAttr->isObject())
- aConstrEnt[indAttr] = changeEntity(aFeature);
+ aConstrEnt[indAttr] = changeEntityFeature(aFeature);
else
aConstrEnt[indAttr] = changeEntity(aConstrAttr->attr());
}
// Purpose: create/update the "Rigid" constraint in the group
// ============================================================================
bool SketchSolver_ConstraintGroup::changeRigidConstraint(
- boost::shared_ptr<SketchPlugin_Constraint> theConstraint)
+ std::shared_ptr<SketchPlugin_Constraint> theConstraint)
{
// Search this constraint in the current group to update it
ConstraintMap::const_iterator aConstrMapIter = myConstraintMap.find(theConstraint);
const std::vector<std::string>& aConstraintAttributes = aConstraint.getAttributes();
Slvs_hEntity aConstrEnt = SLVS_E_UNKNOWN;
- boost::shared_ptr<ModelAPI_AttributeRefAttr> aConstrAttr = boost::dynamic_pointer_cast<
+ std::shared_ptr<ModelAPI_AttributeRefAttr> aConstrAttr = std::dynamic_pointer_cast<
ModelAPI_AttributeRefAttr>(
theConstraint->data()->attribute(aConstraintAttributes[0]));
if (!aConstrAttr)
// Convert the object of the attribute to the feature
FeaturePtr aFeature;
if (aConstrAttr->isObject() && aConstrAttr->object()) {
- ResultConstructionPtr aRC = boost::dynamic_pointer_cast<ModelAPI_ResultConstruction>(
+ ResultConstructionPtr aRC = std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(
aConstrAttr->object());
if (!aRC)
return false;
- boost::shared_ptr<ModelAPI_Document> aDoc = aRC->document();
+ std::shared_ptr<ModelAPI_Document> aDoc = aRC->document();
aFeature = aDoc->feature(aRC);
}
- aConstrEnt = aConstrAttr->isObject() ? changeEntity(aFeature) : changeEntity(aConstrAttr->attr());
+ aConstrEnt = aConstrAttr->isObject() ? changeEntityFeature(aFeature) : changeEntity(aConstrAttr->attr());
if (aConstrMapIter == myConstraintMap.end()) { // Add new constraint
// Check the fixed entity is not a point.
- boost::shared_ptr<ModelAPI_AttributeRefAttr> aConstrAttr = boost::dynamic_pointer_cast<
+ std::shared_ptr<ModelAPI_AttributeRefAttr> aConstrAttr = std::dynamic_pointer_cast<
ModelAPI_AttributeRefAttr>(theConstraint->data()->attribute(aConstraintAttributes[0]));
- boost::shared_ptr<GeomDataAPI_Point> aPoint =
- boost::dynamic_pointer_cast<GeomDataAPI_Point>(aConstrAttr->attr());
- boost::shared_ptr<GeomDataAPI_Point2D> aPoint2D =
- boost::dynamic_pointer_cast<GeomDataAPI_Point2D>(aConstrAttr->attr());
+ std::shared_ptr<GeomDataAPI_Point> aPoint =
+ std::dynamic_pointer_cast<GeomDataAPI_Point>(aConstrAttr->attr());
+ std::shared_ptr<GeomDataAPI_Point2D> aPoint2D =
+ std::dynamic_pointer_cast<GeomDataAPI_Point2D>(aConstrAttr->attr());
if (aPoint || aPoint2D) {
// Create SolveSpace constraint structure
Slvs_Constraint aConstraint = Slvs_MakeConstraint(
bool isCircle = false;
if (aFeature) {
if (aFeature->getKind() == SketchPlugin_Arc::ID()) {
- boost::shared_ptr<GeomDataAPI_Point2D> aCenter =
- boost::dynamic_pointer_cast<GeomDataAPI_Point2D>(
+ std::shared_ptr<GeomDataAPI_Point2D> aCenter =
+ std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
aFeature->data()->attribute(SketchPlugin_Arc::CENTER_ID()));
- boost::shared_ptr<GeomDataAPI_Point2D> aStart =
- boost::dynamic_pointer_cast<GeomDataAPI_Point2D>(
+ std::shared_ptr<GeomDataAPI_Point2D> aStart =
+ std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
aFeature->data()->attribute(SketchPlugin_Arc::START_ID()));
aRadius = aStart->pnt()->distance(aCenter->pnt());
isArc = true;
} else if (aFeature->getKind() == SketchPlugin_Circle::ID()) {
- aRadius = boost::dynamic_pointer_cast<ModelAPI_AttributeDouble>(
+ aRadius = std::dynamic_pointer_cast<ModelAPI_AttributeDouble>(
aFeature->data()->attribute(SketchPlugin_Circle::RADIUS_ID()))->value();
isCircle = true;
}
// Purpose: create/update the element affected by any constraint
// ============================================================================
Slvs_hEntity SketchSolver_ConstraintGroup::changeEntity(
- boost::shared_ptr<ModelAPI_Attribute> theEntity)
+ std::shared_ptr<ModelAPI_Attribute> theEntity)
{
// If the entity is already in the group, try to find it
- std::map<boost::shared_ptr<ModelAPI_Attribute>, Slvs_hEntity>::const_iterator aEntIter =
+ std::map<std::shared_ptr<ModelAPI_Attribute>, Slvs_hEntity>::const_iterator aEntIter =
myEntityAttrMap.find(theEntity);
int aEntPos;
std::vector<Slvs_Param>::const_iterator aParamIter; // looks at first parameter of already existent entity or at the end of vector otherwise
aParamIter = myParams.begin() + aParamPos;
}
const bool isEntExists = (aEntIter != myEntityAttrMap.end()); // defines that the entity already exists
- bool isFixed = false; // identify the entity is used in "Rigid" constraint
const bool isNeedToSolve = myNeedToSolve;
myNeedToSolve = false;
if (aCoincIter->find(aEntIter->second) != aCoincIter->end())
break;
std::set<Slvs_hEntity> aCoincident;
- if (aCoincIter != myCoincidentPoints.end())
+ if (aCoincIter != myCoincidentPoints.end()) {
aCoincident = *aCoincIter;
- else
- aCoincident.insert(aEntIter->second);
-
- std::vector<Slvs_Constraint>::const_iterator aConstrIter = myConstraints.begin();
- for (; aConstrIter != myConstraints.end(); aConstrIter++)
- if (aConstrIter->type == SLVS_C_WHERE_DRAGGED &&
- aCoincident.find(aConstrIter->ptA) != aCoincident.end()) {
- isFixed = true;
- break;
- }
+ aCoincident.erase(aEntIter->second);
+
+ std::vector<Slvs_Constraint>::const_iterator aConstrIter = myConstraints.begin();
+ for (; aConstrIter != myConstraints.end(); aConstrIter++)
+ if (aConstrIter->type == SLVS_C_WHERE_DRAGGED &&
+ aCoincident.find(aConstrIter->ptA) != aCoincident.end()) {
+ myNeedToSolve = true;
+ return aEntIter->second;
+ }
+ }
}
// Look over supported types of entities
Slvs_Entity aNewEntity;
aNewEntity.h = SLVS_E_UNKNOWN;
- double anOldValues[3];
// Point in 3D
- boost::shared_ptr<GeomDataAPI_Point> aPoint = boost::dynamic_pointer_cast<GeomDataAPI_Point>(
+ std::shared_ptr<GeomDataAPI_Point> aPoint = std::dynamic_pointer_cast<GeomDataAPI_Point>(
theEntity);
if (aPoint) {
- if (isFixed)
- {
- anOldValues[0] = aParamIter->val;
- anOldValues[1] = (aParamIter+1)->val;
- anOldValues[2] = (aParamIter+2)->val;
- }
Slvs_hParam aX = changeParameter(aPoint->x(), aParamIter);
Slvs_hParam aY = changeParameter(aPoint->y(), aParamIter);
Slvs_hParam aZ = changeParameter(aPoint->z(), aParamIter);
- if (isFixed && myNeedToSolve)
- { // the entity is fixed, but its parameters are changed, we need to revert them and recalculate current sketch
- aParamIter -= 3;
- changeParameter(anOldValues[0], aParamIter);
- changeParameter(anOldValues[1], aParamIter);
- changeParameter(anOldValues[2], aParamIter);
- }
if (!isEntExists) // New entity
aNewEntity = Slvs_MakePoint3d(++myEntityMaxID, myID, aX, aY, aZ);
} else {
return SLVS_E_UNKNOWN;
// Point in 2D
- boost::shared_ptr<GeomDataAPI_Point2D> aPoint2D =
- boost::dynamic_pointer_cast<GeomDataAPI_Point2D>(theEntity);
+ std::shared_ptr<GeomDataAPI_Point2D> aPoint2D =
+ std::dynamic_pointer_cast<GeomDataAPI_Point2D>(theEntity);
if (aPoint2D) {
- if (isFixed)
- {
- anOldValues[0] = aParamIter->val;
- anOldValues[1] = (aParamIter+1)->val;
- }
Slvs_hParam aU = changeParameter(aPoint2D->x(), aParamIter);
Slvs_hParam aV = changeParameter(aPoint2D->y(), aParamIter);
- if (isFixed && myNeedToSolve)
- { // the entity is fixed, but its parameters are changed, we need to revert them and recalculate current sketch
- aParamIter -= 2;
- changeParameter(anOldValues[0], aParamIter);
- changeParameter(anOldValues[1], aParamIter);
- }
if (!isEntExists) // New entity
aNewEntity = Slvs_MakePoint2d(++myEntityMaxID, myID, myWorkplane.h, aU, aV);
} else {
// Scalar value (used for the distance entities)
- AttributeDoublePtr aScalar = boost::dynamic_pointer_cast<ModelAPI_AttributeDouble>(theEntity);
+ AttributeDoublePtr aScalar = std::dynamic_pointer_cast<ModelAPI_AttributeDouble>(theEntity);
if (aScalar) {
- if (isFixed)
- anOldValues[0] = aParamIter->val;
Slvs_hParam aValue = changeParameter(aScalar->value(), aParamIter);
- if (isFixed && myNeedToSolve)
- { // the entity is fixed, but its parameters are changed, we need to revert them and recalculate current sketch
- aParamIter--;
- changeParameter(anOldValues[0], aParamIter);
- }
if (!isEntExists) // New entity
aNewEntity = Slvs_MakeDistance(++myEntityMaxID, myID, myWorkplane.h, aValue);
}
// Class: SketchSolver_ConstraintGroup
// Purpose: create/update the element defined by the feature affected by any constraint
// ============================================================================
-Slvs_hEntity SketchSolver_ConstraintGroup::changeEntity(FeaturePtr theEntity)
+Slvs_hEntity SketchSolver_ConstraintGroup::changeEntityFeature(FeaturePtr theEntity)
{
if (!theEntity->data()->isValid())
return SLVS_E_UNKNOWN;
aNewEntity.h = SLVS_E_UNKNOWN;
// SketchPlugin features
- boost::shared_ptr<SketchPlugin_Feature> aFeature = boost::dynamic_pointer_cast<
+ std::shared_ptr<SketchPlugin_Feature> aFeature = std::dynamic_pointer_cast<
SketchPlugin_Feature>(theEntity);
if (aFeature) { // Verify the feature by its kind
const std::string& aFeatureKind = aFeature->getKind();
// Purpose: create/update the normal of workplane
// ============================================================================
Slvs_hEntity SketchSolver_ConstraintGroup::changeNormal(
- boost::shared_ptr<ModelAPI_Attribute> theDirX, boost::shared_ptr<ModelAPI_Attribute> theDirY,
- boost::shared_ptr<ModelAPI_Attribute> theNorm)
+ std::shared_ptr<ModelAPI_Attribute> theDirX, std::shared_ptr<ModelAPI_Attribute> theDirY,
+ std::shared_ptr<ModelAPI_Attribute> theNorm)
{
- boost::shared_ptr<GeomDataAPI_Dir> aDirX = boost::dynamic_pointer_cast<GeomDataAPI_Dir>(theDirX);
- boost::shared_ptr<GeomDataAPI_Dir> aDirY = boost::dynamic_pointer_cast<GeomDataAPI_Dir>(theDirY);
+ std::shared_ptr<GeomDataAPI_Dir> aDirX = std::dynamic_pointer_cast<GeomDataAPI_Dir>(theDirX);
+ std::shared_ptr<GeomDataAPI_Dir> aDirY = std::dynamic_pointer_cast<GeomDataAPI_Dir>(theDirY);
if (!aDirX || !aDirY || (fabs(aDirX->x()) + fabs(aDirX->y()) + fabs(aDirX->z()) < tolerance)
|| (fabs(aDirY->x()) + fabs(aDirY->y()) + fabs(aDirY->z()) < tolerance))
return SLVS_E_UNKNOWN;
double aNormCoord[4] = { qw, qx, qy, qz };
// Try to find existent normal
- std::map<boost::shared_ptr<ModelAPI_Attribute>, Slvs_hEntity>::const_iterator aEntIter =
+ std::map<std::shared_ptr<ModelAPI_Attribute>, Slvs_hEntity>::const_iterator aEntIter =
myEntityAttrMap.find(theNorm);
std::vector<Slvs_Param>::const_iterator aParamIter; // looks to the first parameter of already existent entity or to the end of vector otherwise
if (aEntIter == myEntityAttrMap.end()) // no such entity => should be created
// Class: SketchSolver_ConstraintGroup
// Purpose: create workplane for the group
// ============================================================================
-bool SketchSolver_ConstraintGroup::addWorkplane(boost::shared_ptr<ModelAPI_CompositeFeature> theSketch)
+bool SketchSolver_ConstraintGroup::addWorkplane(std::shared_ptr<ModelAPI_CompositeFeature> theSketch)
{
if (myWorkplane.h || theSketch->getKind().compare(SketchPlugin_Sketch::ID()) != 0)
return false; // the workplane already exists or the function parameter is not Sketch
// ============================================================================
bool SketchSolver_ConstraintGroup::updateWorkplane()
{
+ if (!mySketch->data())
+ return false; // case sketch is deleted
// Get parameters of workplane
- boost::shared_ptr<ModelAPI_Attribute> aDirX = mySketch->data()->attribute(
+ std::shared_ptr<ModelAPI_Attribute> aDirX = mySketch->data()->attribute(
SketchPlugin_Sketch::DIRX_ID());
- boost::shared_ptr<ModelAPI_Attribute> aDirY = mySketch->data()->attribute(
+ std::shared_ptr<ModelAPI_Attribute> aDirY = mySketch->data()->attribute(
SketchPlugin_Sketch::DIRY_ID());
- boost::shared_ptr<ModelAPI_Attribute> aNorm = mySketch->data()->attribute(
+ std::shared_ptr<ModelAPI_Attribute> aNorm = mySketch->data()->attribute(
SketchPlugin_Sketch::NORM_ID());
- boost::shared_ptr<ModelAPI_Attribute> anOrigin = mySketch->data()->attribute(
+ std::shared_ptr<ModelAPI_Attribute> anOrigin = mySketch->data()->attribute(
SketchPlugin_Sketch::ORIGIN_ID());
// Transform them into SolveSpace format
Slvs_hEntity aNormalWP = changeNormal(aDirX, aDirY, aNorm);
return true;
// We should go through the attributes map, because only attributes have valued parameters
- std::map<boost::shared_ptr<ModelAPI_Attribute>, Slvs_hEntity>::iterator anEntIter =
+ std::map<std::shared_ptr<ModelAPI_Attribute>, Slvs_hEntity>::iterator anEntIter =
myEntityAttrMap.begin();
- for (; anEntIter != myEntityAttrMap.end(); anEntIter++)
+ for (; anEntIter != myEntityAttrMap.end(); anEntIter++) {
+ if (anEntIter->first->owner().get() && anEntIter->first->owner()->data().get())
+ anEntIter->first->owner()->data()->blockSendAttributeUpdated(true);
if (updateAttribute(anEntIter->first, anEntIter->second))
updateRelatedConstraints(anEntIter->first);
+ }
+ // unblock all features then
+ for (; anEntIter != myEntityAttrMap.end(); anEntIter++) {
+ if (anEntIter->first->owner().get() && anEntIter->first->owner()->data().get())
+ anEntIter->first->owner()->data()->blockSendAttributeUpdated(false);
+ }
} else if (!myConstraints.empty())
Events_Error::send(SketchSolver_Error::CONSTRAINTS(), this);
if (myTempPointWhereDragged.empty())
myTempPointWhereDragged = theGroup.myTempPointWhereDragged;
else if (!theGroup.myTempPointWhereDragged.empty()) { // Need to create additional transient constraint
- std::map<boost::shared_ptr<ModelAPI_Attribute>, Slvs_hEntity>::const_iterator aFeatureIter =
+ std::map<std::shared_ptr<ModelAPI_Attribute>, Slvs_hEntity>::const_iterator aFeatureIter =
theGroup.myEntityAttrMap.begin();
for (; aFeatureIter != theGroup.myEntityAttrMap.end(); aFeatureIter++)
if (aFeatureIter->second == myTempPointWDrgdID) {
isFound = (aGrEntIter->find(aConstrEnt[i]) != aGrEntIter->end());
// Also we need to check sub-entities
int aEntPos = Search(aConstrEnt[i], myEntities);
- Slvs_hEntity* aSub = myEntities[aEntPos].point;
- for (int j = 0; *aSub != 0 && j < 4 && !isFound; aSub++, j++)
- isFound = (aGrEntIter->find(*aSub) != aGrEntIter->end());
+ if (aEntPos != myEntities.size()) { // MPV: to fix the crash on close
+ Slvs_hEntity* aSub = myEntities[aEntPos].point;
+ for (int j = 0; *aSub != 0 && j < 4 && !isFound; aSub++, j++)
+ isFound = (aGrEntIter->find(*aSub) != aGrEntIter->end());
+ }
}
if (isFound)
anIndexes.push_back(aGrEntIter - aGroupsEntities.begin());
if (aConstrEnt[i] != 0) {
aNewGrEnt.insert(aConstrEnt[i]);
int aEntPos = Search(aConstrEnt[i], myEntities);
- Slvs_hEntity* aSub = myEntities[aEntPos].point;
- for (int j = 0; *aSub != 0 && j < 4; aSub++, j++)
- aNewGrEnt.insert(*aSub);
+ if (aEntPos != myEntities.size()) { // MPV: to fix the crash on close
+ Slvs_hEntity* aSub = myEntities[aEntPos].point;
+ for (int j = 0; *aSub != 0 && j < 4; aSub++, j++)
+ aNewGrEnt.insert(*aSub);
+ }
}
std::set<Slvs_hConstraint> aNewGrConstr;
aNewGrConstr.insert(aConstrIter->h);
if (aConstrEnt[i] != 0) {
aGrEntIter->insert(aConstrEnt[i]);
int aEntPos = Search(aConstrEnt[i], myEntities);
- Slvs_hEntity* aSub = myEntities[aEntPos].point;
- for (int j = 0; *aSub != 0 && j < 4; aSub++, j++)
- aGrEntIter->insert(*aSub);
+ if (aEntPos != myEntities.size()) { // MPV: to fix the crash on close
+ Slvs_hEntity* aSub = myEntities[aEntPos].point;
+ for (int j = 0; *aSub != 0 && j < 4; aSub++, j++)
+ aGrEntIter->insert(*aSub);
+ }
}
aGroupsConstr[anIndexes.front()].insert(aConstrIter->h);
if (aGrEntIter->size() > aGroupsEntities[aMaxNbEntities].size())
// Check if some entities are invalid too
std::set<Slvs_hEntity> anEntToRemove;
- std::map<boost::shared_ptr<ModelAPI_Attribute>, Slvs_hEntity>::iterator
+ std::map<std::shared_ptr<ModelAPI_Attribute>, Slvs_hEntity>::iterator
anAttrIter = myEntityAttrMap.begin();
while (anAttrIter != myEntityAttrMap.end()) {
if (!anAttrIter->first->owner() || !anAttrIter->first->owner()->data() ||
!anAttrIter->first->owner()->data()->isValid()) {
anEntToRemove.insert(anAttrIter->second);
- std::map<boost::shared_ptr<ModelAPI_Attribute>, Slvs_hEntity>::iterator
+ std::map<std::shared_ptr<ModelAPI_Attribute>, Slvs_hEntity>::iterator
aRemovedIter = anAttrIter;
anAttrIter++;
myEntityAttrMap.erase(aRemovedIter);
// Probably, need to update coincidence constraints
if (isCCRemoved && !myExtraCoincidence.empty()) {
// Make a copy, because the new list of unused constrtaints will be generated
- std::set<boost::shared_ptr<SketchPlugin_Constraint> > anExtraCopy = myExtraCoincidence;
+ std::set<std::shared_ptr<SketchPlugin_Constraint> > anExtraCopy = myExtraCoincidence;
myExtraCoincidence.clear();
- std::set<boost::shared_ptr<SketchPlugin_Constraint> >::iterator aCIter = anExtraCopy.begin();
+ std::set<std::shared_ptr<SketchPlugin_Constraint> >::iterator aCIter = anExtraCopy.begin();
for (; aCIter != anExtraCopy.end(); aCIter++)
if ((*aCIter)->data() && (*aCIter)->data()->isValid())
changeConstraint(*aCIter);
// Purpose: update features of sketch after resolving constraints
// ============================================================================
bool SketchSolver_ConstraintGroup::updateAttribute(
- boost::shared_ptr<ModelAPI_Attribute> theAttribute, const Slvs_hEntity& theEntityID)
+ std::shared_ptr<ModelAPI_Attribute> theAttribute, const Slvs_hEntity& theEntityID)
{
// Search the position of the first parameter of the entity
int anEntPos = Search(theEntityID, myEntities);
// Look over supported types of entities
// Point in 3D
- boost::shared_ptr<GeomDataAPI_Point> aPoint = boost::dynamic_pointer_cast<GeomDataAPI_Point>(
+ std::shared_ptr<GeomDataAPI_Point> aPoint = std::dynamic_pointer_cast<GeomDataAPI_Point>(
theAttribute);
if (aPoint) {
if (fabs(aPoint->x() - myParams[aFirstParamPos].val) > tolerance
}
// Point in 2D
- boost::shared_ptr<GeomDataAPI_Point2D> aPoint2D =
- boost::dynamic_pointer_cast<GeomDataAPI_Point2D>(theAttribute);
+ std::shared_ptr<GeomDataAPI_Point2D> aPoint2D =
+ std::dynamic_pointer_cast<GeomDataAPI_Point2D>(theAttribute);
if (aPoint2D) {
if (fabs(aPoint2D->x() - myParams[aFirstParamPos].val) > tolerance
|| fabs(aPoint2D->y() - myParams[aFirstParamPos + 1].val) > tolerance) {
}
// Scalar value
- AttributeDoublePtr aScalar = boost::dynamic_pointer_cast<ModelAPI_AttributeDouble>(theAttribute);
+ AttributeDoublePtr aScalar = std::dynamic_pointer_cast<ModelAPI_AttributeDouble>(theAttribute);
if (aScalar) {
if (fabs(aScalar->value() - myParams[aFirstParamPos].val) > tolerance) {
aScalar->setValue(myParams[aFirstParamPos].val);
// Purpose: search the entity in this group and update it
// ============================================================================
void SketchSolver_ConstraintGroup::updateEntityIfPossible(
- boost::shared_ptr<ModelAPI_Attribute> theEntity)
+ std::shared_ptr<ModelAPI_Attribute> theEntity)
{
if (myEntityAttrMap.find(theEntity) != myEntityAttrMap.end()) {
// If the attribute is a point and it is changed (the group needs to rebuild),
if (myNeedToSolve) // the entity is changed
{
// Verify the entity is a point and add temporary constraint of permanency
- boost::shared_ptr<GeomDataAPI_Point> aPoint = boost::dynamic_pointer_cast<GeomDataAPI_Point>(
+ std::shared_ptr<GeomDataAPI_Point> aPoint = std::dynamic_pointer_cast<GeomDataAPI_Point>(
theEntity);
- boost::shared_ptr<GeomDataAPI_Point2D> aPoint2D = boost::dynamic_pointer_cast<
+ std::shared_ptr<GeomDataAPI_Point2D> aPoint2D = std::dynamic_pointer_cast<
GeomDataAPI_Point2D>(theEntity);
if (aPoint || aPoint2D)
addTemporaryConstraintWhereDragged(theEntity);
// which was moved by user
// ============================================================================
void SketchSolver_ConstraintGroup::addTemporaryConstraintWhereDragged(
- boost::shared_ptr<ModelAPI_Attribute> theEntity,
+ std::shared_ptr<ModelAPI_Attribute> theEntity,
bool theAllowToFit)
{
// Find identifier of the entity
- std::map<boost::shared_ptr<ModelAPI_Attribute>, Slvs_hEntity>::const_iterator anEntIter =
+ std::map<std::shared_ptr<ModelAPI_Attribute>, Slvs_hEntity>::const_iterator anEntIter =
myEntityAttrMap.find(theEntity);
if (anEntIter == myEntityAttrMap.end())
return;
// Purpose: remove constraint and all unused entities
// ============================================================================
void SketchSolver_ConstraintGroup::removeConstraint(
- boost::shared_ptr<SketchPlugin_Constraint> theConstraint)
+ std::shared_ptr<SketchPlugin_Constraint> theConstraint)
{
ConstraintMap::iterator anIterToRemove = myConstraintMap.find(theConstraint);
if (anIterToRemove == myConstraintMap.end())
return;
// Remove unused entities
- std::map<boost::shared_ptr<ModelAPI_Attribute>, Slvs_hEntity>::iterator anEntAttrIter =
+ std::map<std::shared_ptr<ModelAPI_Attribute>, Slvs_hEntity>::iterator anEntAttrIter =
myEntityAttrMap.begin();
while (anEntAttrIter != myEntityAttrMap.end()) {
if (anEntToRemove.find(anEntAttrIter->second) != anEntToRemove.end()) {
- std::map<boost::shared_ptr<ModelAPI_Attribute>, Slvs_hEntity>::iterator aRemovedIter =
+ std::map<std::shared_ptr<ModelAPI_Attribute>, Slvs_hEntity>::iterator aRemovedIter =
anEntAttrIter;
anEntAttrIter++;
myEntityAttrMap.erase(aRemovedIter);
// Purpose: emit the signal to update constraints
// ============================================================================
void SketchSolver_ConstraintGroup::updateRelatedConstraints(
- boost::shared_ptr<ModelAPI_Attribute> theEntity) const
+ std::shared_ptr<ModelAPI_Attribute> theEntity) const
{
ConstraintMap::const_iterator aConstrIter = myConstraintMap.begin();
for (; aConstrIter != myConstraintMap.end(); aConstrIter++) {
- std::list<boost::shared_ptr<ModelAPI_Attribute> > anAttributes = aConstrIter->first->data()
+ std::list<std::shared_ptr<ModelAPI_Attribute> > anAttributes = aConstrIter->first->data()
->attributes(std::string());
- std::list<boost::shared_ptr<ModelAPI_Attribute> >::iterator anAttrIter = anAttributes.begin();
+ std::list<std::shared_ptr<ModelAPI_Attribute> >::iterator anAttrIter = anAttributes.begin();
for (; anAttrIter != anAttributes.end(); anAttrIter++) {
bool isUpd = (*anAttrIter == theEntity);
- boost::shared_ptr<ModelAPI_AttributeRefAttr> aRefAttr = boost::dynamic_pointer_cast<
+ std::shared_ptr<ModelAPI_AttributeRefAttr> aRefAttr = std::dynamic_pointer_cast<
ModelAPI_AttributeRefAttr>(*anAttrIter);
if (aRefAttr && !aRefAttr->isObject() && aRefAttr->attr() == theEntity)
isUpd = true;
}
}
-void SketchSolver_ConstraintGroup::updateRelatedConstraints(
- boost::shared_ptr<ModelAPI_Feature> theFeature) const
+void SketchSolver_ConstraintGroup::updateRelatedConstraintsFeature(
+ std::shared_ptr<ModelAPI_Feature> theFeature) const
{
ConstraintMap::const_iterator aConstrIter = myConstraintMap.begin();
for (; aConstrIter != myConstraintMap.end(); aConstrIter++) {
- std::list<boost::shared_ptr<ModelAPI_Attribute> > anAttributes = aConstrIter->first->data()
+ std::list<std::shared_ptr<ModelAPI_Attribute> > anAttributes = aConstrIter->first->data()
->attributes(std::string());
- std::list<boost::shared_ptr<ModelAPI_Attribute> >::iterator anAttrIter = anAttributes.begin();
+ std::list<std::shared_ptr<ModelAPI_Attribute> >::iterator anAttrIter = anAttributes.begin();
for (; anAttrIter != anAttributes.end(); anAttrIter++) {
- boost::shared_ptr<ModelAPI_AttributeRefAttr> aRefAttr = boost::dynamic_pointer_cast<
+ std::shared_ptr<ModelAPI_AttributeRefAttr> aRefAttr = std::dynamic_pointer_cast<
ModelAPI_AttributeRefAttr>(*anAttrIter);
if (aRefAttr && aRefAttr->isObject() && aRefAttr->object() == theFeature) {
static Events_ID anEvent = Events_Loop::eventByName(EVENT_OBJECT_UPDATED);
