#include <SketchPlugin_Feature.h>
#include <SketchPlugin_ConstraintCoincidence.h>
+#include <SketchPlugin_Line.h>
+#include <SketchPlugin_Arc.h>
+#include <SketchPlugin_Circle.h>
+#include <SketchPlugin_Point.h>
#include <QGroupBox>
#include <QGridLayout>
const double MaxCoordinate = 1e12;
+static QStringList MyFeaturesForCoincedence;
PartSet_WidgetPoint2D::PartSet_WidgetPoint2D(QWidget* theParent,
ModuleBase_IWorkshop* theWorkshop,
const std::string& theParentId)
: ModuleBase_ModelWidget(theParent, theData, theParentId), myWorkshop(theWorkshop)
{
+ if (MyFeaturesForCoincedence.isEmpty()) {
+ MyFeaturesForCoincedence << SketchPlugin_Line::ID().c_str()
+ << SketchPlugin_Arc::ID().c_str()
+ << SketchPlugin_Point::ID().c_str()
+ << SketchPlugin_Circle::ID().c_str();
+ }
myLockApplyMgr = new PartSet_LockApplyMgr(theParent, myWorkshop);
// the control should accept the focus, so the boolen flag is corrected to be true
return false;
std::shared_ptr<GeomDataAPI_Point2D> aPoint = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
aData->attribute(attributeID()));
-
+
PartSet_WidgetPoint2D* that = (PartSet_WidgetPoint2D*) this;
bool isBlocked = that->blockSignals(true);
bool isImmutable = aPoint->setImmutable(true);
TopoDS_Shape aShape = aShapes.First();
ObjectPtr aObject = aObjects.front();
FeaturePtr aSelectedFeature = ModelAPI_Feature::feature(aObject);
+ bool anExternal = false;
if (aSelectedFeature.get() != NULL) {
std::shared_ptr<SketchPlugin_Feature> aSPFeature =
std::dynamic_pointer_cast<SketchPlugin_Feature>(aSelectedFeature);
if ((!aSPFeature) && (!aShape.IsNull())) {
+ anExternal = true;
ResultPtr aFixedObject = PartSet_Tools::findFixedObjectByExternal(aShape, aObject, mySketch);
if (!aFixedObject.get())
aObject = PartSet_Tools::createFixedObjectByExternal(aShape, aObject, mySketch);
- setConstraintWith(aObject);
+
+ double aX, aY;
+ if (getPoint2d(aView, aShape, aX, aY) && isFeatureContainsPoint(myFeature, aX, aY)) {
+ // do not create a constraint to the point, which already used by the feature
+ // if the feature contains the point, focus is not switched
+ setPoint(aX, aY);
+ }
+ else {
+ if (getPoint2d(aView, aShape, aX, aY))
+ setPoint(aX, aY);
+ setConstraintWith(aObject);
+ emit vertexSelected();
+ emit focusOutWidget(this);
+ }
+ }
+ }
+ if (!anExternal) {
+ double aX, aY;
+ bool isProcessed = false;
+ if (getPoint2d(aView, aShape, aX, aY) && isFeatureContainsPoint(myFeature, aX, aY)) {
+ // when the point is selected, the coordinates of the point should be set into the attribute
+ // if the feature contains the point, focus is not switched
+ setPoint(aX, aY);
+ }
+ else {
+ // 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.
+ if (getPoint2d(aView, aShape, aX, aY)) {
+ setPoint(aX, aY);
+ PartSet_Tools::setConstraints(mySketch, feature(), attributeID(), aX, aY);
+ }
+ else if (aShape.ShapeType() == TopAbs_EDGE) {
+ if (MyFeaturesForCoincedence.contains(myFeature->getKind().c_str()))
+ setConstraintWith(aObject);
+ }
+ // it is important to perform updateObject() in order to the current value is
+ // processed by Sketch Solver. Test case: line is created from a previous point
+ // to some distance, but in the area of the highlighting of the point. Constraint
+ // coincidence is created, after the solver is performed, the distance between the
+ // 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());
emit vertexSelected();
emit focusOutWidget(this);
- return;
}
}
- double aX, aY;
- bool isProcessed = false;
- if (getPoint2d(aView, aShape, aX, aY)) {
- PartSet_Tools::setConstraints(mySketch, feature(), attributeID(),aX, aY);
- isProcessed = true;
- } else if (aShape.ShapeType() == TopAbs_EDGE) {
- setConstraintWith(aObject);
- isProcessed = true;
- }
- if (isProcessed) {
- // it is important to perform updateObject() in order to the current value is
- // processed by Sketch Solver. Test case: line is created from a previous point
- // to some distance, but in the area of the highlighting of the point. Constraint
- // coincidence is created, after the solver is performed, the distance between the
- // 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());
- emit vertexSelected();
- emit focusOutWidget(this);
- return;
- }
}
// End of Bug dependent fragment
+ else {
+ // A case when point is taken from mouse event
+ gp_Pnt aPoint = PartSet_Tools::convertClickToPoint(theEvent->pos(), theWnd->v3dView());
+ double aX, anY;
+ PartSet_Tools::convertTo2D(aPoint, mySketch, aView, aX, anY);
- // A case when point is taken from mouse event
- gp_Pnt aPoint = PartSet_Tools::convertClickToPoint(theEvent->pos(), theWnd->v3dView());
- double aX, anY;
- PartSet_Tools::convertTo2D(aPoint, mySketch, aView, aX, anY);
- if (!setPoint(aX, anY))
- return;
+ // if the feature contains the point, focus is not switched
+ if (!setPoint(aX, anY) || isFeatureContainsPoint(myFeature, aX, anY))
+ return;
- /// Start alternative code
- //std::shared_ptr<GeomDataAPI_Point2D> aFeaturePoint = std::dynamic_pointer_cast<
- // GeomDataAPI_Point2D>(feature()->data()->attribute(attributeID()));
- //QList<FeaturePtr> aIgnore;
- //aIgnore.append(feature());
-
- //double aTolerance = aView->Convert(7);
- //std::shared_ptr<GeomDataAPI_Point2D> aAttrPnt =
- // PartSet_Tools::findAttributePoint(mySketch, aX, anY, aTolerance, aIgnore);
- //if (aAttrPnt.get() != NULL) {
- // aFeaturePoint->setValue(aAttrPnt->pnt());
- // PartSet_Tools::createConstraint(mySketch, aAttrPnt, aFeaturePoint);
- // emit vertexSelected();
- //}
- /// End alternative code
- emit focusOutWidget(this);
+ /// Start alternative code
+ //std::shared_ptr<GeomDataAPI_Point2D> aFeaturePoint = std::dynamic_pointer_cast<
+ // GeomDataAPI_Point2D>(feature()->data()->attribute(attributeID()));
+ //QList<FeaturePtr> aIgnore;
+ //aIgnore.append(feature());
+
+ //double aTolerance = aView->Convert(7);
+ //std::shared_ptr<GeomDataAPI_Point2D> aAttrPnt =
+ // PartSet_Tools::findAttributePoint(mySketch, aX, anY, aTolerance, aIgnore);
+ //if (aAttrPnt.get() != NULL) {
+ // aFeaturePoint->setValue(aAttrPnt->pnt());
+ // PartSet_Tools::createConstraint(mySketch, aAttrPnt, aFeaturePoint);
+ // emit vertexSelected();
+ //}
+ /// End alternative code
+ emit focusOutWidget(this);
+ }
}
return myYSpin->value();
}
+
+bool PartSet_WidgetPoint2D::isFeatureContainsPoint(const FeaturePtr& theFeature,
+ double theX, double theY)
+{
+ bool aPointIsFound = false;
+ AttributePtr aWidgetAttribute = myFeature->attribute(attributeID());
+
+ std::shared_ptr<GeomAPI_Pnt2d> aPnt2d =
+ std::shared_ptr<GeomAPI_Pnt2d>(new GeomAPI_Pnt2d(theX, theY));
+ std::list<AttributePtr> anAttributes =
+ myFeature->data()->attributes(GeomDataAPI_Point2D::typeId());
+ std::list<AttributePtr>::iterator anIter = anAttributes.begin();
+ for(; anIter != anAttributes.end() && !aPointIsFound; anIter++) {
+ AttributePoint2DPtr aPoint2DAttribute =
+ std::dynamic_pointer_cast<GeomDataAPI_Point2D>(*anIter);
+ if (aPoint2DAttribute == aWidgetAttribute)
+ continue;
+ if (aPoint2DAttribute.get() && aPoint2DAttribute->isInitialized()) {
+ aPointIsFound = aPoint2DAttribute->pnt()->isEqual(aPnt2d);
+ }
+ }
+ return aPointIsFound;
+}
+
void PartSet_WidgetPoint2D::onValuesChanged()
{
myLockApplyMgr->valuesChanged();
