#include <PartSet_Tools.h>
#include <PartSet_Module.h>
+#include <XGUI_Tools.h>
#include <XGUI_Workshop.h>
-#include <XGUI_ViewerProxy.h>
-#include <XGUI_ModuleConnector.h>
-#include <XGUI_SelectionMgr.h>
-#include <XGUI_Selection.h>
-#include <XGUI_OperationMgr.h>
+#include <XGUI_Displayer.h>
#include <ModuleBase_ParamSpinBox.h>
#include <ModuleBase_Tools.h>
+#include <ModuleBase_IViewer.h>
#include <ModuleBase_IViewWindow.h>
+#include <ModuleBase_ISelection.h>
#include <Config_Keywords.h>
#include <Config_WidgetAPI.h>
#include <Events_Loop.h>
#include <ModelAPI_Events.h>
+#include <ModelAPI_AttributeBoolean.h>
#include <ModelAPI_Feature.h>
#include <ModelAPI_Data.h>
#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,
- const Config_WidgetAPI* theData,
- const std::string& theParentId)
- : ModuleBase_ModelWidget(theParent, theData, theParentId)
+ ModuleBase_IWorkshop* theWorkshop,
+ const Config_WidgetAPI* theData)
+: ModuleBase_ModelWidget(theParent, theData), myWorkshop(theWorkshop),
+ myValueIsCashed(false), myIsFeatureVisibleInCash(true),
+ myXValueInCash(0), myYValueInCash(0)
{
- // the control should accept the focus, so the boolen flag is corrected to be true
+ if (MyFeaturesForCoincedence.isEmpty()) {
+ MyFeaturesForCoincedence << SketchPlugin_Line::ID().c_str()
+ << SketchPlugin_Arc::ID().c_str()
+ << SketchPlugin_Point::ID().c_str()
+ << SketchPlugin_Circle::ID().c_str();
+ }
+
+ // 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->setColumnStretch(1, 1);
{
QLabel* aLabel = new QLabel(myGroupBox);
- aLabel->setText(tr("X"));
- aLabel->setPixmap(QPixmap(":pictures/x_point.png"));
+ aLabel->setText(tr("X "));
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(myXSpin, 0, 1);
- connect(myXSpin, SIGNAL(valueChanged(const QString&)), this, SLOT(onValuesChanged()));
+ connect(myXSpin, SIGNAL(valueChanged(const QString&)), this, SIGNAL(valuesModified()));
}
{
QLabel* aLabel = new QLabel(myGroupBox);
- aLabel->setText(tr("Y"));
- aLabel->setPixmap(QPixmap(":pictures/y_point.png"));
+ aLabel->setText(tr("Y "));
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"));
aGroupLay->addWidget(myYSpin, 1, 1);
- connect(myYSpin, SIGNAL(valueChanged(const QString&)), this, SLOT(onValuesChanged()));
+ connect(myYSpin, SIGNAL(valueChanged(const QString&)), this, SIGNAL(valuesModified()));
}
QVBoxLayout* aLayout = new QVBoxLayout(this);
ModuleBase_Tools::zeroMargins(aLayout);
setLayout(aLayout);
}
-void PartSet_WidgetPoint2D::reset()
+bool PartSet_WidgetPoint2D::resetCustom()
{
- if (!isUseReset())
- return;
-
- if (isComputedDefault() || myXSpin->hasVariable() || myYSpin->hasVariable()) {
- return;
- //if (myFeature->compute(myAttributeID))
- // restoreValue();
+ bool aDone = false;
+ if (!isUseReset() || isComputedDefault() || myXSpin->hasVariable() || myYSpin->hasVariable()) {
+ aDone = false;
}
else {
- bool isOk;
- double aDefValue = QString::fromStdString(getDefaultValue()).toDouble(&isOk);
- // it is important to block the spin box control in order to do not through out the
- // locking of the validating state.
- ModuleBase_Tools::setSpinValue(myXSpin, isOk ? aDefValue : 0.0);
- ModuleBase_Tools::setSpinValue(myYSpin, isOk ? aDefValue : 0.0);
- storeValueCustom();
+ if (myValueIsCashed) {
+ // if the restored value should be hidden, aDone = true to set
+ // reset state for the widget in the parent
+ aDone = restoreCurentValue();
+ }
+ else {
+ bool isOk;
+ double aDefValue = QString::fromStdString(getDefaultValue()).toDouble(&isOk);
+ // it is important to block the spin box control in order to do not through out the
+ // locking of the validating state.
+ ModuleBase_Tools::setSpinValue(myXSpin, isOk ? aDefValue : 0.0);
+ ModuleBase_Tools::setSpinValue(myYSpin, isOk ? aDefValue : 0.0);
+ storeValueCustom();
+ aDone = true;
+ }
}
+ return aDone;
}
PartSet_WidgetPoint2D::~PartSet_WidgetPoint2D()
{
}
-bool PartSet_WidgetPoint2D::setSelection(const QList<ModuleBase_ViewerPrs>& theValues, int& thePosition)
+bool PartSet_WidgetPoint2D::setSelection(QList<ModuleBase_ViewerPrsPtr>& theValues,
+ const bool theToValidate)
{
- if (thePosition < 0 || thePosition >= theValues.size())
- return false;
- ModuleBase_ViewerPrs aValue = theValues[thePosition];
- thePosition++;
-
- Handle(V3d_View) aView = myWorkshop->viewer()->activeView();
bool isDone = false;
- TopoDS_Shape aShape = aValue.shape();
- double aX, aY;
- if (getPoint2d(aView, aShape, aX, aY)) {
- isDone = setPoint(aX, aY);
+ if (theValues.empty())
+ return isDone;
+
+ ModuleBase_ViewerPrsPtr aValue = theValues.takeFirst();
+ GeomShapePtr aShape = aValue->shape();
+ if (aShape.get() && !aShape->isNull()) {
+ Handle(V3d_View) aView = myWorkshop->viewer()->activeView();
+ double aX, aY;
+ const TopoDS_Shape& aTDShape = aShape->impl<TopoDS_Shape>();
+ if (getPoint2d(aView, aTDShape, 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());
+ // 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 =
+ std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
+ aData->attribute(SketchPlugin_Line::END_ID()));
+ if (aPoint) {
+ setPoint(aPoint->x(), aPoint->y());
+ PartSet_Tools::setConstraints(mySketch, feature(), attributeID(), aPoint->x(),
+ aPoint->y());
+ isDone = true;
+ }
+ }
+ }
}
return isDone;
}
+void PartSet_WidgetPoint2D::selectContent()
+{
+ myXSpin->selectAll();
+}
+
bool PartSet_WidgetPoint2D::setPoint(double theX, double theY)
{
if (fabs(theX) >= MaxCoordinate)
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);
-
- if (myXSpin->hasVariable() || myYSpin->hasVariable()) {
- aPoint->setText(myXSpin->text().toStdString(), myYSpin->text().toStdString());
- } else {
- aPoint->setValue(myXSpin->value(), myYSpin->value());
- aPoint->setText("", "");
- }
+
+ // if text is not empty then setValue will be ignored
+ // so we should set the text at first
+ aPoint->setText(myXSpin->hasVariable() ? myXSpin->text().toStdString() : "",
+ myYSpin->hasVariable() ? myYSpin->text().toStdString() : "");
+ aPoint->setValue(!myXSpin->hasVariable() ? myXSpin->value() : aPoint->x(),
+ !myYSpin->hasVariable() ? myYSpin->value() : aPoint->y());
+
// after movement the solver will call the update event: optimization
moveObject(myFeature);
aPoint->setImmutable(isImmutable);
return true;
}
-bool PartSet_WidgetPoint2D::restoreValue()
+bool PartSet_WidgetPoint2D::restoreValueCustom()
{
std::shared_ptr<ModelAPI_Data> aData = myFeature->data();
std::shared_ptr<GeomDataAPI_Point2D> aPoint = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
aData->attribute(attributeID()));
- std::string aTextX = aPoint->textX();
- std::string aTextY = aPoint->textY();
- if (aTextX.empty() || aTextY.empty()) {
- double aX = aPoint->x();
+ QString aTextX = QString::fromStdString(aPoint->textX());
+ QString aTextY = QString::fromStdString(aPoint->textY());
+
+ bool isDouble = false;
+ double aVal = 0;
+ if (aTextX.isEmpty()) {
ModuleBase_Tools::setSpinValue(myXSpin, aPoint->x());
+ } else {
+ aVal = aTextX.toDouble(&isDouble);
+ if (isDouble)
+ ModuleBase_Tools::setSpinValue(myXSpin, aVal);
+ else
+ ModuleBase_Tools::setSpinText(myXSpin, aTextX);
+ }
+ if (aTextY.isEmpty()) {
ModuleBase_Tools::setSpinValue(myYSpin, aPoint->y());
} else {
- ModuleBase_Tools::setSpinText(myXSpin, QString::fromStdString(aTextX));
- ModuleBase_Tools::setSpinText(myYSpin, QString::fromStdString(aTextY));
+ aVal = aTextY.toDouble(&isDouble);
+ if (isDouble)
+ ModuleBase_Tools::setSpinValue(myYSpin, aVal);
+ else
+ ModuleBase_Tools::setSpinText(myYSpin, aTextY);
}
+ //if (aTextX.empty() || aTextY.empty()) {
+ // ModuleBase_Tools::setSpinValue(myXSpin, aPoint->x());
+ // ModuleBase_Tools::setSpinValue(myYSpin, aPoint->y());
+ //} else {
+ // ModuleBase_Tools::setSpinText(myXSpin, QString::fromStdString(aTextX));
+ // ModuleBase_Tools::setSpinText(myYSpin, QString::fromStdString(aTextY));
+ //}
return true;
}
+void PartSet_WidgetPoint2D::storeCurentValue()
+{
+ // do not use cash if a variable is used
+ if (myXSpin->hasVariable() || myYSpin->hasVariable())
+ return;
+
+ myValueIsCashed = true;
+ myIsFeatureVisibleInCash = XGUI_Displayer::isVisible(
+ XGUI_Tools::workshop(myWorkshop)->displayer(), myFeature);
+ myXValueInCash = myXSpin->value();
+ myYValueInCash = myYSpin->value();
+}
+
+bool PartSet_WidgetPoint2D::restoreCurentValue()
+{
+ bool aRestoredAndHidden = true;
+
+ bool isVisible = myIsFeatureVisibleInCash;
+ // fill the control widgets by the cashed value
+
+ myValueIsCashed = false;
+ myIsFeatureVisibleInCash = true;
+ ModuleBase_Tools::setSpinValue(myXSpin, myXValueInCash);
+ ModuleBase_Tools::setSpinValue(myYSpin, myYValueInCash);
+
+ // store value to the model
+ storeValueCustom();
+ if (isVisible) {
+ setValueState(Stored);
+ aRestoredAndHidden = false;
+ }
+ else
+ aRestoredAndHidden = true;
+
+ return aRestoredAndHidden;
+}
+
QList<QWidget*> PartSet_WidgetPoint2D::getControls() const
{
QList<QWidget*> aControls;
void PartSet_WidgetPoint2D::activateCustom()
{
- XGUI_ViewerProxy* aViewer = myWorkshop->viewer();
+ ModuleBase_IViewer* aViewer = myWorkshop->viewer();
connect(aViewer, SIGNAL(mouseMove(ModuleBase_IViewWindow*, QMouseEvent*)),
this, SLOT(onMouseMove(ModuleBase_IViewWindow*, QMouseEvent*)));
connect(aViewer, SIGNAL(mouseRelease(ModuleBase_IViewWindow*, QMouseEvent*)),
this, SLOT(onMouseRelease(ModuleBase_IViewWindow*, QMouseEvent*)));
- connect(aViewer, SIGNAL(enterViewPort()), this, SLOT(onLockValidating()));
- connect(aViewer, SIGNAL(leaveViewPort()), this, SLOT(onUnlockValidating()));
QIntList aModes;
aModes << TopAbs_VERTEX;
aModes << TopAbs_EDGE;
- myWorkshop->moduleConnector()->activateSubShapesSelection(aModes);
+ myWorkshop->activateSubShapesSelection(aModes);
+
+ if (!isEditingMode()) {
+ FeaturePtr aFeature = feature();
+ if (aFeature.get() && aFeature->getKind() == SketchPlugin_Point::ID())
+ storeValue();
+ }
+}
- PartSet_Module* aModule = dynamic_cast<PartSet_Module*>(myWorkshop->module());
- if (aModule->isMouseOverWindow())
- onLockValidating();
+bool PartSet_WidgetPoint2D::canBeActivatedByMove()
+{
+ bool aCanBeActivated = false;
+ if (feature()->getKind() == SketchPlugin_Line::ID() &&
+ attributeID() == SketchPlugin_Line::START_ID())
+ aCanBeActivated = true;
+
+ return aCanBeActivated;
}
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*)),
+ disconnect(aViewer, SIGNAL(mouseMove(ModuleBase_IViewWindow*, QMouseEvent*)),
this, SLOT(onMouseMove(ModuleBase_IViewWindow*, QMouseEvent*)));
disconnect(aViewer, SIGNAL(mouseRelease(ModuleBase_IViewWindow*, QMouseEvent*)),
this, SLOT(onMouseRelease(ModuleBase_IViewWindow*, QMouseEvent*)));
- disconnect(aViewer, SIGNAL(enterViewPort()), this, SLOT(onLockValidating()));
- disconnect(aViewer, SIGNAL(leaveViewPort()), this, SLOT(onUnlockValidating()));
- myWorkshop->moduleConnector()->deactivateSubShapesSelection();
- onUnlockValidating();
+ myWorkshop->deactivateSubShapesSelection();
}
bool PartSet_WidgetPoint2D::getPoint2d(const Handle(V3d_View)& theView,
return false;
}
+bool PartSet_WidgetPoint2D::setConstraintWith(const ObjectPtr& theObject)
+{
+ std::shared_ptr<GeomDataAPI_Point2D> aFeaturePoint;
+ if (feature()->isMacro()) {
+ AttributePtr aThisAttr = feature()->data()->attribute(attributeID());
+ std::shared_ptr<GeomDataAPI_Point2D> anAttrPoint =
+ std::dynamic_pointer_cast<GeomDataAPI_Point2D>(aThisAttr);
+ if (anAttrPoint.get()) {
+ // the macro feature will be removed after the operation is stopped, so we need to build
+ // coicidence to possible sub-features
+ aFeaturePoint = PartSet_Tools::findFirstEqualPointInArgumentFeatures(feature(),
+ anAttrPoint->pnt());
+ }
+ }
+ else {
+ AttributePtr aThisAttr = feature()->data()->attribute(attributeID());
+ aFeaturePoint = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(aThisAttr);
+ }
+ if (!aFeaturePoint.get())
+ return false;
+
+ // Create point-edge coincedence
+ FeaturePtr aFeature = mySketch->addFeature(SketchPlugin_ConstraintCoincidence::ID());
+ std::shared_ptr<ModelAPI_Data> aData = aFeature->data();
+
+ std::shared_ptr<ModelAPI_AttributeRefAttr> aRef1 = std::dynamic_pointer_cast<
+ ModelAPI_AttributeRefAttr>(aData->attribute(SketchPlugin_Constraint::ENTITY_A()));
+
+ aRef1->setAttr(aFeaturePoint);
+
+ std::shared_ptr<ModelAPI_AttributeRefAttr> aRef2 = std::dynamic_pointer_cast<
+ ModelAPI_AttributeRefAttr>(aData->attribute(SketchPlugin_Constraint::ENTITY_B()));
+ aRef2->setObject(theObject);
+
+ // we need to flush created signal in order to coincidence is processed by solver
+ Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_CREATED));
+
+ return true;
+}
void PartSet_WidgetPoint2D::onMouseRelease(ModuleBase_IViewWindow* theWnd, QMouseEvent* theEvent)
{
if (theEvent->button() != Qt::LeftButton)
return;
- XGUI_Selection* aSelection = myWorkshop->selector()->selection();
+ ModuleBase_ISelection* aSelection = myWorkshop->selection();
Handle(V3d_View) aView = theWnd->v3dView();
// TODO: This fragment doesn't work because bug in OCC Viewer. It can be used after fixing.
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);
- if (aSelectedFeature.get() != NULL) {
- std::shared_ptr<SketchPlugin_Feature> aSPFeature =
- std::dynamic_pointer_cast<SketchPlugin_Feature>(aSelectedFeature);
- if ((!aSPFeature) && (!aShape.IsNull())) {
- ResultPtr aFixedObject = PartSet_Tools::findFixedObjectByExternal(aShape, aObject, mySketch);
+ bool anExternal = false;
+ 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())) {
+ ResultPtr aFixedObject;
+ anExternal = true;
+ aFixedObject = PartSet_Tools::findFixedObjectByExternal(aShape, aObject, mySketch);
if (!aFixedObject.get())
aFixedObject = PartSet_Tools::createFixedObjectByExternal(aShape, aObject, mySketch);
+ 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);
+ 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);
+ 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);
+ }
+ }
+ }
+ if (aFixedObject.get())
+ 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)
+ emit vertexSelected(); // it stops the reentrant operation
+
+ 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 {
+ 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.
+ bool isAuxiliaryFeature = false;
+ if (getPoint2d(aView, aShape, aX, aY)) {
+ setPoint(aX, aY);
+ feature()->execute();
+ PartSet_Tools::setConstraints(mySketch, feature(), attributeID(), aX, aY);
+ }
+ else if (aShape.ShapeType() == TopAbs_EDGE) {
+ if (!setConstraintWith(aObject)) {
+ gp_Pnt aPoint = PartSet_Tools::convertClickToPoint(theEvent->pos(), theWnd->v3dView());
+ PartSet_Tools::convertTo2D(aPoint, mySketch, aView, aX, aY);
+ setPoint(aX, aY);
+ }
+ setValueState(Stored); // in case of edge selection, Apply state should also be updated
+ isAuxiliaryFeature = PartSet_Tools::isAuxiliarySketchEntity(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());
+ if (!anOrphanPoint && !anExternal && !isAuxiliaryFeature)
+ emit vertexSelected();
+ emit focusOutWidget(this);
}
- }
- double aX, aY;
- if (getPoint2d(aView, aShape, aX, aY)) {
- setPoint(aX, aY);
-
- PartSet_Tools::setConstraints(mySketch, feature(), attributeID(),aX, aY);
- emit vertexSelected();
- emit focusOutWidget(this);
- return;
- } else if (aShape.ShapeType() == TopAbs_EDGE) {
- // Create point-edge coincedence
- FeaturePtr aFeature = mySketch->addFeature(SketchPlugin_ConstraintCoincidence::ID());
- std::shared_ptr<ModelAPI_Data> aData = aFeature->data();
-
- std::shared_ptr<ModelAPI_AttributeRefAttr> aRef1 = std::dynamic_pointer_cast<
- ModelAPI_AttributeRefAttr>(aData->attribute(SketchPlugin_Constraint::ENTITY_A()));
- AttributePtr aThisAttr = feature()->data()->attribute(attributeID());
- std::shared_ptr<GeomDataAPI_Point2D> aThisPoint =
- std::dynamic_pointer_cast<GeomDataAPI_Point2D>(aThisAttr);
- aRef1->setAttr(aThisPoint);
-
- std::shared_ptr<ModelAPI_AttributeRefAttr> aRef2 = std::dynamic_pointer_cast<
- ModelAPI_AttributeRefAttr>(aData->attribute(SketchPlugin_Constraint::ENTITY_B()));
- aRef2->setObject(aObject);
- aFeature->execute();
- 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);
+ }
}
double aX, anY;
PartSet_Tools::convertTo2D(aPoint, mySketch, theWnd->v3dView(), aX, anY);
+ if (myState != ModifiedInViewer)
+ storeCurentValue();
+ // we need to block the value state change
+ bool isBlocked = blockValueState(true);
setPoint(aX, anY);
+ blockValueState(isBlocked);
+ setValueState(ModifiedInViewer);
}
-void PartSet_WidgetPoint2D::onLockValidating()
+double PartSet_WidgetPoint2D::x() const
{
- XGUI_OperationMgr* anOperationMgr = myWorkshop->operationMgr();
- anOperationMgr->setLockValidating(true);
- // the Ok button should be disabled in the property panel by moving the mouse point in the viewer
- // this leads that the user does not try to click Ok and it avoids an incorrect situation that the
- // line is moved to the cursor to the Ok button
- anOperationMgr->setApplyEnabled(false);
+ return myXSpin->value();
}
-void PartSet_WidgetPoint2D::onUnlockValidating()
+double PartSet_WidgetPoint2D::y() const
{
- // it is important to restore the validity state in the property panel after leaving the
- // view port. Unlock the validating.
- XGUI_OperationMgr* anOperationMgr = myWorkshop->operationMgr();
- if (anOperationMgr->isValidationLocked()) {
- anOperationMgr->setLockValidating(false);
- anOperationMgr->onValidateOperation();
- }
+ return myYSpin->value();
}
-double PartSet_WidgetPoint2D::x() const
+
+bool PartSet_WidgetPoint2D::isFeatureContainsPoint(const FeaturePtr& theFeature,
+ double theX, double theY)
{
- return myXSpin->value();
+ bool aPointIsFound = false;
+
+ if (feature()->getKind() != SketchPlugin_Line::ID())
+ return aPointIsFound;
+
+ 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;
}
-double PartSet_WidgetPoint2D::y() const
+void PartSet_WidgetPoint2D::initializeValueByActivate()
{
- return myYSpin->value();
}
-void PartSet_WidgetPoint2D::onValuesChanged()
+/*void PartSet_WidgetPoint2D::onValuesChanged()
{
- myWorkshop->operationMgr()->setLockValidating(false);
emit valuesChanged();
+}*/
+
+bool PartSet_WidgetPoint2D::processEnter()
+{
+ bool isModified = getValueState() == ModifiedInPP;
+ if (isModified) {
+ bool isXModified = myXSpin->hasFocus();
+ emit valuesChanged();
+ if (isXModified)
+ myXSpin->selectAll();
+ else
+ myYSpin->selectAll();
+ }
+ 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();
+ // 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);
+ 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;
+ QList<FeaturePtr> aCoins;
+ PartSet_Tools::findCoincidences(aCoincidence, aCoinsideLines, aCoins,
+ SketchPlugin_ConstraintCoincidence::ENTITY_A());
+ PartSet_Tools::findCoincidences(aCoincidence, aCoinsideLines, aCoins,
+ 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;
}
