<< SketchPlugin_Circle::ID().c_str();
}
- // the control should accept the focus, so the boolen flag is corrected to be true
+ // the control should accept the focus, so the boolean flag is corrected to be true
myIsObligatory = true;
//myOptionParam = theData->getProperty(PREVIOUS_FEATURE_PARAM);
QString aPageName = QString::fromStdString(theData->getProperty(CONTAINER_PAGE_NAME));
myGroupBox = new QGroupBox(aPageName, theParent);
myGroupBox->setFlat(false);
+ bool aAcceptVariables = theData->getBooleanAttribute(DOUBLE_WDG_ACCEPT_EXPRESSIONS, true);
+
QGridLayout* aGroupLay = new QGridLayout(myGroupBox);
ModuleBase_Tools::adjustMargins(aGroupLay);
aGroupLay->setSpacing(2);
aGroupLay->addWidget(aLabel, 0, 0);
myXSpin = new ModuleBase_ParamSpinBox(myGroupBox);
+ myXSpin->setAcceptVariables(aAcceptVariables);
myXSpin->setMinimum(-DBL_MAX);
myXSpin->setMaximum(DBL_MAX);
myXSpin->setToolTip(tr("X"));
aGroupLay->addWidget(aLabel, 1, 0);
myYSpin = new ModuleBase_ParamSpinBox(myGroupBox);
+ myYSpin->setAcceptVariables(aAcceptVariables);
myYSpin->setMinimum(-DBL_MAX);
myYSpin->setMaximum(DBL_MAX);
myYSpin->setToolTip(tr("Y"));
double aX, aY;
if (getPoint2d(aView, aShape, aX, aY)) {
isDone = setPoint(aX, aY);
+ PartSet_Tools::setConstraints(mySketch, feature(), attributeID(), aX, aY);
}
}
else if (canBeActivatedByMove()) {
if (feature()->getKind() == SketchPlugin_Line::ID()) {
FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(aValue.object());
- // Initialise new line with first point equal to end of previous
+ // Initialize new line with first point equal to end of previous
if (aFeature.get()) {
std::shared_ptr<ModelAPI_Data> aData = aFeature->data();
std::shared_ptr<GeomDataAPI_Point2D> aPoint =
return isDone;
}
+void PartSet_WidgetPoint2D::selectContent()
+{
+ myXSpin->selectAll();
+}
+
bool PartSet_WidgetPoint2D::setPoint(double theX, double theY)
{
if (fabs(theX) >= MaxCoordinate)
void PartSet_WidgetPoint2D::deactivate()
{
+ // the value of the control should be stored to model if it was not
+ // initialized yet. It is important when we leave this control by Tab key.
+ // It should not be performed by the widget activation as the preview
+ // is visualized with default value. Line point is moved to origin.
+ AttributePtr anAttribute = myFeature->data()->attribute(attributeID());
+ if (anAttribute && !anAttribute->isInitialized())
+ storeValue();
+
ModuleBase_ModelWidget::deactivate();
ModuleBase_IViewer* aViewer = myWorkshop->viewer();
disconnect(aViewer, SIGNAL(mouseMove(ModuleBase_IViewWindow*, QMouseEvent*)),
NCollection_List<TopoDS_Shape> aShapes;
std::list<ObjectPtr> aObjects;
aSelection->selectedShapes(aShapes, aObjects);
- // if we have selection
- if (aShapes.Extent() > 0) {
+ // if we have selection and use it
+ if (aShapes.Extent() > 0 && useSelectedShapes()) {
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())) {
+ 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;
double aX, aY;
if (getPoint2d(aView, aShape, aX, aY) && isFeatureContainsPoint(myFeature, aX, aY)) {
else {
if (getPoint2d(aView, aShape, aX, aY))
setPoint(aX, aY);
+ else
+ 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);
- emit vertexSelected();
+ // 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();
+
emit focusOutWidget(this);
}
}
- }
if (!anExternal) {
double aX, aY;
bool isProcessed = false;
setPoint(aX, aY);
}
else {
+ bool anOrphanPoint = isOrphanPoint(aSelectedFeature, mySketch, aX, aY);
// 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.
PartSet_Tools::setConstraints(mySketch, feature(), attributeID(), aX, aY);
}
else if (aShape.ShapeType() == TopAbs_EDGE) {
- if (MyFeaturesForCoincedence.contains(myFeature->getKind().c_str()))
+ if (MyFeaturesForCoincedence.contains(myFeature->getKind().c_str())) {
setConstraintWith(aObject);
+ setValueState(Stored); // in case of edge selection, Apply state should also be updated
+ }
}
// 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
// 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();
+ if (!anOrphanPoint && !anExternal)
+ emit vertexSelected();
emit focusOutWidget(this);
}
}
double theX, double theY)
{
bool aPointIsFound = false;
+
+ if (feature()->getKind() != SketchPlugin_Line::ID())
+ return aPointIsFound;
+
AttributePtr aWidgetAttribute = myFeature->attribute(attributeID());
std::shared_ptr<GeomAPI_Pnt2d> aPnt2d =
return aPointIsFound;
}
+void PartSet_WidgetPoint2D::initializeValueByActivate()
+{
+}
+
/*void PartSet_WidgetPoint2D::onValuesChanged()
{
emit valuesChanged();
bool PartSet_WidgetPoint2D::processEnter()
{
- bool isModified = myXSpin->isModified() || myYSpin->isModified();
+ bool isModified = getValueState() == ModifiedInPP;
if (isModified) {
- bool isXModified = myXSpin->isModified();
+ bool isXModified = myXSpin->hasFocus();
emit valuesChanged();
- //onValuesChanged();
- myXSpin->clearModified();
- myYSpin->clearModified();
if (isXModified)
myXSpin->selectAll();
else
}
return isModified;
}
+
+bool PartSet_WidgetPoint2D::useSelectedShapes() const
+{
+ return true;
+}
+
+bool PartSet_WidgetPoint2D::isOrphanPoint(const FeaturePtr& theFeature,
+ const CompositeFeaturePtr& theSketch,
+ double theX, double theY)
+{
+ bool anOrphanPoint = false;
+ if (theFeature.get()) {
+ std::shared_ptr<GeomDataAPI_Point2D> aPointAttr;
+ std::string aFeatureKind = theFeature->getKind();
+ if (aFeatureKind == SketchPlugin_Point::ID())
+ aPointAttr = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
+ theFeature->attribute(SketchPlugin_Point::COORD_ID()));
+ else if (aFeatureKind == SketchPlugin_Circle::ID())
+ aPointAttr = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
+ theFeature->attribute(SketchPlugin_Circle::CENTER_ID()));
+
+ else if (aFeatureKind == SketchPlugin_Arc::ID())
+ aPointAttr = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
+ theFeature->attribute(SketchPlugin_Arc::CENTER_ID()));
+
+ /// check that the geometry point with the given coordinates is the checked point
+ /// e.g. in arc the (x,y) point can not coicide to the center point and it automatically
+ /// means that this point is not an orphant one.
+ if (aPointAttr.get()) {
+ std::shared_ptr<GeomAPI_Pnt2d> aCheckedPoint = std::shared_ptr<GeomAPI_Pnt2d>(
+ new GeomAPI_Pnt2d(theX, theY));
+ if (!aCheckedPoint->isEqual(aPointAttr->pnt()))
+ return anOrphanPoint;
+ }
+
+ if (aPointAttr.get()) {
+ std::shared_ptr<GeomAPI_Pnt2d> aPoint = aPointAttr->pnt();
+ FeaturePtr aCoincidence = PartSet_Tools::findFirstCoincidence(theFeature, aPoint);
+ anOrphanPoint = true;
+ // if there is at least one concident line to the point, the point is not an orphant
+ if (aCoincidence.get()) {
+ QList<FeaturePtr> aCoinsideLines;
+ PartSet_Tools::findCoincidences(aCoincidence, aCoinsideLines,
+ SketchPlugin_ConstraintCoincidence::ENTITY_A());
+ PartSet_Tools::findCoincidences(aCoincidence, aCoinsideLines,
+ SketchPlugin_ConstraintCoincidence::ENTITY_B());
+ QList<FeaturePtr>::const_iterator anIt = aCoinsideLines.begin(),
+ aLast = aCoinsideLines.end();
+ for (; anIt != aLast && anOrphanPoint; anIt++) {
+ anOrphanPoint = (*anIt)->getKind() != SketchPlugin_Line::ID();
+ }
+ }
+ }
+ }
+ return anOrphanPoint;
+}