#include <Events_Loop.h>
#include <ModelAPI_Events.h>
+#include <ModelAPI_AttributeBoolean.h>
#include <ModelAPI_Feature.h>
#include <ModelAPI_Data.h>
aModes << TopAbs_VERTEX;
aModes << TopAbs_EDGE;
myWorkshop->activateSubShapesSelection(aModes);
+
+ if (!isEditingMode()) {
+ FeaturePtr aFeature = feature();
+ if (aFeature.get() && aFeature->getKind() == SketchPlugin_Point::ID())
+ storeValue();
+ }
}
bool PartSet_WidgetPoint2D::canBeActivatedByMove()
ObjectPtr aObject = aObjects.front();
FeaturePtr aSelectedFeature = ModelAPI_Feature::feature(aObject);
bool anExternal = false;
- std::shared_ptr<SketchPlugin_Feature> aSPFeature;
- if (aSelectedFeature.get() != NULL)
- aSPFeature = std::dynamic_pointer_cast<SketchPlugin_Feature>(aSelectedFeature);
+ std::shared_ptr<SketchPlugin_Feature> aSPFeature;
+ if (aSelectedFeature.get() != NULL)
+ aSPFeature = std::dynamic_pointer_cast<SketchPlugin_Feature>(aSelectedFeature);
if ((!aSPFeature && !aShape.IsNull()) ||
(aSPFeature.get() && aSPFeature->isExternal())) {
anExternal = true;
ResultPtr aFixedObject = PartSet_Tools::findFixedObjectByExternal(aShape, aObject, mySketch);
if (!aFixedObject.get())
- aObject = PartSet_Tools::createFixedObjectByExternal(aShape, aObject, mySketch);
- else
- aObject = aFixedObject;
+ aFixedObject = PartSet_Tools::createFixedObjectByExternal(aShape, aObject, mySketch);
double aX, aY;
if (getPoint2d(aView, aShape, aX, aY) && isFeatureContainsPoint(myFeature, aX, aY)) {
setValueState(Stored); // in case of edge selection, Apply state should also be updated
bool anOrphanPoint = aShape.ShapeType() == TopAbs_VERTEX ||
isOrphanPoint(aSelectedFeature, mySketch, aX, aY);
- setConstraintWith(aObject);
+ if (anExternal) {
+ anOrphanPoint = true; // we should not stop reentrant operation on external objects because
+ // they are not participate in the contour creation excepting external vertices
+ if (aShape.ShapeType() == TopAbs_VERTEX) {
+ FeaturePtr aFixedFeature = ModelAPI_Feature::feature(aFixedObject);
+ if (aFixedFeature.get() && aFixedFeature->getKind() == SketchPlugin_Point::ID()) {
+ anOrphanPoint = isOrphanPoint(aFixedFeature, mySketch, aX, aY, true);
+ }
+ }
+ }
+
+ setConstraintWith(aFixedObject);
// fignal updated should be flushed in order to visualize possible created external objects
// e.g. selection of trihedron axis when input end arc point
updateObject(feature());
- if (!anOrphanPoint && !anExternal)
- emit vertexSelected();
+
+ if (!anOrphanPoint)
+ emit vertexSelected(); // it stops the reentrant operation
emit focusOutWidget(this);
}
// do not set a coincidence constraint in the attribute if the feature contains a point
// with the same coordinates. It is important for line creation in order to do not set
// the same constraints for the same points, oterwise the result line has zero length.
+ bool isAuxiliaryFeature = false;
if (getPoint2d(aView, aShape, aX, aY)) {
setPoint(aX, aY);
PartSet_Tools::setConstraints(mySketch, feature(), attributeID(), aX, aY);
if (MyFeaturesForCoincedence.contains(myFeature->getKind().c_str())) {
setConstraintWith(aObject);
setValueState(Stored); // in case of edge selection, Apply state should also be updated
+
+ FeaturePtr anObjectFeature = ModelAPI_Feature::feature(aObject);
+ std::string anAuxiliaryAttribute = SketchPlugin_SketchEntity::AUXILIARY_ID();
+ AttributeBooleanPtr anAuxiliaryAttr = std::dynamic_pointer_cast<ModelAPI_AttributeBoolean>(
+ anObjectFeature->data()->attribute(anAuxiliaryAttribute));
+ if (anAuxiliaryAttr.get())
+ isAuxiliaryFeature = anAuxiliaryAttr->value();
}
}
// it is important to perform updateObject() in order to the current value is
// points of the line becomes less than the tolerance. Validator of the line returns
// false, the line will be aborted, but sketch stays valid.
updateObject(feature());
- if (!anOrphanPoint && !anExternal)
+ if (!anOrphanPoint && !anExternal && !isAuxiliaryFeature)
emit vertexSelected();
emit focusOutWidget(this);
}
bool PartSet_WidgetPoint2D::isOrphanPoint(const FeaturePtr& theFeature,
const CompositeFeaturePtr& theSketch,
- double theX, double theY)
+ double theX, double theY, const bool theSearchInResults)
{
bool anOrphanPoint = false;
if (theFeature.get()) {
if (aPointAttr.get()) {
std::shared_ptr<GeomAPI_Pnt2d> aPoint = aPointAttr->pnt();
- FeaturePtr aCoincidence = PartSet_Tools::findFirstCoincidence(theFeature, aPoint);
+ // we need to find coincidence features in results also, because external object(point)
+ // uses refs to me in another feature.
+ FeaturePtr aCoincidence = PartSet_Tools::findFirstCoincidence(theFeature, aPoint, theSearchInResults);
anOrphanPoint = true;
// if there is at least one concident line to the point, the point is not an orphant
if (aCoincidence.get()) {
