aRefAttr->setAttr(anAttribute);
}
else if (anObject.get()) {
- // if presentation of previous reentrant macro arc is used, the object is invalid,
- // we should use result of previous feature of the message(Arc)
- if (!anObject->data()->isValid()) {
- FeaturePtr aCreatedFeature = aReentrantMessage->createdFeature();
- anObject = aCreatedFeature->lastResult();
- }
- aRefAttr->setObject(anObject);
+ // if attribute is NULL, only object is defined, it should be processed outside
+ // the feature because it might be an external feature, that will be
+ // removed/created again after restart operation
+ // #2468 - Crash when sketching circles successively on a repetition
+ aFilledAttributeName = CIRCLE_TYPE();
}
}
}
void SketchPlugin_MacroCircle::constraintsForCircleByCenterAndPassed(FeaturePtr theCircleFeature)
{
// Create constraints.
- SketchPlugin_Tools::createConstraint(
+ SketchPlugin_Tools::createCoincidenceOrTangency(
this, CENTER_POINT_REF_ID(),
theCircleFeature->attribute(SketchPlugin_Circle::CENTER_ID()),
ObjectPtr(), false);
- SketchPlugin_Tools::createConstraint(
+ SketchPlugin_Tools::createCoincidenceOrTangency(
this, PASSED_POINT_REF_ID(), AttributePtr(),
theCircleFeature->lastResult(), true);
}
// Create constraints.
ResultPtr aCircleResult = theCircleFeature->lastResult();
- for (int i = 0; i < 3; ++i)
- SketchPlugin_Tools::createConstraint(this, aPointRef[i], AttributePtr(), aCircleResult, true);
+ for (int i = 0; i < 3; ++i) {
+ SketchPlugin_Tools::createCoincidenceOrTangency(
+ this, aPointRef[i], AttributePtr(), aCircleResult, true);
+ }
}
FeaturePtr SketchPlugin_MacroCircle::createCircleFeature()
if (!aCenterAttr->isInitialized() || !aPassedAttr->isInitialized())
return;
- AttributeRefAttrPtr aPassedRef = refattr(PASSED_POINT_REF_ID());
// Calculate circle parameters
- std::shared_ptr<GeomAPI_Pnt2d> aCenter =
- std::dynamic_pointer_cast<GeomDataAPI_Point2D>(aCenterAttr)->pnt();
+ AttributeRefAttrPtr aCenterRef = refattr(CENTER_POINT_REF_ID());
+ std::shared_ptr<GeomAPI_Pnt2d> aCenter;
+ std::shared_ptr<GeomAPI_Shape> aCurve;
+ SketchPlugin_Tools::convertRefAttrToPointOrTangentCurve(
+ aCenterRef, aCenterAttr, aCurve, aCenter);
+ if (!aCenter)
+ aCenter = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(aCenterAttr)->pnt();
+ AttributeRefAttrPtr aPassedRef = refattr(PASSED_POINT_REF_ID());
std::shared_ptr<GeomAPI_Pnt2d> aPassedPoint;
std::shared_ptr<GeomAPI_Shape> aTangentCurve;
SketchPlugin_Tools::convertRefAttrToPointOrTangentCurve(