-// Copyright (C) 2014-2017 CEA/DEN, EDF R&D
+// Copyright (C) 2014-2019 CEA/DEN, EDF R&D
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// See http://www.salome-platform.org/ or
-// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#include "SketchPlugin_Fillet.h"
const AttributePtr theAttribute);
SketchPlugin_Fillet::SketchPlugin_Fillet()
-: myFilletCreated(false)
+: myFilletCreated(false), myIsReversed(false)
{
+ myIsNotInversed[0] = myIsNotInversed[1] = true;
}
void SketchPlugin_Fillet::initAttributes()
// create feature for fillet arc
FeaturePtr aFilletArc = createFilletArc();
+ if (!aFilletArc) {
+ setError("Error: unable to create a fillet arc.");
+ return;
+ }
// collect features referred to the edges participating in fillet
AttributePoint2DPtr aFilletPoints[2];
FeaturePtr aConstraint;
// Create coincidence features.
- aConstraint = SketchPlugin_Tools::createConstraint(sketch(),
+ aConstraint = SketchPlugin_Tools::createConstraintAttrAttr(sketch(),
SketchPlugin_ConstraintCoincidence::ID(),
aFilletArc->attribute(SketchPlugin_Arc::START_ID()),
myBaseFeatures[aFeatInd[0]]->attribute(myFeatAttributes[anAttrInd[0]]));
ModelAPI_EventCreator::get()->sendUpdated(aConstraint, anUpdateEvent);
- aConstraint = SketchPlugin_Tools::createConstraint(sketch(),
+ aConstraint = SketchPlugin_Tools::createConstraintAttrAttr(sketch(),
SketchPlugin_ConstraintCoincidence::ID(),
aFilletArc->attribute(SketchPlugin_Arc::END_ID()),
myBaseFeatures[aFeatInd[1]]->attribute(myFeatAttributes[anAttrInd[1]]));
// Create tangent features.
for (int i = 0; i < 2; i++) {
- aConstraint = SketchPlugin_Tools::createConstraint(sketch(),
+ aConstraint = SketchPlugin_Tools::createConstraintObjectObject(sketch(),
SketchPlugin_ConstraintTangent::ID(),
aFilletArc->lastResult(),
myBaseFeatures[i]->lastResult());
anAISObject = AISObjectPtr(new GeomAPI_AISObject);
}
anAISObject->createShape(anArcShape);
+ bool isAxiliary = false;
+ AttributeBooleanPtr aAttr = boolean(AUXILIARY_ID());
+ if (aAttr.get())
+ isAxiliary = aAttr->value();
+ SketchPlugin_Tools::customizeFeaturePrs(anAISObject, isAxiliary);
return anAISObject;
}
if (!aFilletPoint2D.get())
return false;
- std::set<FeaturePtr> aFilletFeatures =
- SketchPlugin_Tools::findFeaturesCoincidentToPoint(aFilletPoint2D);
+ std::set<AttributePoint2DPtr> aCoincidentPoints =
+ SketchPlugin_Tools::findPointsCoincidentToPoint(aFilletPoint2D);
+ std::set<FeaturePtr> aFilletFeatures;
+ for (std::set<AttributePoint2DPtr>::iterator aCPIt = aCoincidentPoints.begin();
+ aCPIt != aCoincidentPoints.end(); ++aCPIt) {
+ std::shared_ptr<SketchPlugin_Feature> anOwner =
+ std::dynamic_pointer_cast<SketchPlugin_Feature>(
+ ModelAPI_Feature::feature((*aCPIt)->owner()));
+ if (anOwner && !anOwner->isExternal())
+ aFilletFeatures.insert(anOwner);
+ }
if (aFilletFeatures.size() != 2) {
setError("Error: Selected point does not have two suitable edges for fillet.");
return false;
if (!myBaseFeatures[0] || !myBaseFeatures[1])
calculateFilletParameters();
+ // fix for issue #2810 (sometimes, myCenterXY is NULL, fillet should report an error)
+ if (!myCenterXY)
+ return FeaturePtr();
+
// Create arc feature.
FeaturePtr aFilletArc = sketch()->addFeature(SketchPlugin_Arc::ID());
AttributePoint2DPtr aCoord = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
anApex->attribute(SketchPlugin_Point::COORD_ID()));
aCoord->setValue(theCoordinates);
+ anApex->boolean(SketchPlugin_Point::AUXILIARY_ID())->setValue(true);
// additional coincidence constraints
static Events_ID anUpdateEvent = Events_Loop::eventByName(EVENT_OBJECT_UPDATED);
FeaturePtr aConstraint;
for (int i = 0; i < 2; i++) {
- aConstraint = SketchPlugin_Tools::createConstraint(sketch(),
+ aConstraint = SketchPlugin_Tools::createConstraintAttrObject(sketch(),
SketchPlugin_ConstraintCoincidence::ID(),
aCoord,
myBaseFeatures[i]->lastResult());
return anApex;
}
+struct Length {
+ AttributePtr myPoints[2];
+ std::string myValueText;
+ double myValueDouble;
+ GeomPnt2dPtr myFlyoutPoint;
+ int myLocationType;
+};
+
void SketchPlugin_Fillet::removeReferencesButKeepDistances(
std::set<FeaturePtr>& theFeaturesToRemove,
const AttributePoint2DPtr theFilletPoints[2])
{
FeaturePtr aFilletApex;
- struct Length {
- AttributePtr myPoints[2];
- std::string myValueText;
- double myValueDouble;
- GeomPnt2dPtr myFlyoutPoint;
- int myLocationType;
- };
std::list<Length> aLengthToDistance;
std::set<FeaturePtr>::iterator aFeat = theFeaturesToRemove.begin();
AttributePoint2DPtr aFlyoutAttr = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
aLength->attribute(SketchPlugin_ConstraintLength::FLYOUT_VALUE_PNT()));
if (aFlyoutAttr && aFlyoutAttr->isInitialized())
- aNewLength.myFlyoutPoint = aFlyoutAttr->pnt();
+ aNewLength.myFlyoutPoint = SketchPlugin_Tools::flyoutPointCoordinates(aLength);
AttributeIntegerPtr aLocationAttr =
aLength->integer(SketchPlugin_ConstraintLength::LOCATION_TYPE_ID());
if (aLocationAttr && aLocationAttr->isInitialized())
FeaturePtr aConstraint;
std::list<Length>::iterator anIt = aLengthToDistance.begin();
for (; anIt != aLengthToDistance.end(); ++anIt) {
- aConstraint = SketchPlugin_Tools::createConstraint(sketch(),
+ aConstraint = SketchPlugin_Tools::createConstraintAttrAttr(sketch(),
SketchPlugin_ConstraintDistance::ID(), anIt->myPoints[0], anIt->myPoints[1]);
// set value
AttributeDoublePtr aValue = aConstraint->real(SketchPlugin_Constraint::VALUE());
if (anEdge)
aLengths[i] = anEdge->length();
}
- return std::min(aLengths[0], aLengths[1]) / 6.0;
+ return (aLengths[0] < aLengths[1] ? aLengths[0] : aLengths[1]) / 6.0;
}
std::set<FeaturePtr> findFeaturesToRemove(const FeaturePtr theFeature,