X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FPartSet%2FPartSet_WidgetPoint2d.cpp;h=ab8f1791cbc4b4604acfc189621970fa94a3a2fe;hb=b4dc47afe796ac81456fbe94f1a541f674a79682;hp=9d3345e1d8046cb9d6c9a5b27bdc6ba5aeb82e3c;hpb=8cb8a4f0900b8527fdb9aeb9f05cc3ef6d877dc9;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_WidgetPoint2d.cpp b/src/PartSet/PartSet_WidgetPoint2d.cpp index 9d3345e1d..ab8f1791c 100644 --- a/src/PartSet/PartSet_WidgetPoint2d.cpp +++ b/src/PartSet/PartSet_WidgetPoint2d.cpp @@ -1,8 +1,21 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: PartSet_WidgetPoint2D.cpp -// Created: 25 Apr 2014 -// Author: Natalia ERMOLAEVA +// Copyright (C) 2014-2020 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 +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// 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 +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include "PartSet_WidgetPoint2d.h" #include @@ -89,47 +102,25 @@ PartSet_WidgetPoint2D::PartSet_WidgetPoint2D(QWidget* theParent, // the control should accept the focus, so the boolean flag is corrected to be true myIsObligatory = true; - QString aPageName = QString::fromStdString(theData->getProperty(CONTAINER_PAGE_NAME)); + QString aPageName = translate(theData->getProperty(CONTAINER_PAGE_NAME)); myGroupBox = new QGroupBox(aPageName, theParent); myGroupBox->setFlat(false); - bool aAcceptVariables = theData->getBooleanAttribute(DOUBLE_WDG_ACCEPT_EXPRESSIONS, true); +#ifdef _DEBUG + bool aAcceptVariables = +#endif + 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); - - myXSpin = new ModuleBase_LabelValue(myGroupBox, tr("X")); - //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(textChanged(const QString&)), this, SIGNAL(valuesModified())); - //myXSpin->setValueEnabled(isValueEnabled()); - } - { - //QLabel* aLabel = new QLabel(myGroupBox); - //aLabel->setText(tr("Y ")); - //aGroupLay->addWidget(aLabel, 1, 0); - - myYSpin = new ModuleBase_LabelValue(myGroupBox, tr("Y")); - //ModuleBase_ParamSpinBox(myGroupBox); - //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(textChanged(const QString&)), this, SIGNAL(valuesModified())); - //myYSpin->setValueEnabled(isValueEnabled()); - } + + myXSpin = new ModuleBase_LabelValue(myGroupBox, tr("X")); + aGroupLay->addWidget(myXSpin, 0, 1); + myYSpin = new ModuleBase_LabelValue(myGroupBox, tr("Y")); + aGroupLay->addWidget(myYSpin, 1, 1); + QVBoxLayout* aLayout = new QVBoxLayout(this); ModuleBase_Tools::zeroMargins(aLayout); aLayout->addWidget(myGroupBox); @@ -142,8 +133,6 @@ PartSet_WidgetPoint2D::PartSet_WidgetPoint2D(QWidget* theParent, bool PartSet_WidgetPoint2D::isValidSelectionCustom(const ModuleBase_ViewerPrsPtr& theValue) { - bool aValid = true; - PartSet_Module* aModule = dynamic_cast(myWorkshop->module()); if (aModule->sketchReentranceMgr()->isInternalEditActive()) return true; /// when internal edit is started a new feature is created. I has not results, AIS @@ -230,10 +219,10 @@ bool PartSet_WidgetPoint2D::setSelectionCustom(const ModuleBase_ViewerPrsPtr& th GeomShapePtr aShape = theValue->shape(); if (aShape.get() && !aShape->isNull()) { Handle(V3d_View) aView = myWorkshop->viewer()->activeView(); - double aX, aY; const TopoDS_Shape& aTDShape = aShape->impl(); - if (getPoint2d(aView, aTDShape, aX, aY)) { - fillRefAttribute(aX, aY, theValue); + GeomPnt2dPtr aPnt = PartSet_Tools::getPnt2d(aView, aTDShape, mySketch); + if (aPnt) { + fillRefAttribute(aPnt->x(), aPnt->y(), theValue); isDone = true; } else if (aTDShape.ShapeType() == TopAbs_EDGE) { @@ -293,21 +282,24 @@ bool PartSet_WidgetPoint2D::setSelection(QList& theValu 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(); - if (getPoint2d(aView, aTDShape, aX, aY)) { - isDone = setPoint(aX, aY); - setConstraintToPoint(aX, aY, aValue); + GeomPnt2dPtr aPnt = PartSet_Tools::getPnt2d(aView, aTDShape, mySketch); + + if (aPnt) { + //isDone = setPoint(aPnt->x(), aPnt->y()); + //setConstraintToPoint(aPnt->x(), aPnt->y(), aValue); + processSelection(aValue, aPnt->x(), aPnt->y()); + isDone = true; } } } return isDone; } -void PartSet_WidgetPoint2D::selectContent() -{ - // myXSpin->selectAll(); -} +//void PartSet_WidgetPoint2D::selectContent() +//{ +// // myXSpin->selectAll(); +//} bool PartSet_WidgetPoint2D::setPoint(double theX, double theY) { @@ -329,7 +321,7 @@ bool PartSet_WidgetPoint2D::setPoint(double theX, double theY) bool PartSet_WidgetPoint2D::storeValueCustom() { std::shared_ptr aData = myFeature->data(); - if (!aData) // can be on abort of sketcher element + if (!aData || !aData->isValid()) // can be on abort of sketcher element return false; AttributePoint2DPtr aPoint = std::dynamic_pointer_cast( aData->attribute(attributeID())); @@ -344,10 +336,24 @@ bool PartSet_WidgetPoint2D::storeValueCustom() // myYSpin->hasVariable() ? myYSpin->text().toStdString() : ""); //aPoint->setValue(!myXSpin->hasVariable() ? myXSpin->value() : aPoint->x(), // !myYSpin->hasVariable() ? myYSpin->value() : aPoint->y()); - aPoint->setValue(myXSpin->value(), myYSpin->value()); - // after movement the solver will call the update event: optimization - moveObject(myFeature); + if (myFeature->isMacro()) { + // Moving points of macro-features has been processed directly (without solver) + aPoint->setValue(myXSpin->value(), myYSpin->value()); + updateObject(myFeature); + + } else { + if (!aPoint->isInitialized()) + aPoint->setValue(0., 0.); + + std::shared_ptr aMessage( + new ModelAPI_ObjectMovedMessage(this)); + aMessage->setMovedAttribute(aPoint); + aMessage->setOriginalPosition(aPoint->pnt()); + aMessage->setCurrentPosition(myXSpin->value(), myYSpin->value()); + Events_Loop::loop()->send(aMessage); + } + aPoint->setImmutable(isImmutable); that->blockSignals(isBlocked); @@ -414,14 +420,17 @@ QList PartSet_WidgetPoint2D::getControls() const return aControls; } +//******************************************************************** +void PartSet_WidgetPoint2D::selectionModes(int& theModuleSelectionModes, QIntList& theModes) +{ + theModuleSelectionModes = -1; + theModes << TopAbs_VERTEX; + theModes << TopAbs_EDGE; +} +//******************************************************************** void PartSet_WidgetPoint2D::activateCustom() { - QIntList aModes; - aModes << TopAbs_VERTEX; - aModes << TopAbs_EDGE; - myWorkshop->activateSubShapesSelection(aModes); - if (!isEditingMode()) { FeaturePtr aFeature = feature(); if (aFeature.get() && aFeature->getKind() == SketchPlugin_Point::ID()) @@ -444,25 +453,6 @@ void PartSet_WidgetPoint2D::deactivate() storeValue(); ModuleBase_ModelWidget::deactivate(); - myWorkshop->deactivateSubShapesSelection(); -} - -bool PartSet_WidgetPoint2D::getPoint2d(const Handle(V3d_View)& theView, - const TopoDS_Shape& theShape, - double& theX, double& theY) const -{ - if (!theShape.IsNull()) { - if (theShape.ShapeType() == TopAbs_VERTEX) { - const TopoDS_Vertex& aVertex = TopoDS::Vertex(theShape); - if (!aVertex.IsNull()) { - // A case when point is taken from existing vertex - gp_Pnt aPoint = BRep_Tool::Pnt(aVertex); - PartSet_Tools::convertTo2D(aPoint, mySketch, theView, theX, theY); - return true; - } - } - } - return false; } bool PartSet_WidgetPoint2D::setConstraintToPoint(double theClickedX, double theClickedY, @@ -491,7 +481,7 @@ bool PartSet_WidgetPoint2D::setConstraintToPoint(double theClickedX, double theC AttributePoint2DPtr aFeaturePoint; if (aFeature->isMacro()) { // the macro feature will be removed after the operation is stopped, so we need to build - // coicidence to possible sub-features + // coincidence to possible sub-features aFeaturePoint = findFirstEqualPointInArgumentFeatures(aFeature, aClickedPoint); } else { @@ -520,7 +510,7 @@ bool PartSet_WidgetPoint2D::setConstraintToObject(const ObjectPtr& theObject) AttributePoint2DPtr anAttrPoint = std::dynamic_pointer_cast(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 + // coincidence to possible sub-features aFeaturePoint = findFirstEqualPointInArgumentFeatures(feature(), anAttrPoint->pnt()); } @@ -567,12 +557,36 @@ void PartSet_WidgetPoint2D::mouseReleased(ModuleBase_IViewWindow* theWindow, QMo aFirstValue = myPreSelected; } + double aX=0, aY=0; + bool aHasPoint = false; + if (aFirstValue.get()) { + GeomShapePtr aShape = aFirstValue->shape(); + if (aShape->shapeType() == TopAbs_VERTEX) { + const TopoDS_Shape& aTDShape = aShape->impl(); + GeomPnt2dPtr aPnt = PartSet_Tools::getPnt2d(aView, aTDShape, mySketch); + aX = aPnt->x(); + aY = aPnt->y(); + aHasPoint = true; + } + } + if (!aHasPoint) { + gp_Pnt aPoint = PartSet_Tools::convertClickToPoint(theEvent->pos(), aView); + PartSet_Tools::convertTo2D(aPoint, mySketch, aView, aX, aY); + } + processSelection(aFirstValue, aX, aY); +} + +void PartSet_WidgetPoint2D::processSelection(const ModuleBase_ViewerPrsPtr& theValue, + double theX, double theY) +{ + if (!setPoint(theX, theY)) + return; // if we have selection and use it - if (aFirstValue.get() && isValidSelectionCustom(aFirstValue) && - aFirstValue->shape().get()) { /// Trihedron Axis may be selected, but shape is empty - GeomShapePtr aGeomShape = aFirstValue->shape(); + if (theValue.get() && isValidSelectionCustom(theValue) && theValue->shape().get()) { + /// Trihedron Axis may be selected, but shape is empty + GeomShapePtr aGeomShape = theValue->shape(); TopoDS_Shape aShape = aGeomShape->impl(); - ObjectPtr aObject = aFirstValue->object(); + ObjectPtr aObject = theValue->object(); FeaturePtr aSelectedFeature = ModelAPI_Feature::feature(aObject); bool anExternal = false; @@ -590,33 +604,20 @@ void PartSet_WidgetPoint2D::mouseReleased(ModuleBase_IViewWindow* theWindow, QMo else { anExternal = true; if (!aFixedObject.get()) - aFixedObject = PartSet_Tools::createFixedObjectByExternal(aShape, aObject, mySketch); + { + FeaturePtr aCreatedFeature; + aFixedObject = PartSet_Tools::createFixedObjectByExternal(aGeomShape, aObject, mySketch, + false, aCreatedFeature); + } } } if (anExternal) { - 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 { - if (aShape.ShapeType() == TopAbs_EDGE) { - // point is taken from mouse event and set in attribute. It should be done before set - // coinident constraint to the external line. If a point is created, it should be in - // the mouse clicked point - gp_Pnt aPoint = PartSet_Tools::convertClickToPoint(theEvent->pos(), - theWindow->v3dView()); - PartSet_Tools::convertTo2D(aPoint, mySketch, aView, aX, aY); - setPoint(aX, aY); - } + if (!isFeatureContainsPoint(myFeature, theX, theY)) { + if (aShape.ShapeType() == TopAbs_EDGE) { setValueState(Stored); // in case of edge selection, Apply state should also be updated } bool anOrphanPoint = aShape.ShapeType() == TopAbs_VERTEX || - isOrphanPoint(aSelectedFeature, mySketch, aX, aY); + isOrphanPoint(aSelectedFeature, mySketch, theX, theY); if (anExternal) { // we should not stop reentrant operation on external objects because anOrphanPoint = true; @@ -624,7 +625,7 @@ void PartSet_WidgetPoint2D::mouseReleased(ModuleBase_IViewWindow* theWindow, QMo 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); + anOrphanPoint = isOrphanPoint(aFixedFeature, mySketch, theX, theY); } } } @@ -637,34 +638,25 @@ void PartSet_WidgetPoint2D::mouseReleased(ModuleBase_IViewWindow* theWindow, QMo if (!anOrphanPoint) emit vertexSelected(); // it stops the reentrant operation + myPreSelected.reset(); 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 { + else { + if (!isFeatureContainsPoint(myFeature, theX, theY)) { + double aX = 0, aY = 0; 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); - setConstraintToPoint(aX, aY, aFirstValue); + if (aShape.ShapeType() == TopAbs_VERTEX) { + setConstraintToPoint(theX, theY, theValue); } else if (aShape.ShapeType() == TopAbs_EDGE) { // point is taken from mouse event and set in attribute. It should be done before setting // coinident constraint to the external line. If a point is created, it should be in // the mouse clicked point - gp_Pnt aPoint = PartSet_Tools::convertClickToPoint(theEvent->pos(), theWindow->v3dView()); - PartSet_Tools::convertTo2D(aPoint, mySketch, aView, aX, aY); - setPoint(aX, aY); setConstraintToObject(aObject); setValueState(Stored); // in case of edge selection, Apply state should also be updated isAuxiliaryFeature = PartSet_Tools::isAuxiliarySketchEntity(aObject); @@ -678,48 +670,47 @@ void PartSet_WidgetPoint2D::mouseReleased(ModuleBase_IViewWindow* theWindow, QMo updateObject(feature()); if (!anOrphanPoint && !anExternal && !isAuxiliaryFeature) emit vertexSelected(); + myPreSelected.reset(); emit focusOutWidget(this); } } } // The selection could be a center of an external circular object - else if (aFirstValue.get() && (!aFirstValue->interactive().IsNull())) { - Handle(PartSet_CenterPrs) aAIS = Handle(PartSet_CenterPrs)::DownCast(aFirstValue->interactive()); + else if (theValue.get() && (!theValue->interactive().IsNull())) { + Handle(PartSet_CenterPrs) aAIS = + Handle(PartSet_CenterPrs)::DownCast(theValue->interactive()); if (!aAIS.IsNull()) { gp_Pnt aPntComp = aAIS->Component()->Pnt(); GeomVertexPtr aVertPtr(new GeomAPI_Vertex(aPntComp.X(), aPntComp.Y(), aPntComp.Z())); TopoDS_Shape aShape = aVertPtr->impl(); - ResultPtr aFixedObject = PartSet_Tools::findFixedObjectByExternal(aShape, aAIS->object(), mySketch); + ResultPtr aFixedObject = + PartSet_Tools::findFixedObjectByExternal(aShape, aAIS->object(), mySketch); if (!aFixedObject.get()) + { + FeaturePtr aCreatedFeature; aFixedObject = PartSet_Tools::createFixedByExternalCenter(aAIS->object(), aAIS->edge(), - aAIS->centerType(), mySketch); + aAIS->centerType(), mySketch, false, aCreatedFeature); + } if (aFixedObject.get()) setConstraintToObject(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()); - double aX, aY; - if (getPoint2d(aView, aShape, 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); - } emit vertexSelected(); // it stops the reentrant operation + myPreSelected.reset(); emit focusOutWidget(this); } } else { // A case when point is taken from mouse event - gp_Pnt aPoint = PartSet_Tools::convertClickToPoint(theEvent->pos(), theWindow->v3dView()); - double aX, anY; - PartSet_Tools::convertTo2D(aPoint, mySketch, aView, aX, anY); // if the feature contains the point, focus is not switched - if (!setPoint(aX, anY) || isFeatureContainsPoint(myFeature, aX, anY)) + if (isFeatureContainsPoint(myFeature, theX, theY)) return; + myPreSelected.reset(); emit focusOutWidget(this); } } @@ -731,7 +722,6 @@ void PartSet_WidgetPoint2D::setPreSelection( { myPreSelected = thePreSelected; mouseReleased(theWnd, theEvent); - myPreSelected = ModuleBase_ViewerPrsPtr(); } void PartSet_WidgetPoint2D::getGeomSelection_(const std::shared_ptr& theValue, @@ -750,13 +740,13 @@ void PartSet_WidgetPoint2D::mouseMoved(ModuleBase_IViewWindow* theWindow, QMouse gp_Pnt aPoint = PartSet_Tools::convertClickToPoint(theEvent->pos(), theWindow->v3dView()); - double aX, anY; - PartSet_Tools::convertTo2D(aPoint, mySketch, theWindow->v3dView(), aX, anY); + double aX = 0, aY = 0; + PartSet_Tools::convertTo2D(aPoint, mySketch, theWindow->v3dView(), aX, aY); if (myState != ModifiedInViewer) storeCurentValue(); // we need to block the value state change bool isBlocked = blockValueState(true); - setPoint(aX, anY); + setPoint(aX, aY); blockValueState(isBlocked); setValueState(ModifiedInViewer); } @@ -867,10 +857,13 @@ bool PartSet_WidgetPoint2D::isOrphanPoint(const FeaturePtr& theFeature, if (aCoincidence.get()) { QList aCoinsideLines; QList aCoins; + QList anIsAttributes; PartSet_Tools::findCoincidences(aCoincidence, aCoinsideLines, aCoins, - SketchPlugin_ConstraintCoincidence::ENTITY_A()); + SketchPlugin_ConstraintCoincidence::ENTITY_A(), + anIsAttributes); PartSet_Tools::findCoincidences(aCoincidence, aCoinsideLines, aCoins, - SketchPlugin_ConstraintCoincidence::ENTITY_B()); + SketchPlugin_ConstraintCoincidence::ENTITY_B(), + anIsAttributes); QList::const_iterator anIt = aCoinsideLines.begin(), aLast = aCoinsideLines.end(); for (; anIt != aLast && anOrphanPoint; anIt++) {