From: azv Date: Thu, 28 May 2015 10:51:22 +0000 (+0300) Subject: Refactoring of Fillet X-Git-Tag: V_1.2.0~34 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=da26f7a3b8234678eab4de988d1f2cbe83045010;p=modules%2Fshaper.git Refactoring of Fillet --- diff --git a/src/SketchPlugin/SketchPlugin_ConstraintFillet.cpp b/src/SketchPlugin/SketchPlugin_ConstraintFillet.cpp index f120e596e..c3eea6f40 100644 --- a/src/SketchPlugin/SketchPlugin_ConstraintFillet.cpp +++ b/src/SketchPlugin/SketchPlugin_ConstraintFillet.cpp @@ -37,6 +37,13 @@ static const std::string PREVIOUS_VALUE("FilletPreviousRadius"); static void recalculateAttributes(FeaturePtr theNewArc, const std::string& theNewArcAttribute, FeaturePtr theFeature, const std::string& theFeatureAttribute); +/// \brief Calculates center of fillet arc and coordinates of tangency points +static void calculateFilletCenter(FeaturePtr theFeatureA, FeaturePtr theFeatureB, + double theRadius, bool theNotInversed[2], + std::shared_ptr& theCenter, + std::shared_ptr& theTangentA, + std::shared_ptr& theTangentB); + SketchPlugin_ConstraintFillet::SketchPlugin_ConstraintFillet() { @@ -78,42 +85,8 @@ void SketchPlugin_ConstraintFillet::execute() // Check the fillet shapes is not initialized yet AttributeRefListPtr aRefListOfFillet = std::dynamic_pointer_cast( aData->attribute(SketchPlugin_Constraint::ENTITY_C())); - if (aRefListOfFillet->size() > 0) { - // update the Radius constraint - ObjectPtr aFilletArcObj = aRefListOfFillet->list().back(); - aRC = std::dynamic_pointer_cast(aFilletArcObj); - FeaturePtr aFilletArcFeature = aRC ? aRC->document()->feature(aRC) : - std::dynamic_pointer_cast(aFilletArcObj); + bool needNewObjects = aRefListOfFillet->size() == 0; - int aNbSubs = sketch()->numberOfSubs(); - FeaturePtr aSubFeature; - for (int aSub = 0; aSub < aNbSubs; aSub++) { - aSubFeature = sketch()->subFeature(aSub); - if (aSubFeature->getKind() != SketchPlugin_ConstraintRadius::ID()) - continue; - AttributeRefAttrPtr aRefAttr = std::dynamic_pointer_cast( - aSubFeature->attribute(SketchPlugin_Constraint::ENTITY_A())); - if (!aRefAttr || !aRefAttr->isObject()) - continue; - aRC = std::dynamic_pointer_cast(aRefAttr->object()); - FeaturePtr aFeature = aRC ? aRC->document()->feature(aRC) : - std::dynamic_pointer_cast(aRefAttr->object()); - if (aFeature == aFilletArcFeature) { - // Update radius constraint only if the value is changed in fillet's attribute - double aPrevRadius = std::dynamic_pointer_cast( - aData->attribute(PREVIOUS_VALUE))->value(); - if (aFilletRadius != aPrevRadius) { - AttributeDoublePtr aRadius = std::dynamic_pointer_cast( - aSubFeature->attribute(SketchPlugin_Constraint::VALUE())); - aRadius->setValue(aFilletRadius); - std::dynamic_pointer_cast( - aData->attribute(PREVIOUS_VALUE))->setValue(aFilletRadius); - } - break; - } - } - return; - } // Obtain features for the base objects FeaturePtr aFeatureA, aFeatureB; aRC = std::dynamic_pointer_cast(aBaseA->object()); @@ -123,39 +96,40 @@ void SketchPlugin_ConstraintFillet::execute() if (!aFeatureA || !aFeatureB) return; - // Create list of objects composing a fillet - // copy aFeatureA - FeaturePtr aNewFeatureA = sketch()->addFeature(aFeatureA->getKind()); - aFeatureA->data()->copyTo(aNewFeatureA->data()); - aNewFeatureA->execute(); - aRefListOfFillet->append(aNewFeatureA->firstResult()); - // copy aFeatureB - FeaturePtr aNewFeatureB = sketch()->addFeature(aFeatureB->getKind()); - aFeatureB->data()->copyTo(aNewFeatureB->data()); - aNewFeatureB->execute(); - aRefListOfFillet->append(aNewFeatureB->firstResult()); - // create filleting arc (it will be attached to the list later) - FeaturePtr aNewArc = sketch()->addFeature(SketchPlugin_Arc::ID()); - - // Wait all constraints being created, then send update events - static Events_ID anUpdateEvent = Events_Loop::eventByName(EVENT_OBJECT_UPDATED); - bool isUpdateFlushed = Events_Loop::loop()->isFlushed(anUpdateEvent); - if (isUpdateFlushed) - Events_Loop::loop()->setFlushed(anUpdateEvent, false); + FeaturePtr aNewFeatureA, aNewFeatureB, aNewArc; + if (needNewObjects) { + // Create list of objects composing a fillet + // copy aFeatureA + aNewFeatureA = sketch()->addFeature(aFeatureA->getKind()); + aFeatureA->data()->copyTo(aNewFeatureA->data()); + // copy aFeatureB + aNewFeatureB = sketch()->addFeature(aFeatureB->getKind()); + aFeatureB->data()->copyTo(aNewFeatureB->data()); + // create filleting arc (it will be attached to the list later) + aNewArc = sketch()->addFeature(SketchPlugin_Arc::ID()); + } else { + // Obtain features from the list + std::list aNewFeatList = aRefListOfFillet->list(); + std::list::iterator aFeatIt = aNewFeatList.begin(); + aNewFeatureA = ModelAPI_Feature::feature(*aFeatIt++); + aNewFeatureB = ModelAPI_Feature::feature(*aFeatIt++); + aNewArc = ModelAPI_Feature::feature(*aFeatIt); + } // Calculate arc attributes static const int aNbFeatures = 2; - FeaturePtr aFeature[aNbFeatures] = {aNewFeatureA, aNewFeatureB}; + FeaturePtr aFeature[aNbFeatures] = {aFeatureA, aFeatureB}; + FeaturePtr aNewFeature[aNbFeatures] = {aNewFeatureA, aNewFeatureB}; std::shared_ptr aTangentDir[aNbFeatures]; // tangent directions of the features in coincident point bool isStart[aNbFeatures]; // indicates which point the features share std::shared_ptr aStartEndPnt[aNbFeatures * 2]; // first pair of points relate to first feature, second pair - to second std::string aFeatAttributes[aNbFeatures * 2]; // attributes of features for (int i = 0; i < aNbFeatures; i++) { std::string aStartAttr, aEndAttr; - if (aFeature[i]->getKind() == SketchPlugin_Line::ID()) { + if (aNewFeature[i]->getKind() == SketchPlugin_Line::ID()) { aStartAttr = SketchPlugin_Line::START_ID(); aEndAttr = SketchPlugin_Line::END_ID(); - } else if (aFeature[i]->getKind() == SketchPlugin_Arc::ID()) { + } else if (aNewFeature[i]->getKind() == SketchPlugin_Arc::ID()) { aStartAttr = SketchPlugin_Arc::START_ID(); aEndAttr = SketchPlugin_Arc::END_ID(); } else { // wrong argument @@ -185,14 +159,14 @@ void SketchPlugin_ConstraintFillet::execute() // tangent directions of the features for (int i = 0; i < aNbFeatures; i++) { std::shared_ptr aDir; - if (aFeature[i]->getKind() == SketchPlugin_Line::ID()) { + if (aNewFeature[i]->getKind() == SketchPlugin_Line::ID()) { aDir = aStartEndPnt[2*i+1]->xy()->decreased(aStartEndPnt[2*i]->xy()); if (!isStart[i]) aDir = aDir->multiplied(-1.0); - } else if (aFeature[i]->getKind() == SketchPlugin_Arc::ID()) { + } else if (aNewFeature[i]->getKind() == SketchPlugin_Arc::ID()) { std::shared_ptr aCenterPoint = std::dynamic_pointer_cast( - aFeature[i]->attribute(SketchPlugin_Arc::CENTER_ID()))->pnt(); + aNewFeature[i]->attribute(SketchPlugin_Arc::CENTER_ID()))->pnt(); aDir = isStart[i] ? aStartEndPnt[2*i]->xy() : aStartEndPnt[2*i+1]->xy(); aDir = aDir->decreased(aCenterPoint->xy()); @@ -205,86 +179,151 @@ void SketchPlugin_ConstraintFillet::execute() } aTangentDir[i] = std::shared_ptr(new GeomAPI_Dir2d(aDir)); } + + // Wait all constraints being created, then send update events + static Events_ID anUpdateEvent = Events_Loop::eventByName(EVENT_OBJECT_UPDATED); + bool isUpdateFlushed = Events_Loop::loop()->isFlushed(anUpdateEvent); + if (isUpdateFlushed) + Events_Loop::loop()->setFlushed(anUpdateEvent, false); + // By default, the start point of fillet arc is connected to FeatureA, // and the end point - to FeatureB. But when the angle between TangentDirA and // TangentDirB greater 180 degree, the sequaence of features need to be reversed. double cosBA = aTangentDir[0]->cross(aTangentDir[1]); // cos(B-A), where A and B - angles between corresponding tanget direction and the X axis bool isReversed = cosBA > 0.0; - std::shared_ptr aSharedPoint = aStartEndPnt[isStart[0] ? 0 : 1]; - std::shared_ptr aBisect(new GeomAPI_Dir2d( - aTangentDir[0]->xy()->added(aTangentDir[1]->xy()))); - std::shared_ptr aStep = aBisect->xy()->multiplied(aFilletRadius); - std::shared_ptr aCenter = aSharedPoint->xy()->added(aStep); + // Calculate fillet arc parameters + std::shared_ptr aCenter, aTangentPntA, aTangentPntB; + calculateFilletCenter(aFeatureA, aFeatureB, aFilletRadius, isStart, aCenter, aTangentPntA, aTangentPntB); + // update features + std::dynamic_pointer_cast( + aNewFeatureA->attribute(aFeatAttributes[isStart[0] ? 0 : 1]))->setValue( + aTangentPntA->x(), aTangentPntA->y()); + aNewFeatureA->execute(); + std::dynamic_pointer_cast( + aNewFeatureB->attribute(aFeatAttributes[2 + (isStart[1] ? 0 : 1)]))->setValue( + aTangentPntB->x(), aTangentPntB->y()); + aNewFeatureB->execute(); + // update fillet arc std::dynamic_pointer_cast( aNewArc->attribute(SketchPlugin_Arc::CENTER_ID()))->setValue( aCenter->x(), aCenter->y()); + if (isReversed) { + std::shared_ptr aTmp = aTangentPntA; + aTangentPntA = aTangentPntB; + aTangentPntB = aTmp; + } std::dynamic_pointer_cast( - aNewArc->attribute(SketchPlugin_Arc::START_ID()))->setValue( - aSharedPoint->x() - 1.e-5 * aStep->y(), aSharedPoint->y() + 1.e-5 * aStep->x()); + aNewArc->attribute(SketchPlugin_Arc::START_ID()))->setValue(aTangentPntA->x(), aTangentPntA->y()); std::dynamic_pointer_cast( - aNewArc->attribute(SketchPlugin_Arc::END_ID()))->setValue( - aSharedPoint->x() + 1.e-5 * aStep->y(), aSharedPoint->y() - 1.e-5 * aStep->x()); + aNewArc->attribute(SketchPlugin_Arc::END_ID()))->setValue(aTangentPntB->x(), aTangentPntB->y()); aNewArc->execute(); - // attach new arc to the list - aRefListOfFillet->append(aNewArc->lastResult()); - - // Create list of additional constraints: - // 1. Coincidence of boundary points of features and fillet arc - // 1.1. coincidence - FeaturePtr aConstraint = sketch()->addFeature(SketchPlugin_ConstraintCoincidence::ID()); - AttributeRefAttrPtr aRefAttr = std::dynamic_pointer_cast( - aConstraint->attribute(SketchPlugin_Constraint::ENTITY_A())); - aRefAttr->setAttr(aNewArc->attribute(SketchPlugin_Arc::START_ID())); - aRefAttr = std::dynamic_pointer_cast( - aConstraint->attribute(SketchPlugin_Constraint::ENTITY_B())); - int aFeatInd = isReversed ? 1 : 0; - int anAttrInd = (isReversed ? 2 : 0) + (isStart[isReversed ? 1 : 0] ? 0 : 1); - aRefAttr->setAttr(aFeature[aFeatInd]->attribute(aFeatAttributes[anAttrInd])); - recalculateAttributes(aNewArc, SketchPlugin_Arc::START_ID(), aFeature[aFeatInd], aFeatAttributes[anAttrInd]); - aConstraint->execute(); - ModelAPI_EventCreator::get()->sendUpdated(aConstraint, anUpdateEvent); - // 1.2. coincidence - aConstraint = sketch()->addFeature(SketchPlugin_ConstraintCoincidence::ID()); - aRefAttr = std::dynamic_pointer_cast( - aConstraint->attribute(SketchPlugin_Constraint::ENTITY_A())); - aRefAttr->setAttr(aNewArc->attribute(SketchPlugin_Arc::END_ID())); - aRefAttr = std::dynamic_pointer_cast( - aConstraint->attribute(SketchPlugin_Constraint::ENTITY_B())); - aFeatInd = isReversed ? 0 : 1; - anAttrInd = (isReversed ? 0 : 2) + (isStart[isReversed ? 0 : 1] ? 0 : 1); - aRefAttr->setAttr(aFeature[aFeatInd]->attribute(aFeatAttributes[anAttrInd])); - recalculateAttributes(aNewArc, SketchPlugin_Arc::END_ID(), aFeature[aFeatInd], aFeatAttributes[anAttrInd]); - aConstraint->execute(); - ModelAPI_EventCreator::get()->sendUpdated(aConstraint, anUpdateEvent); - // 2. Fillet arc radius - aConstraint = sketch()->addFeature(SketchPlugin_ConstraintRadius::ID()); - aRefAttr = std::dynamic_pointer_cast( - aConstraint->attribute(SketchPlugin_Constraint::ENTITY_A())); - aRefAttr->setObject(aNewArc->lastResult()); - std::dynamic_pointer_cast( - aConstraint->attribute(SketchPlugin_Constraint::VALUE()))->setValue(aFilletRadius); - std::dynamic_pointer_cast( - aConstraint->attribute(SketchPlugin_Constraint::FLYOUT_VALUE_PNT()))->setValue( - isStart[0] ? aStartEndPnt[0] : aStartEndPnt[1]); - aConstraint->execute(); - ModelAPI_EventCreator::get()->sendUpdated(aConstraint, anUpdateEvent); - // 3. Tangency of fillet arc and features - for (int i = 0; i < aNbFeatures; i++) { - aConstraint = sketch()->addFeature(SketchPlugin_ConstraintTangent::ID()); + + if (needNewObjects) { + // attach new arc to the list + aRefListOfFillet->append(aNewFeatureA->lastResult()); + aRefListOfFillet->append(aNewFeatureB->lastResult()); + aRefListOfFillet->append(aNewArc->lastResult()); + + // Create list of additional constraints: + // 1. Coincidence of boundary points of features (copied lines/arcs) and fillet arc + // 1.1. coincidence + FeaturePtr aConstraint = sketch()->addFeature(SketchPlugin_ConstraintCoincidence::ID()); + AttributeRefAttrPtr aRefAttr = std::dynamic_pointer_cast( + aConstraint->attribute(SketchPlugin_Constraint::ENTITY_A())); + aRefAttr->setAttr(aNewArc->attribute(SketchPlugin_Arc::START_ID())); + aRefAttr = std::dynamic_pointer_cast( + aConstraint->attribute(SketchPlugin_Constraint::ENTITY_B())); + int aFeatInd = isReversed ? 1 : 0; + int anAttrInd = (isReversed ? 2 : 0) + (isStart[isReversed ? 1 : 0] ? 0 : 1); + aRefAttr->setAttr(aNewFeature[aFeatInd]->attribute(aFeatAttributes[anAttrInd])); + recalculateAttributes(aNewArc, SketchPlugin_Arc::START_ID(), aNewFeature[aFeatInd], aFeatAttributes[anAttrInd]); + aConstraint->execute(); + ModelAPI_EventCreator::get()->sendUpdated(aConstraint, anUpdateEvent); + // 1.2. coincidence + aConstraint = sketch()->addFeature(SketchPlugin_ConstraintCoincidence::ID()); aRefAttr = std::dynamic_pointer_cast( aConstraint->attribute(SketchPlugin_Constraint::ENTITY_A())); - aRefAttr->setObject(aNewArc->lastResult()); + aRefAttr->setAttr(aNewArc->attribute(SketchPlugin_Arc::END_ID())); aRefAttr = std::dynamic_pointer_cast( aConstraint->attribute(SketchPlugin_Constraint::ENTITY_B())); - bool isArc = aFeature[i]->getKind() == SketchPlugin_Arc::ID(); - aRefAttr->setObject(isArc ? aFeature[i]->lastResult() : aFeature[i]->firstResult()); + aFeatInd = isReversed ? 0 : 1; + anAttrInd = (isReversed ? 0 : 2) + (isStart[isReversed ? 0 : 1] ? 0 : 1); + aRefAttr->setAttr(aNewFeature[aFeatInd]->attribute(aFeatAttributes[anAttrInd])); + recalculateAttributes(aNewArc, SketchPlugin_Arc::END_ID(), aNewFeature[aFeatInd], aFeatAttributes[anAttrInd]); aConstraint->execute(); ModelAPI_EventCreator::get()->sendUpdated(aConstraint, anUpdateEvent); + // 2. Fillet arc radius + aConstraint = sketch()->addFeature(SketchPlugin_ConstraintRadius::ID()); + aRefAttr = std::dynamic_pointer_cast( + aConstraint->attribute(SketchPlugin_Constraint::ENTITY_A())); + aRefAttr->setObject(aNewArc->lastResult()); + std::dynamic_pointer_cast( + aConstraint->attribute(SketchPlugin_Constraint::VALUE()))->setValue(aFilletRadius); + std::dynamic_pointer_cast( + aConstraint->attribute(SketchPlugin_Constraint::FLYOUT_VALUE_PNT()))->setValue( + isStart[0] ? aStartEndPnt[0] : aStartEndPnt[1]); + aConstraint->execute(); + ModelAPI_EventCreator::get()->sendUpdated(aConstraint, anUpdateEvent); + // 3. Tangency of fillet arc and features + for (int i = 0; i < aNbFeatures; i++) { + aConstraint = sketch()->addFeature(SketchPlugin_ConstraintTangent::ID()); + aRefAttr = std::dynamic_pointer_cast( + aConstraint->attribute(SketchPlugin_Constraint::ENTITY_A())); + aRefAttr->setObject(aNewArc->lastResult()); + aRefAttr = std::dynamic_pointer_cast( + aConstraint->attribute(SketchPlugin_Constraint::ENTITY_B())); + bool isArc = aNewFeature[i]->getKind() == SketchPlugin_Arc::ID(); + aRefAttr->setObject(isArc ? aNewFeature[i]->lastResult() : aNewFeature[i]->firstResult()); + aConstraint->execute(); + ModelAPI_EventCreator::get()->sendUpdated(aConstraint, anUpdateEvent); + } + // 4. Coincidence of free boundaries of base and copied features + for (int i = 0; i < aNbFeatures; i++) { + anAttrInd = 2*i + (isStart[i] ? 1 : 0); + aConstraint = sketch()->addFeature(SketchPlugin_ConstraintCoincidence::ID()); + aRefAttr = std::dynamic_pointer_cast( + aConstraint->attribute(SketchPlugin_Constraint::ENTITY_A())); + aRefAttr->setAttr(aFeature[i]->attribute(aFeatAttributes[anAttrInd])); + aRefAttr = std::dynamic_pointer_cast( + aConstraint->attribute(SketchPlugin_Constraint::ENTITY_B())); + aRefAttr->setAttr(aNewFeature[i]->attribute(aFeatAttributes[anAttrInd])); + } + // 5. Tangent points should be placed on the base features + for (int i = 0; i < aNbFeatures; i++) { + anAttrInd = 2*i + (isStart[i] ? 0 : 1); + aConstraint = sketch()->addFeature(SketchPlugin_ConstraintCoincidence::ID()); + aRefAttr = std::dynamic_pointer_cast( + aConstraint->attribute(SketchPlugin_Constraint::ENTITY_A())); + aRefAttr->setAttr(aNewFeature[i]->attribute(aFeatAttributes[anAttrInd])); + aRefAttr = std::dynamic_pointer_cast( + aConstraint->attribute(SketchPlugin_Constraint::ENTITY_B())); + aRefAttr->setObject(aFeature[i]->lastResult()); + } + // make base features auxiliary + aFeatureA->boolean(SketchPlugin_SketchEntity::AUXILIARY_ID())->setValue(true); + aFeatureB->boolean(SketchPlugin_SketchEntity::AUXILIARY_ID())->setValue(true); + } else { + // Update radius value + int aNbSubs = sketch()->numberOfSubs(); + FeaturePtr aSubFeature; + for (int aSub = 0; aSub < aNbSubs; aSub++) { + aSubFeature = sketch()->subFeature(aSub); + if (aSubFeature->getKind() != SketchPlugin_ConstraintRadius::ID()) + continue; + AttributeRefAttrPtr aRefAttr = std::dynamic_pointer_cast( + aSubFeature->attribute(SketchPlugin_Constraint::ENTITY_A())); + if (!aRefAttr || !aRefAttr->isObject()) + continue; + FeaturePtr aFeature = ModelAPI_Feature::feature(aRefAttr->object()); + if (aFeature == aNewArc) { + AttributeDoublePtr aRadius = std::dynamic_pointer_cast( + aSubFeature->attribute(SketchPlugin_Constraint::VALUE())); + aRadius->setValue(aFilletRadius); + break; + } + } } - // make base features auxiliary - aFeatureA->boolean(SketchPlugin_SketchEntity::AUXILIARY_ID())->setValue(true); - aFeatureB->boolean(SketchPlugin_SketchEntity::AUXILIARY_ID())->setValue(true); // send events to update the sub-features by the solver if (isUpdateFlushed) @@ -315,38 +354,93 @@ bool SketchPlugin_ConstraintFillet::isMacro() const // ========= Auxiliary functions ================= void recalculateAttributes(FeaturePtr theNewArc, const std::string& theNewArcAttribute, - FeaturePtr theFeature, const std::string& theFeatureAttribute) + FeaturePtr theFeature, const std::string& theFeatureAttribute) { std::shared_ptr anArcPoint = std::dynamic_pointer_cast( theNewArc->attribute(theNewArcAttribute))->pnt(); - if (theFeature->getKind() == SketchPlugin_Line::ID()) { - std::shared_ptr aStartPoint = std::dynamic_pointer_cast( - theFeature->attribute(SketchPlugin_Line::START_ID()))->pnt(); - std::shared_ptr aEndPoint = std::dynamic_pointer_cast( - theFeature->attribute(SketchPlugin_Line::END_ID()))->pnt(); - std::shared_ptr aLineDir(new GeomAPI_Dir2d( - aEndPoint->xy()->decreased(aStartPoint->xy()))); - std::shared_ptr aVec = anArcPoint->xy()->decreased(aStartPoint->xy()); - double aDot = aVec->dot(aLineDir->xy()); - aVec = aStartPoint->xy()->added(aLineDir->xy()->multiplied(aDot)); - anArcPoint->setX(aVec->x()); - anArcPoint->setY(aVec->y()); - } else if (theFeature->getKind() == SketchPlugin_Arc::ID()) { - std::shared_ptr aStartPoint = std::dynamic_pointer_cast( - theFeature->attribute(SketchPlugin_Arc::START_ID()))->pnt(); - std::shared_ptr aCenterPoint = std::dynamic_pointer_cast( - theFeature->attribute(SketchPlugin_Arc::END_ID()))->pnt(); - double aRadius = aStartPoint->distance(aCenterPoint); - std::shared_ptr aDir(new GeomAPI_Dir2d( - anArcPoint->xy()->decreased(aCenterPoint->xy()))); - std::shared_ptr aPoint = aCenterPoint->xy()->added(aDir->xy()->multiplied(aRadius)); - anArcPoint->setX(aPoint->x()); - anArcPoint->setY(aPoint->y()); - } else - return; - - std::dynamic_pointer_cast( - theNewArc->attribute(theNewArcAttribute))->setValue(anArcPoint->x(), anArcPoint->y()); std::dynamic_pointer_cast( theFeature->attribute(theFeatureAttribute))->setValue(anArcPoint->x(), anArcPoint->y()); } + + +void possibleFilletCenterLineLine( + std::shared_ptr thePointA, std::shared_ptr theDirA, + std::shared_ptr thePointB, std::shared_ptr theDirB, + double theRadius, std::list< std::shared_ptr >& theCenters) +{ + std::shared_ptr aDirAT(new GeomAPI_Dir2d(-theDirA->y(), theDirA->x())); + std::shared_ptr aDirBT(new GeomAPI_Dir2d(-theDirB->y(), theDirB->x())); + std::shared_ptr aPntA, aPntB; + double aDet = theDirA->cross(theDirB); + for (double aStepA = -1.0; aStepA <= 1.0; aStepA += 2.0) { + aPntA = thePointA->added(aDirAT->xy()->multiplied(aStepA * theRadius)); + for (double aStepB = -1.0; aStepB <= 1.0; aStepB += 2.0) { + aPntB = thePointB->added(aDirBT->xy()->multiplied(aStepB * theRadius)); + double aVX = aDirAT->xy()->dot(aPntA); + double aVY = aDirBT->xy()->dot(aPntB); + std::shared_ptr aPoint(new GeomAPI_XY( + (theDirB->x() * aVX - theDirA->x() * aVY) / aDet, + (theDirB->y() * aVX - theDirA->y() * aVY) / aDet)); + theCenters.push_back(aPoint); + } + } +} + +void calculateFilletCenter(FeaturePtr theFeatureA, FeaturePtr theFeatureB, + double theRadius, bool theNotInversed[2], + std::shared_ptr& theCenter, + std::shared_ptr& theTangentA, + std::shared_ptr& theTangentB) +{ + if (theFeatureA->getKind() == SketchPlugin_Line::ID() && + theFeatureB->getKind() == SketchPlugin_Line::ID()) { + std::shared_ptr aStartA, aEndA, aStartB, aEndB; + std::shared_ptr aStartPoint, aEndPoint; + + aStartPoint = std::dynamic_pointer_cast( + theFeatureA->attribute(SketchPlugin_Line::START_ID())); + aEndPoint = std::dynamic_pointer_cast( + theFeatureA->attribute(SketchPlugin_Line::END_ID())); + aStartA = std::shared_ptr(theNotInversed[0] ? + new GeomAPI_XY(aStartPoint->x(), aStartPoint->y()) : + new GeomAPI_XY(aEndPoint->x(), aEndPoint->y())); + aEndA = std::shared_ptr(theNotInversed[0] ? + new GeomAPI_XY(aEndPoint->x(), aEndPoint->y()) : + new GeomAPI_XY(aStartPoint->x(), aStartPoint->y())); + + aStartPoint = std::dynamic_pointer_cast( + theFeatureB->attribute(SketchPlugin_Line::START_ID())); + aEndPoint = std::dynamic_pointer_cast( + theFeatureB->attribute(SketchPlugin_Line::END_ID())); + aStartB = std::shared_ptr(theNotInversed[1] ? + new GeomAPI_XY(aStartPoint->x(), aStartPoint->y()) : + new GeomAPI_XY(aEndPoint->x(), aEndPoint->y())); + aEndB = std::shared_ptr(theNotInversed[1] ? + new GeomAPI_XY(aEndPoint->x(), aEndPoint->y()) : + new GeomAPI_XY(aStartPoint->x(), aStartPoint->y())); + + std::shared_ptr aDirA(new GeomAPI_Dir2d(aEndA->decreased(aStartA))); + std::shared_ptr aDirB(new GeomAPI_Dir2d(aEndB->decreased(aStartB))); + std::shared_ptr aDirAT(new GeomAPI_Dir2d(-aDirA->y(), aDirA->x())); + std::shared_ptr aDirBT(new GeomAPI_Dir2d(-aDirB->y(), aDirB->x())); + + // get and filter possible centers + std::list< std::shared_ptr > aSuspectCenters; + possibleFilletCenterLineLine(aStartA, aDirA, aStartB, aDirB, theRadius, aSuspectCenters); + double aDot = 0.0; + std::list< std::shared_ptr >::iterator anIt = aSuspectCenters.begin(); + for (; anIt != aSuspectCenters.end(); anIt++) { + aDot = aDirAT->xy()->dot(aStartA->decreased(*anIt)); + theTangentA = (*anIt)->added(aDirAT->xy()->multiplied(aDot)); + if (theTangentA->decreased(aStartA)->dot(aDirA->xy()) < 0.0) + continue; // incorrect position + aDot = aDirBT->xy()->dot(aStartB->decreased(*anIt)); + theTangentB = (*anIt)->added(aDirBT->xy()->multiplied(aDot)); + if (theTangentB->decreased(aStartB)->dot(aDirB->xy()) < 0.0) + continue; // incorrect position + // the center is found, stop searching + theCenter = *anIt; + return; + } + } +} diff --git a/src/SketchSolver/SketchSolver_ConstraintManager.cpp b/src/SketchSolver/SketchSolver_ConstraintManager.cpp index ef725b563..4034c0b7e 100644 --- a/src/SketchSolver/SketchSolver_ConstraintManager.cpp +++ b/src/SketchSolver/SketchSolver_ConstraintManager.cpp @@ -119,6 +119,8 @@ void SketchSolver_ConstraintManager::processEvent( std::dynamic_pointer_cast(*aFeatIter); if (!aFeature) continue; + if (aFeature->getKind() == SketchPlugin_ConstraintFillet::ID()) + continue; // skip Fillet features if (SketchSolver_Group::isComplexConstraint(aFeature)) { aComplexConstraints.insert(aFeature); continue;