#include "SketchPlugin_Circle.h"
#include "SketchPlugin_ConstraintCoincidence.h"
#include "SketchPlugin_ConstraintDistance.h"
-#include "SketchPlugin_ConstraintFillet.h"
+#include "SketchPlugin_Fillet.h"
#include "SketchPlugin_ConstraintRigid.h"
#include "SketchPlugin_ConstraintTangent.h"
#include "SketchPlugin_Line.h"
SessionPtr aMgr = ModelAPI_Session::get();
ModelAPI_ValidatorsFactory* aFactory = aMgr->validators();
- AttributeRefAttrPtr aRefAttr = std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>(theAttribute);
+ AttributeRefAttrPtr aRefAttr = std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>
+ (theAttribute);
bool isObject = aRefAttr->isObject();
if (!isObject) {
// an attribute is a point. A point value is valid always for the distance
return true;
}
-static bool isCoincident(FeaturePtr theFeature1, FeaturePtr theFeature2)
-{
- AttributePtr aFeature1PointAttr[2];
- if(theFeature1->getKind() == SketchPlugin_Line::ID()) {
- aFeature1PointAttr[0] = theFeature1->attribute(SketchPlugin_Line::START_ID());
- aFeature1PointAttr[1] = theFeature1->attribute(SketchPlugin_Line::END_ID());
- } else if(theFeature1->getKind() == SketchPlugin_Arc::ID()) {
- aFeature1PointAttr[0] = theFeature1->attribute(SketchPlugin_Arc::START_ID());
- aFeature1PointAttr[1] = theFeature1->attribute(SketchPlugin_Arc::END_ID());
- }
-
- std::set<AttributePtr> aRefsList = theFeature1->data()->refsToMe();
- for(std::set<AttributePtr>::const_iterator aRefIt = aRefsList.begin();
- aRefIt != aRefsList.end();
- ++aRefIt) {
- // Find constraint
- FeaturePtr aRefFeature = std::dynamic_pointer_cast<ModelAPI_Feature>((*aRefIt)->owner());
- if(aRefFeature->getKind() != SketchPlugin_ConstraintCoincidence::ID())
- continue;
- AttributeRefAttrPtr aRefAttr = std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>(*aRefIt);
- AttributePtr anAttr = aRefAttr->attr();
- if(anAttr != aFeature1PointAttr[0] && anAttr != aFeature1PointAttr[1])
- continue;
-
- // Get coincides from constraint.
- std::set<FeaturePtr> aCoinsides;
- SketchPlugin_Tools::findCoincidences(aRefFeature,
- SketchPlugin_ConstraintCoincidence::ENTITY_A(),
- aCoinsides);
- SketchPlugin_Tools::findCoincidences(aRefFeature,
- SketchPlugin_ConstraintCoincidence::ENTITY_B(),
- aCoinsides);
-
- if(aCoinsides.find(theFeature2) != aCoinsides.end()) {
- return true;
- }
- }
-
- return false;
-}
-
-static bool hasCoincidentPoint(FeaturePtr theFeature1, FeaturePtr theFeature2)
-{
- if(theFeature1->getKind() == SketchPlugin_Circle::ID() ||
- theFeature2->getKind() == SketchPlugin_Circle::ID()) {
- return false;
- }
-
- return (isCoincident(theFeature1, theFeature2) && isCoincident(theFeature2, theFeature1));
-}
-
bool SketchPlugin_TangentAttrValidator::isValid(const AttributePtr& theAttribute,
const std::list<std::string>& theArguments,
Events_InfoMessage& theError) const
if (!aOtherFea)
return true;
- if ((aRefFea->getKind() == SketchPlugin_Arc::ID() ||
- aOtherFea->getKind() == SketchPlugin_Arc::ID()) &&
- !hasCoincidentPoint(aRefFea, aOtherFea))
- return false;
-
if (aRefFea->getKind() == SketchPlugin_Line::ID()) {
if (aOtherFea->getKind() != SketchPlugin_Arc::ID() &&
aOtherFea->getKind() != SketchPlugin_Circle::ID()) {
return false;
}
}
- else if (aRefFea->getKind() == SketchPlugin_Arc::ID()) {
+ else if (aRefFea->getKind() == SketchPlugin_Arc::ID() ||
+ aRefFea->getKind() == SketchPlugin_Circle::ID()) {
if (aOtherFea->getKind() != SketchPlugin_Line::ID() &&
- aOtherFea->getKind() != SketchPlugin_Arc::ID()) {
- theError = "It refers to an %1, but %2 is not a %3 or an %4";
+ aOtherFea->getKind() != SketchPlugin_Arc::ID() &&
+ aOtherFea->getKind() != SketchPlugin_Circle::ID()) {
+ theError = "It refers to an %1, but %2 is not a %3 or an %4 or a %5";
theError.arg(SketchPlugin_Arc::ID()).arg(aParamA)
- .arg(SketchPlugin_Line::ID()).arg(SketchPlugin_Arc::ID());
- return false;
- }
- }
- else if (aRefFea->getKind() == SketchPlugin_Circle::ID()) {
- if (aOtherFea->getKind() != SketchPlugin_Line::ID()) {
- theError = "It refers to an %1, but %2 is not a %3";
- theError.arg(SketchPlugin_Circle::ID()).arg(aParamA)
- .arg(SketchPlugin_Line::ID());
+ .arg(SketchPlugin_Line::ID()).arg(SketchPlugin_Arc::ID())
+ .arg(SketchPlugin_Circle::ID());
return false;
}
}
const std::list<std::string>& theArguments,
Events_InfoMessage& theError) const
{
- std::shared_ptr<SketchPlugin_ConstraintFillet> aFilletFeature =
- std::dynamic_pointer_cast<SketchPlugin_ConstraintFillet>(theAttribute->owner());
- AttributeRefAttrListPtr aPointsRefList =
- std::dynamic_pointer_cast<ModelAPI_AttributeRefAttrList>(theAttribute);
- if(aPointsRefList->size() == 0) {
- theError = "Error: List of points is empty.";
+ AttributeRefAttrPtr aPointRefAttr =
+ std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>(theAttribute);
+ if(!aPointRefAttr.get()) {
+ theError = "Error: Point not selected.";
return false;
}
- std::map<AttributePtr, SketchPlugin_ConstraintFillet::FilletFeatures> aPointsFeaturesMap =
- aFilletFeature->pointsFeaturesMap();
- std::set<AttributePtr> aSetOfPointsOnResultEdges;
- for(std::map<AttributePtr, SketchPlugin_ConstraintFillet::FilletFeatures>::iterator
- aPointsIter = aPointsFeaturesMap.begin();
- aPointsIter != aPointsFeaturesMap.end();
- ++aPointsIter) {
- const SketchPlugin_ConstraintFillet::FilletFeatures& aFeatures = aPointsIter->second;
- const std::list<FeaturePtr>& aResultEdges = aFeatures.resultEdges;
- for(std::list<FeaturePtr>::const_iterator aResultIter = aResultEdges.cbegin();
- aResultIter != aResultEdges.cend();
- ++aResultIter) {
- FeaturePtr aResultFeature = *aResultIter;
- if(aResultFeature->getKind() == SketchPlugin_Line::ID()) {
- aSetOfPointsOnResultEdges.insert(aResultFeature->attribute(SketchPlugin_Line::START_ID()));
- aSetOfPointsOnResultEdges.insert(aResultFeature->attribute(SketchPlugin_Line::END_ID()));
- } else if(aResultFeature->getKind() == SketchPlugin_Arc::ID()) {
- aSetOfPointsOnResultEdges.insert(aResultFeature->attribute(SketchPlugin_Arc::START_ID()));
- aSetOfPointsOnResultEdges.insert(aResultFeature->attribute(SketchPlugin_Arc::END_ID()));
- }
- }
+ AttributePtr aPointAttribute = aPointRefAttr->attr();
+ if (!aPointAttribute.get()) {
+ theError = "Error: Bad point selected.";
+ return false;
}
+ std::shared_ptr<GeomAPI_Pnt2d> aSelectedPnt =
+ std::dynamic_pointer_cast<GeomDataAPI_Point2D>(aPointAttribute)->pnt();
- std::list<std::pair<ObjectPtr, AttributePtr>> aPointsList = aPointsRefList->list();
- for(std::list<std::pair<ObjectPtr, AttributePtr>>::const_iterator
- aPointsIt = aPointsList.cbegin(); aPointsIt != aPointsList.cend(); aPointsIt++) {
- ObjectPtr anObject = (*aPointsIt).first;
- AttributePtr aPointAttribute = (*aPointsIt).second;
- if (!aPointAttribute.get())
- return false;
- std::shared_ptr<GeomAPI_Pnt2d> aSelectedPnt =
- std::dynamic_pointer_cast<GeomDataAPI_Point2D>(aPointAttribute)->pnt();
-
- // If we alredy have some result then:
- // - if it is the same point all ok, just skip it
- // - if it is point on the fillet result edge then it is not valid
- if(!aPointsFeaturesMap.empty()) {
- if(aPointsFeaturesMap.find(aPointAttribute) != aPointsFeaturesMap.end()) {
- continue;
- }
-
- // Check that selected point not on the one of the fillet result edge.
- if(aSetOfPointsOnResultEdges.find(aPointAttribute) != aSetOfPointsOnResultEdges.end()) {
- return false;
- }
- }
-
- // Obtain constraint coincidence for the fillet point.
- const std::set<AttributePtr>& aRefsList = aPointAttribute->owner()->data()->refsToMe();
- FeaturePtr aConstraintCoincidence;
- for(std::set<AttributePtr>::const_iterator anIt = aRefsList.cbegin();
- anIt != aRefsList.cend(); ++anIt) {
- std::shared_ptr<ModelAPI_Attribute> aAttr = (*anIt);
- FeaturePtr aConstrFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(aAttr->owner());
- if (aConstrFeature->getKind() == SketchPlugin_ConstraintCoincidence::ID()) {
- AttributeRefAttrPtr anAttrRefA = std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>(
- aConstrFeature->attribute(SketchPlugin_ConstraintCoincidence::ENTITY_A()));
- AttributeRefAttrPtr anAttrRefB = std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>(
- aConstrFeature->attribute(SketchPlugin_ConstraintCoincidence::ENTITY_B()));
- if(anAttrRefA.get() && !anAttrRefA->isObject()) {
- AttributePtr anAttrA = anAttrRefA->attr();
- if(aPointAttribute == anAttrA) {
- aConstraintCoincidence = aConstrFeature;
- break;
- }
+ // Obtain constraint coincidence for the fillet point.
+ const std::set<AttributePtr>& aRefsList = aPointAttribute->owner()->data()->refsToMe();
+ FeaturePtr aConstraintCoincidence;
+ for(std::set<AttributePtr>::const_iterator anIt = aRefsList.cbegin();
+ anIt != aRefsList.cend(); ++anIt) {
+ std::shared_ptr<ModelAPI_Attribute> aAttr = (*anIt);
+ FeaturePtr aConstrFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(aAttr->owner());
+ if (aConstrFeature->getKind() == SketchPlugin_ConstraintCoincidence::ID()) {
+ AttributeRefAttrPtr anAttrRefA = std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>(
+ aConstrFeature->attribute(SketchPlugin_ConstraintCoincidence::ENTITY_A()));
+ AttributeRefAttrPtr anAttrRefB = std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>(
+ aConstrFeature->attribute(SketchPlugin_ConstraintCoincidence::ENTITY_B()));
+ if(anAttrRefA.get() && !anAttrRefA->isObject()) {
+ AttributePtr anAttrA = anAttrRefA->attr();
+ if(aPointAttribute == anAttrA) {
+ aConstraintCoincidence = aConstrFeature;
+ break;
}
- if(anAttrRefB.get() && !anAttrRefB->isObject()) {
- AttributePtr anAttrB = anAttrRefB->attr();
- if(aPointAttribute == anAttrB) {
- aConstraintCoincidence = aConstrFeature;
- break;
- }
+ }
+ if(anAttrRefB.get() && !anAttrRefB->isObject()) {
+ AttributePtr anAttrB = anAttrRefB->attr();
+ if(aPointAttribute == anAttrB) {
+ aConstraintCoincidence = aConstrFeature;
+ break;
}
}
}
+ }
- if(!aConstraintCoincidence.get()) {
- theError = "Error: one of the selected point does not have coicidence.";
- return false;
+ if(!aConstraintCoincidence.get()) {
+ theError = "Error: one of the selected point does not have coicidence.";
+ return false;
+ }
+
+ // Get coincides from constraint.
+ std::set<FeaturePtr> aCoinsides;
+ SketchPlugin_Tools::findCoincidences(aConstraintCoincidence,
+ SketchPlugin_ConstraintCoincidence::ENTITY_A(),
+ aCoinsides);
+ SketchPlugin_Tools::findCoincidences(aConstraintCoincidence,
+ SketchPlugin_ConstraintCoincidence::ENTITY_B(),
+ aCoinsides);
+
+ // Remove points from set of coincides.
+ std::set<FeaturePtr> aNewSetOfCoincides;
+ for(std::set<FeaturePtr>::iterator anIt = aCoinsides.begin();
+ anIt != aCoinsides.end(); ++anIt) {
+ std::shared_ptr<SketchPlugin_SketchEntity> aSketchEntity =
+ std::dynamic_pointer_cast<SketchPlugin_SketchEntity>(*anIt);
+ if(aSketchEntity.get() && aSketchEntity->isCopy()) {
+ continue;
}
+ if((*anIt)->getKind() != SketchPlugin_Line::ID() &&
+ (*anIt)->getKind() != SketchPlugin_Arc::ID()) {
+ continue;
+ }
+ if((*anIt)->getKind() == SketchPlugin_Arc::ID()) {
+ AttributePtr anArcCenter = (*anIt)->attribute(SketchPlugin_Arc::CENTER_ID());
+ std::shared_ptr<GeomAPI_Pnt2d> anArcCenterPnt =
+ std::dynamic_pointer_cast<GeomDataAPI_Point2D>(anArcCenter)->pnt();
+ double aDistSelectedArcCenter = aSelectedPnt->distance(anArcCenterPnt);
+ if(aDistSelectedArcCenter < tolerance) {
+ continue;
+ }
+ }
+ aNewSetOfCoincides.insert(*anIt);
+ }
+ aCoinsides = aNewSetOfCoincides;
- // Get coincides from constraint.
- std::set<FeaturePtr> aCoinsides;
- SketchPlugin_Tools::findCoincidences(aConstraintCoincidence,
- SketchPlugin_ConstraintCoincidence::ENTITY_A(),
- aCoinsides);
- SketchPlugin_Tools::findCoincidences(aConstraintCoincidence,
- SketchPlugin_ConstraintCoincidence::ENTITY_B(),
- aCoinsides);
-
- // Remove points from set of coincides.
- std::set<FeaturePtr> aNewSetOfCoincides;
+ // If we still have more than two coincides remove auxilary entities from set of coincides.
+ if(aCoinsides.size() > 2) {
+ aNewSetOfCoincides.clear();
for(std::set<FeaturePtr>::iterator anIt = aCoinsides.begin();
anIt != aCoinsides.end(); ++anIt) {
- if((*anIt)->getKind() != SketchPlugin_Line::ID() &&
- (*anIt)->getKind() != SketchPlugin_Arc::ID()) {
- continue;
+ if(!(*anIt)->boolean(SketchPlugin_SketchEntity::AUXILIARY_ID())->value()) {
+ aNewSetOfCoincides.insert(*anIt);
}
- if((*anIt)->getKind() == SketchPlugin_Arc::ID()) {
- AttributePtr anArcCenter = (*anIt)->attribute(SketchPlugin_Arc::CENTER_ID());
- std::shared_ptr<GeomAPI_Pnt2d> anArcCenterPnt =
- std::dynamic_pointer_cast<GeomDataAPI_Point2D>(anArcCenter)->pnt();
- double aDistSelectedArcCenter = aSelectedPnt->distance(anArcCenterPnt);
- if(aDistSelectedArcCenter < tolerance) {
- continue;
- }
- }
- aNewSetOfCoincides.insert(*anIt);
}
aCoinsides = aNewSetOfCoincides;
+ }
- // If we still have more than two coincides remove auxilary entities from set of coincides.
- if(aCoinsides.size() > 2) {
- aNewSetOfCoincides.clear();
- for(std::set<FeaturePtr>::iterator anIt = aCoinsides.begin();
- anIt != aCoinsides.end(); ++anIt) {
- if(!(*anIt)->boolean(SketchPlugin_SketchEntity::AUXILIARY_ID())->value()) {
- aNewSetOfCoincides.insert(*anIt);
- }
- }
- aCoinsides = aNewSetOfCoincides;
- }
+ if(aCoinsides.size() != 2) {
+ theError = "Error: One of the selected points does not have two suitable edges for fillet.";
+ return false;
+ }
- if(aCoinsides.size() != 2) {
- theError = "Error: One of the selected points does not have two suitable edges for fillet.";
- return false;
- }
+ // Check that selected edges don't have tangent constraint.
+ std::set<FeaturePtr>::iterator anIt = aCoinsides.begin();
+ FeaturePtr aFirstFeature = *anIt++;
+ FeaturePtr aSecondFeature = *anIt;
+ const std::set<AttributePtr>& aFirstFeatureRefsList = aFirstFeature->data()->refsToMe();
+ if(hasSameTangentFeature(aFirstFeatureRefsList, aSecondFeature)) {
+ theError = "Error: Edges in selected point has tangent constraint.";
+ return false;
+ }
- // Check that selected edges don't have tangent constraint.
- std::set<FeaturePtr>::iterator anIt = aCoinsides.begin();
- FeaturePtr aFirstFeature = *anIt++;
- FeaturePtr aSecondFeature = *anIt;
- const std::set<AttributePtr>& aFirstFeatureRefsList = aFirstFeature->data()->refsToMe();
- if(hasSameTangentFeature(aFirstFeatureRefsList, aSecondFeature)) {
+ std::list<ResultPtr> aFirstResults = aFirstFeature->results();
+ for(std::list<ResultPtr>::iterator aResIt = aFirstResults.begin();
+ aResIt != aFirstResults.end(); ++aResIt) {
+ ResultPtr aRes = *aResIt;
+ const std::set<AttributePtr>& aResRefsList = aRes->data()->refsToMe();
+ if(hasSameTangentFeature(aResRefsList, aSecondFeature)) {
theError = "Error: Edges in selected point has tangent constraint.";
return false;
}
+ }
- std::list<ResultPtr> aFirstResults = aFirstFeature->results();
- for(std::list<ResultPtr>::iterator aResIt = aFirstResults.begin();
- aResIt != aFirstResults.end(); ++aResIt) {
- ResultPtr aRes = *aResIt;
- const std::set<AttributePtr>& aResRefsList = aRes->data()->refsToMe();
- if(hasSameTangentFeature(aResRefsList, aSecondFeature)) {
- theError = "Error: Edges in selected point has tangent constraint.";
- return false;
- }
- }
-
- // Check that lines not collinear
- if(aFirstFeature->getKind() == SketchPlugin_Line::ID() &&
- aSecondFeature->getKind() == SketchPlugin_Line::ID()) {
- std::string aStartAttr = SketchPlugin_Line::START_ID();
- std::string anEndAttr = SketchPlugin_Line::END_ID();
- std::shared_ptr<GeomAPI_Pnt2d> aFirstStartPnt, aFirstEndPnt, aSecondStartPnt, aSecondEndPnt;
- aFirstStartPnt =
- std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
- aFirstFeature->attribute(aStartAttr))->pnt();
- aFirstEndPnt =
- std::dynamic_pointer_cast<GeomDataAPI_Point2D>(aFirstFeature->attribute(anEndAttr))->pnt();
- aSecondStartPnt =
- std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
- aSecondFeature->attribute(aStartAttr))->pnt();
- aSecondEndPnt =
- std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
- aSecondFeature->attribute(anEndAttr))->pnt();
- double aCheck1 =
- fabs((aFirstEndPnt->x() - aFirstStartPnt->x()) *
- (aSecondStartPnt->y() - aFirstStartPnt->y()) -
- (aSecondStartPnt->x() - aFirstStartPnt->x()) * (aFirstEndPnt->y() - aFirstStartPnt->y()));
- double aCheck2 =
- fabs((aFirstEndPnt->x() - aFirstStartPnt->x()) *
- (aSecondEndPnt->y() - aFirstStartPnt->y()) -
- (aSecondEndPnt->x() - aFirstStartPnt->x()) * (aFirstEndPnt->y() - aFirstStartPnt->y()));
- if(aCheck1 < 1.e-7 && aCheck2 < 1.e-7) {
- return false;
- }
+ // Check that lines not collinear
+ if(aFirstFeature->getKind() == SketchPlugin_Line::ID() &&
+ aSecondFeature->getKind() == SketchPlugin_Line::ID()) {
+ std::string aStartAttr = SketchPlugin_Line::START_ID();
+ std::string anEndAttr = SketchPlugin_Line::END_ID();
+ std::shared_ptr<GeomAPI_Pnt2d> aFirstStartPnt, aFirstEndPnt, aSecondStartPnt, aSecondEndPnt;
+ aFirstStartPnt =
+ std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
+ aFirstFeature->attribute(aStartAttr))->pnt();
+ aFirstEndPnt =
+ std::dynamic_pointer_cast<GeomDataAPI_Point2D>(aFirstFeature->attribute(anEndAttr))->pnt();
+ aSecondStartPnt =
+ std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
+ aSecondFeature->attribute(aStartAttr))->pnt();
+ aSecondEndPnt =
+ std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
+ aSecondFeature->attribute(anEndAttr))->pnt();
+ double aCheck1 =
+ fabs((aFirstEndPnt->x() - aFirstStartPnt->x()) *
+ (aSecondStartPnt->y() - aFirstStartPnt->y()) -
+ (aSecondStartPnt->x() - aFirstStartPnt->x()) * (aFirstEndPnt->y() - aFirstStartPnt->y()));
+ double aCheck2 =
+ fabs((aFirstEndPnt->x() - aFirstStartPnt->x()) *
+ (aSecondEndPnt->y() - aFirstStartPnt->y()) -
+ (aSecondEndPnt->x() - aFirstStartPnt->x()) * (aFirstEndPnt->y() - aFirstStartPnt->y()));
+ if(aCheck1 < 1.e-7 && aCheck2 < 1.e-7) {
+ return false;
}
}
+
return true;
}
aKind == SketchPlugin_Arc::ID() ||
aKind == SketchPlugin_Circle::ID()) {
- std::set<GeomShapePtr> anEdgeShapes;
+ std::set<ResultPtr> anEdgeShapes;
ModelAPI_Tools::shapesOfType(anAttrFeature, GeomAPI_Shape::EDGE, anEdgeShapes);
if (anEdgeShapes.empty() || anEdgeShapes.size() > 1 /*there case has not existed yet*/)
return aValid;
SketchPlugin_ConstraintCoincidence::ID(),
aRefAttributes, SketchPlugin_Point::ID(), SketchPlugin_Point::COORD_ID());
- GeomShapePtr anAttrShape = *anEdgeShapes.begin();
+ GeomShapePtr anAttrShape = (*anEdgeShapes.begin())->shape();
std::shared_ptr<SketchPlugin_Feature> aSFeature =
std::dynamic_pointer_cast<SketchPlugin_Feature>(anAttrFeature);
SketchPlugin_Sketch* aSketch = aSFeature->sketch();
aData->attribute(SketchPlugin_Sketch::NORM_ID()));
std::shared_ptr<GeomAPI_Dir> aDirY(new GeomAPI_Dir(aNorm->dir()->cross(aX->dir())));
- std::list<std::shared_ptr<GeomAPI_Pnt> > aPoints;
- std::map<std::shared_ptr<GeomDataAPI_Point2D>, std::shared_ptr<GeomAPI_Pnt> >
- aPointToAttributes;
- ModelGeomAlgo_Point2D::getPointsInsideShape(anAttrShape, aRefAttributes, aC->pnt(),
- aX->dir(), aDirY, aPoints, aPointToAttributes);
+ typedef std::map<std::shared_ptr<GeomAPI_Pnt>,
+ std::pair<std::list<std::shared_ptr<GeomDataAPI_Point2D> >,
+ std::list<std::shared_ptr<ModelAPI_Object> > > > PointToRefsMap;
+ PointToRefsMap aPointsInfo;
- int aCoincidentToFeature = (int)aPoints.size();
+ ModelGeomAlgo_Point2D::getPointsInsideShape(anAttrShape, aRefAttributes, aC->pnt(),
+ aX->dir(), aDirY, aPointsInfo);
+ int aCoincidentToFeature = (int)aPointsInfo.size();
if (aKind == SketchPlugin_Circle::ID())
aValid = aCoincidentToFeature >= 2;
else