X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_WidgetSketchLabel.cpp;h=231c512fa895b2770608c9b24c5c84b1e9240fd0;hb=91b664498fff007ffce9731f842f85f3f498bd75;hp=190b7e2a348435f0117c5fa28f9a050a2baa797b;hpb=5c59bf6725e7e4855b5ca956475d705e2d5b014c;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_WidgetSketchLabel.cpp b/src/PartSet/PartSet_WidgetSketchLabel.cpp index 190b7e2a3..231c512fa 100644 --- a/src/PartSet/PartSet_WidgetSketchLabel.cpp +++ b/src/PartSet/PartSet_WidgetSketchLabel.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2017 CEA/DEN, EDF R&D +// Copyright (C) 2014-2019 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 @@ -12,10 +12,9 @@ // // 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 +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ or -// email : webmaster.salome@opencascade.com +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include "PartSet_WidgetSketchLabel.h" @@ -25,22 +24,24 @@ #include "SketchPlugin_SketchEntity.h" -#include +#include #include -#include +#include +#include #include -#include -#include +#include #include -#include +#include +#include + +#include +#include #include #include #include #include - -#include -#include +#include #include #include @@ -48,6 +49,8 @@ #include #include #include +#include +#include #include #include @@ -82,7 +85,8 @@ PartSet_WidgetSketchLabel::PartSet_WidgetSketchLabel(QWidget* theParent, ModuleBase_IWorkshop* theWorkshop, const Config_WidgetAPI* theData, const QMap& toShowConstraints) -: ModuleBase_WidgetValidated(theParent, theWorkshop, theData) +: ModuleBase_WidgetValidated(theParent, theWorkshop, theData), myOpenTransaction(false), +myIsSelection(false) { QVBoxLayout* aLayout = new QVBoxLayout(this); ModuleBase_Tools::zeroMargins(aLayout); @@ -117,6 +121,12 @@ PartSet_WidgetSketchLabel::PartSet_WidgetSketchLabel(QWidget* theParent, ModuleBase_Tools::zeroMargins(aLayout); aLayout->addWidget(mySizeOfViewWidget); aLayout->addWidget(aLabel); + + myRemoveExternal = new QCheckBox(tr("Remove external dependencies"), aFirstWgt); + myRemoveExternal->setChecked(false); + aLayout->addWidget(myRemoveExternal); + myRemoveExternal->setVisible(false); + aLayout->addStretch(1); myStackWidget->addWidget(aFirstWgt); @@ -157,6 +167,13 @@ PartSet_WidgetSketchLabel::PartSet_WidgetSketchLabel(QWidget* theParent, if (toShowConstraints.contains(aState)) aShowConstraints->setChecked(toShowConstraints[aState]); } + myShowPoints = new QCheckBox(tr("Show free points"), this); + connect(myShowPoints, SIGNAL(toggled(bool)), this, SIGNAL(showFreePoints(bool))); + aLayout->addWidget(myShowPoints); + + QPushButton* aPlaneBtn = new QPushButton(tr("Change sketch plane"), aSecondWgt); + connect(aPlaneBtn, SIGNAL(clicked(bool)), SLOT(onChangePlane())); + aLayout->addWidget(aPlaneBtn); myStackWidget->addWidget(aSecondWgt); //setLayout(aLayout); @@ -191,18 +208,24 @@ QList PartSet_WidgetSketchLabel::getControls() const return aResult; } -void PartSet_WidgetSketchLabel::onSelectionChanged() +bool PartSet_WidgetSketchLabel::processSelection() { + std::shared_ptr aPlane = plane(); + if (aPlane.get()) + return false; + QList aSelected = getFilteredSelected(); if (aSelected.empty()) - return; + return false; ModuleBase_ViewerPrsPtr aPrs = aSelected.first(); bool aDone = setSelectionInternal(aSelected, false); if (aDone) { updateByPlaneSelected(aPrs); updateObject(myFeature); } + + return aDone; } void PartSet_WidgetSketchLabel::onShowConstraint(bool theOn) @@ -261,8 +284,11 @@ bool PartSet_WidgetSketchLabel::setSelectionInternal( else { // it removes the processed value from the parameters list ModuleBase_ViewerPrsPtr aValue = theValues.first();//.takeFirst(); - if (!theToValidate || isValidInFilters(aValue)) + if (!theToValidate || isValidInFilters(aValue)) { + myIsSelection = true; aDone = setSelectionCustom(aValue); + myIsSelection = false; + } } return aDone; @@ -270,95 +296,74 @@ bool PartSet_WidgetSketchLabel::setSelectionInternal( void PartSet_WidgetSketchLabel::updateByPlaneSelected(const ModuleBase_ViewerPrsPtr& thePrs) { - // 1. hide main planes if they have been displayed + GeomPlanePtr aPlane = plane(); + if (!aPlane.get()) + return; + // 1. hide main planes if they have been displayed and display sketch preview plane myPreviewPlanes->erasePreviewPlanes(myWorkshop); + + PartSet_Module* aModule = dynamic_cast(myWorkshop->module()); + if (aModule) { + CompositeFeaturePtr aSketch = std::dynamic_pointer_cast(myFeature); + bool isSetSizeOfView = false; + double aSizeOfView = 0; + QString aSizeOfViewStr = mySizeOfView->text(); + if (!aSizeOfViewStr.isEmpty()) { + aSizeOfView = aSizeOfViewStr.toDouble(&isSetSizeOfView); + if (isSetSizeOfView && aSizeOfView <= 0) { + isSetSizeOfView = false; + } + } + aModule->sketchMgr()->previewSketchPlane()->setSizeOfView(aSizeOfView, isSetSizeOfView); + aModule->sketchMgr()->previewSketchPlane()->createSketchPlane(aSketch, myWorkshop); + } // 2. if the planes were displayed, change the view projection - const GeomShapePtr& aShape = thePrs->shape(); - std::shared_ptr aGShape; - DataPtr aData = feature()->data(); - AttributeSelectionPtr aSelAttr = std::dynamic_pointer_cast - (aData->attribute(SketchPlugin_SketchEntity::EXTERNAL_ID())); + std::shared_ptr aDir = aPlane->direction(); + gp_XYZ aXYZ = aDir->impl().XYZ(); + double aTwist = 0.0; - // selection happens in OCC viewer - if (aShape.get() && !aShape->isNull()) { - aGShape = aShape; + // Rotate view if the sketcher plane is selected only from preview planes + // Preview planes are created only if there is no any shape + bool aRotate = Config_PropManager::boolean(SKETCH_TAB_NAME, "rotate_to_plane"); + if (aRotate) { + myWorkshop->viewer()->setViewProjection(aXYZ.X(), aXYZ.Y(), aXYZ.Z(), aTwist); } - else { // selection happens in OCC viewer(on body) of in the OB browser - if (aSelAttr) { - aGShape = aSelAttr->value(); - } - } - // If the selected object is a sketch then use its plane - std::shared_ptr aPlane; - ObjectPtr aObj = thePrs->object(); - if (aObj.get()) { - FeaturePtr aFeature = ModelAPI_Feature::feature(aObj); - if (aFeature.get() && (aFeature != feature())) { - if (aFeature->getKind() == SketchPlugin_Sketch::ID()) { - CompositeFeaturePtr aSketch = - std::dynamic_pointer_cast(aFeature); - aPlane = PartSet_Tools::sketchPlane(aSketch); + QString aSizeOfViewStr = mySizeOfView->text(); + if (!aSizeOfViewStr.isEmpty()) { + bool isOk; + double aSizeOfView = aSizeOfViewStr.toDouble(&isOk); + if (isOk && aSizeOfView > 0) { + Handle(V3d_View) aView3d = myWorkshop->viewer()->activeView(); + if (!aView3d.IsNull()) { + Bnd_Box aBndBox; + double aHalfSize = aSizeOfView/2.0; + aBndBox.Update(-aHalfSize, -aHalfSize, -aHalfSize, aHalfSize, aHalfSize, aHalfSize); + aView3d->FitAll(aBndBox, 0.01, false); } } } - if (aGShape.get() != NULL) { - // get plane parameters - if (!aPlane.get()) { - std::shared_ptr aFace(new GeomAPI_Face(aGShape)); - aPlane = aFace->getPlane(); - } - if (!aPlane.get()) - return; - std::shared_ptr aDir = aPlane->direction(); - gp_XYZ aXYZ = aDir->impl().XYZ(); - double aTwist = 0.0; - - // orienting projection is not needed: it is done in GeomAlgoAPI_FaceBuilder::plane - /*if (aGShape->impl().Orientation() == TopAbs_REVERSED) { - aXYZ.Reverse(); - }*/ - - // Rotate view if the sketcher plane is selected only from preview planes - // Preview planes are created only if there is no any shape - bool aRotate = Config_PropManager::boolean(SKETCH_TAB_NAME, "rotate_to_plane"); - if (aRotate) { - myWorkshop->viewer()->setViewProjection(aXYZ.X(), aXYZ.Y(), aXYZ.Z(), aTwist); - } - QString aSizeOfViewStr = mySizeOfView->text(); - if (!aSizeOfViewStr.isEmpty()) { - bool isOk; - double aSizeOfView = aSizeOfViewStr.toDouble(&isOk); - if (isOk && aSizeOfView > 0) { - Handle(V3d_View) aView3d = myWorkshop->viewer()->activeView(); - if (!aView3d.IsNull()) { - Bnd_Box aBndBox; - double aHalfSize = aSizeOfView/2.0; - aBndBox.Update(-aHalfSize, -aHalfSize, -aHalfSize, aHalfSize, aHalfSize, aHalfSize); - aView3d->FitAll(aBndBox, 0.01, false); - } - } - } - PartSet_Module* aModule = dynamic_cast(myWorkshop->module()); - if (aModule) - aModule->onViewTransformed(); + if (myOpenTransaction) { + SessionPtr aMgr = ModelAPI_Session::get(); + aMgr->finishOperation(); + myOpenTransaction = false; } // 3. Clear text in the label myStackWidget->setCurrentIndex(1); //myLabel->setText(""); //myLabel->setToolTip(""); XGUI_Workshop* aWorkshop = XGUI_Tools::workshop(myWorkshop); - disconnect(aWorkshop->selector(), SIGNAL(selectionChanged()), - this, SLOT(onSelectionChanged())); - // 4. deactivate face selection filter - activateFilters(false); // 5. Clear selection mode and define sketching mode emit planeSelected(plane()); // after the plane is selected in the sketch, the sketch selection should be activated // it can not be performed in the sketch label widget because, we don't need to switch off // the selection by any label deactivation, but need to switch it off by stop the sketch - activateSelection(true); + myWorkshop->selectionActivate()->updateSelectionFilters(); + myWorkshop->selectionActivate()->updateSelectionModes(); + + if (aModule) + aModule->onViewTransformed(); // 6. Update sketcher actions XGUI_ActionsMgr* anActMgr = aWorkshop->actionsMgr(); @@ -366,6 +371,8 @@ void PartSet_WidgetSketchLabel::updateByPlaneSelected(const ModuleBase_ViewerPrs myWorkshop->updateCommandStatus(); aWorkshop->selector()->clearSelection(); myWorkshop->viewer()->update(); + + myRemoveExternal->setVisible(false); } std::shared_ptr PartSet_WidgetSketchLabel::plane() const @@ -408,6 +415,11 @@ void PartSet_WidgetSketchLabel::restoreAttributeValue(const AttributePtr& theAtt bool PartSet_WidgetSketchLabel::setSelectionCustom(const ModuleBase_ViewerPrsPtr& thePrs) { + if (myIsSelection && myRemoveExternal->isVisible()) { + if (myRemoveExternal->isChecked()) { + myFeature->customAction(SketchPlugin_Sketch::ACTION_REMOVE_EXTERNAL()); + } + } return fillSketchPlaneBySelection(thePrs); } @@ -448,45 +460,49 @@ bool PartSet_WidgetSketchLabel::fillSketchPlaneBySelection(const ModuleBase_View const GeomShapePtr& aShape = thePrs->shape(); std::shared_ptr aDir; + if (aShape.get() && !aShape->isNull()) { + const TopoDS_Shape& aTDShape = aShape->impl(); + aDir = setSketchPlane(aTDShape); + isOwnerSet = aDir.get(); + } if (thePrs->object() && (feature() != thePrs->object())) { FeaturePtr aFeature = ModelAPI_Feature::feature(thePrs->object()); - if (aFeature.get() && (aFeature != feature())) { - if (aFeature->getKind() == SketchPlugin_Sketch::ID()) { - CompositeFeaturePtr aSketch = - std::dynamic_pointer_cast(aFeature); - std::shared_ptr aPlane = PartSet_Tools::sketchPlane(aSketch); - if (aPlane.get()) { - aDir = setSketchPlane(aPlane); - return aDir.get(); - } - } - } DataPtr aData = feature()->data(); AttributeSelectionPtr aSelAttr = std::dynamic_pointer_cast (aData->attribute(SketchPlugin_SketchEntity::EXTERNAL_ID())); - if (aSelAttr) { + if (aSelAttr.get()) { ResultPtr aRes = std::dynamic_pointer_cast(thePrs->object()); - if (aRes) { - GeomShapePtr aShapePtr(new GeomAPI_Shape()); + if (aRes.get()) { + GeomShapePtr aShapePtr; if (!aShape.get() || aShape->isNull()) { // selection happens in the OCC viewer aShapePtr = ModelAPI_Tools::shape(aRes); } else { // selection happens in OB browser aShapePtr = aShape; } - if (aShapePtr.get() != NULL) { + if (aShapePtr.get() && aShapePtr->isFace()) { + const TopoDS_Shape& aTDShape = aShapePtr->impl(); + setSketchPlane(aTDShape); aSelAttr->setValue(aRes, aShapePtr); isOwnerSet = true; } } + else { + aSelAttr->setValue(aFeature, GeomShapePtr()); + GeomShapePtr aShape = aSelAttr->value(); + if (!aShape.get() && aSelAttr->contextFeature().get() && + aSelAttr->contextFeature()->firstResult().get()) { + aShape = aSelAttr->contextFeature()->firstResult()->shape(); + } + if (aShape.get() && aShape->isPlanar()) { + const TopoDS_Shape& aTDShape = aShape->impl(); + setSketchPlane(aTDShape); + isOwnerSet = true; + } + } } } - else if (aShape.get() && !aShape->isNull()) { - const TopoDS_Shape& aTDShape = aShape->impl(); - aDir = setSketchPlane(aTDShape); - isOwnerSet = aDir.get(); - } return isOwnerSet; } @@ -495,7 +511,6 @@ void PartSet_WidgetSketchLabel::activateCustom() std::shared_ptr aPlane = plane(); if (aPlane.get()) { myStackWidget->setCurrentIndex(1); - activateSelection(true); return; } @@ -505,7 +520,7 @@ void PartSet_WidgetSketchLabel::activateCustom() // Clear previous selection mode It is necessary for correct activation of preview planes XGUI_Workshop* aWorkshop = XGUI_Tools::workshop(myWorkshop); XGUI_Displayer* aDisp = aWorkshop->displayer(); - aDisp->activateObjects(QIntList(), aDisp->displayedObjects(), false); + aWorkshop->selectionActivate()->activateObjects(QIntList(), aDisp->displayedObjects(), false); if (!aBodyIsVisualized) { // We have to select a plane before any operation @@ -514,43 +529,35 @@ void PartSet_WidgetSketchLabel::activateCustom() } else mySizeOfViewWidget->setVisible(false); - - activateSelection(true); - - connect(XGUI_Tools::workshop(myWorkshop)->selector(), SIGNAL(selectionChanged()), - this, SLOT(onSelectionChanged())); - activateFilters(true); } void PartSet_WidgetSketchLabel::deactivate() { - ModuleBase_ModelWidget::deactivate(); + ModuleBase_WidgetValidated::deactivate(); bool aHidePreview = myPreviewPlanes->isPreviewDisplayed(); myPreviewPlanes->erasePreviewPlanes(myWorkshop); - activateSelection(false); - activateFilters(false); if (aHidePreview) myWorkshop->viewer()->update(); } -void PartSet_WidgetSketchLabel::activateSelection(bool toActivate) +void PartSet_WidgetSketchLabel::selectionModes(int& theModuleSelectionModes, QIntList& theModes) { - if (toActivate) { - QIntList aModes; - std::shared_ptr aPlane = plane(); - if (aPlane.get()) { - myWorkshop->module()->activeSelectionModes(aModes); - } - else { - aModes << TopAbs_FACE; - } - myWorkshop->activateSubShapesSelection(aModes); - } else { - myWorkshop->deactivateSubShapesSelection(); - } + theModuleSelectionModes = -1; + std::shared_ptr aPlane = plane(); + if (!aPlane.get()) + theModes << TopAbs_FACE; } +void PartSet_WidgetSketchLabel::selectionFilters(QIntList& theModuleSelectionFilters, + SelectMgr_ListOfFilter& theSelectionFilters) +{ + std::shared_ptr aPlane = plane(); + if (aPlane.get()) + return; + return ModuleBase_WidgetValidated::selectionFilters(theModuleSelectionFilters, + theSelectionFilters); +} std::shared_ptr PartSet_WidgetSketchLabel::setSketchPlane(const TopoDS_Shape& theShape) @@ -586,7 +593,7 @@ std::shared_ptr std::shared_ptr anOrigPnt(new GeomAPI_Pnt(aCoords)); // X axis is preferable to be dirX on the sketch const double tol = Precision::Confusion(); - bool isX = fabs(anA - 1.0) < tol && fabs(aB) < tol && fabs(aC) < tol; + bool isX = fabs(fabs(anA) - 1.0) < tol && fabs(aB) < tol && fabs(aC) < tol; std::shared_ptr aTempDir( isX ? new GeomAPI_Dir(0, 1, 0) : new GeomAPI_Dir(1, 0, 0)); std::shared_ptr aYDir(new GeomAPI_Dir(aNormDir->cross(aTempDir))); @@ -619,3 +626,82 @@ void PartSet_WidgetSketchLabel::onSetPlaneView() aModule->onViewTransformed(); } } + + +//****************************************************** +QList> PartSet_WidgetSketchLabel::findCircularEdgesInPlane() +{ + QList> aResult; + XGUI_Workshop* aWorkshop = XGUI_Tools::workshop(myWorkshop); + XGUI_Displayer* aDisplayer = aWorkshop->displayer(); + QObjectPtrList aDispObjects = aDisplayer->displayedObjects(); + + std::shared_ptr aPlane = plane(); + foreach(ObjectPtr aObj, aDispObjects) { + ResultPtr aResObj = std::dynamic_pointer_cast(aObj); + if (aResObj.get()) { + GeomShapePtr aShape = aResObj->shape(); + if (aShape.get()) { + GeomAPI_ShapeExplorer aExplorer(aShape, GeomAPI_Shape::EDGE); + for(; aExplorer.more(); aExplorer.next()) { + GeomShapePtr aEdgeShape = aExplorer.current(); + GeomAPI_Edge anEdge(aEdgeShape); + if ((anEdge.isCircle() || anEdge.isArc() || anEdge.isEllipse()) && + anEdge.isInPlane(aPlane)) { + bool isContains = false; + // Check that edge is not used. + // It is possible that the same edge will be taken from different faces + foreach(std::shared_ptr aPrs, aResult) { + GeomAPI_Edge aUsedEdge(aPrs->shape()); + if (aUsedEdge.isEqual(aEdgeShape)) { + isContains = true; + break; + } + } + if (!isContains) { + std::shared_ptr + aPrs(new ModuleBase_ViewerPrs(aResObj, aEdgeShape)); + aResult.append(aPrs); + } + } + } + } + } + } + return aResult; +} + +//****************************************************** +void PartSet_WidgetSketchLabel::onChangePlane() +{ + PartSet_Module* aModule = dynamic_cast(myWorkshop->module()); + if (aModule) { + mySizeOfViewWidget->setVisible(false); + myRemoveExternal->setVisible(true); + myStackWidget->setCurrentIndex(0); + + CompositeFeaturePtr aSketch = std::dynamic_pointer_cast(myFeature); + PartSet_Tools::nullifySketchPlane(aSketch); + + Handle(SelectMgr_Filter) aFilter = aModule->selectionFilter(SF_SketchPlaneFilter); + if (!aFilter.IsNull()) { + std::shared_ptr aPln; + Handle(ModuleBase_ShapeInPlaneFilter)::DownCast(aFilter)->setPlane(aPln); + } + XGUI_Workshop* aWorkshop = aModule->getWorkshop(); + + aWorkshop->selectionActivate()->updateSelectionFilters(); + aWorkshop->selectionActivate()->updateSelectionModes(); + + SessionPtr aMgr = ModelAPI_Session::get(); + aMgr->startOperation("Change Sketch plane"); + myOpenTransaction = true; + } +} + +void PartSet_WidgetSketchLabel::setShowPointsState(bool theState) +{ + bool aBlock = myShowPoints->blockSignals(true); + myShowPoints->setChecked(theState); + myShowPoints->blockSignals(aBlock); +}