X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_WidgetSketchLabel.cpp;h=0185172b98c85ec4669e203a6f8c3bf5cf101c7d;hb=613e08f568fe6aadf79935d5b66b0757c9b1eb9f;hp=b5ad01f40834b2e303f51067e2e1befb7733431b;hpb=a50d298cf3f55609f4a143a243a66ba140f89683;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_WidgetSketchLabel.cpp b/src/PartSet/PartSet_WidgetSketchLabel.cpp index b5ad01f40..0185172b9 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,16 +12,16 @@ // // 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" #include "PartSet_Tools.h" #include "PartSet_Module.h" #include "PartSet_PreviewPlanes.h" +#include "PartSet_SketcherReentrantMgr.h" #include "SketchPlugin_SketchEntity.h" @@ -37,11 +37,14 @@ #include #include +#include +#include #include #include #include #include +#include #include #include @@ -73,9 +76,10 @@ #include #include #include -#include #include #include +#include +#include #ifndef DBL_MAX #define DBL_MAX 1.7976931348623158e+308 @@ -85,7 +89,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); @@ -100,7 +105,7 @@ PartSet_WidgetSketchLabel::PartSet_WidgetSketchLabel(QWidget* theParent, // Size of the View control mySizeOfViewWidget = new QWidget(aFirstWgt); QHBoxLayout* aSizeLayout = new QHBoxLayout(mySizeOfViewWidget); - aSizeLayout->addWidget(new QLabel("Size of the view", mySizeOfViewWidget)); + aSizeLayout->addWidget(new QLabel(tr("Size of the view"), mySizeOfViewWidget)); mySizeOfView = new QLineEdit(mySizeOfViewWidget); QDoubleValidator* aValidator = new QDoubleValidator(0, DBL_MAX, 12, mySizeOfView); @@ -109,10 +114,27 @@ PartSet_WidgetSketchLabel::PartSet_WidgetSketchLabel(QWidget* theParent, mySizeOfView->setValidator(aValidator); aSizeLayout->addWidget(mySizeOfView); - QString aText = QString::fromStdString(theData->getProperty("title")); + myPartSetMessage = new QDialog(this, Qt::ToolTip); + myPartSetMessage->setModal(false); + myPartSetMessage->setStyleSheet("background-color:lightyellow;"); + QVBoxLayout* aMsgLay = new QVBoxLayout(myPartSetMessage); + QString aMsg = tr("The Sketch is created in PartSet.\n" + "It will be necessary to create a Part in order to use this sketch for body creation"); + aMsgLay->addWidget(new QLabel(aMsg, myPartSetMessage)); + myPartSetMessage->hide(); + + mySizeMessage = new QDialog(mySizeOfView, Qt::ToolTip); + mySizeMessage->setModal(false); + mySizeMessage->setStyleSheet("background-color:lightyellow;"); + aMsgLay = new QVBoxLayout(mySizeMessage); + aMsg = tr("A size of Sketch view can be defined here."); + aMsgLay->addWidget(new QLabel(aMsg, mySizeMessage)); + mySizeMessage->hide(); + + QString aText = translate(theData->getProperty("title")); QLabel* aLabel = new QLabel(aText, aFirstWgt); aLabel->setWordWrap(true); - QString aTooltip = QString::fromStdString(theData->getProperty("tooltip")); + QString aTooltip = translate(theData->getProperty("tooltip")); aLabel->setToolTip(aTooltip); aLabel->setIndent(5); @@ -120,6 +142,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); @@ -160,6 +188,28 @@ 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); + + myAutoConstraints = new QCheckBox(tr("Automatic constraints"), this); + myAutoConstraints->setToolTip(tr("Automatic vertical and horizontal constraints")); + connect(myAutoConstraints, SIGNAL(toggled(bool)), this, SIGNAL(autoConstraints(bool))); + aLayout->addWidget(myAutoConstraints); + + QPushButton* aPlaneBtn = new QPushButton(tr("Change sketch plane"), aSecondWgt); + connect(aPlaneBtn, SIGNAL(clicked(bool)), SLOT(onChangePlane())); + aLayout->addWidget(aPlaneBtn); + + aLayout->addSpacing(15); + + myDoFLabel = new QLabel("", aSecondWgt); + aLayout->addWidget(myDoFLabel); + + myShowDOFBtn = new QPushButton(tr("Show remaining DoFs"), aSecondWgt); + aLayout->addWidget(myShowDOFBtn); + myShowDOFBtn->setEnabled(false); + connect(myShowDOFBtn, SIGNAL(clicked(bool)), SLOT(onShowDOF())); myStackWidget->addWidget(aSecondWgt); //setLayout(aLayout); @@ -270,8 +320,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; @@ -279,6 +332,13 @@ bool PartSet_WidgetSketchLabel::setSelectionInternal( void PartSet_WidgetSketchLabel::updateByPlaneSelected(const ModuleBase_ViewerPrsPtr& thePrs) { + GeomPlanePtr aPlane = plane(); + if (!aPlane.get()) + return; + + myPartSetMessage->hide(); + mySizeMessage->hide(); + // 1. hide main planes if they have been displayed and display sketch preview plane myPreviewPlanes->erasePreviewPlanes(myWorkshop); @@ -294,69 +354,39 @@ void PartSet_WidgetSketchLabel::updateByPlaneSelected(const ModuleBase_ViewerPrs isSetSizeOfView = false; } } - if (isSetSizeOfView) - aModule->sketchMgr()->previewSketchPlane()->setSizeOfView(aSizeOfView, true); + aModule->sketchMgr()->previewSketchPlane()->setSizeOfView(aSizeOfView, isSetSizeOfView); aModule->sketchMgr()->previewSketchPlane()->createSketchPlane(aSketch, myWorkshop); - if (isSetSizeOfView) - aModule->sketchMgr()->previewSketchPlane()->setSizeOfView(aSizeOfView, false); } // 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; - } - else { // selection happens in OCC viewer(on body) of in the OB browser - if (aSelAttr) { - aGShape = aSelAttr->value(); - } + // 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); } - // If the selected object is a sketch then use its plane - std::shared_ptr aPlane; - ObjectPtr aObj = thePrs->object(); - // obsolete as selected sketch is stored in external attribute - /*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); - } - 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); @@ -372,12 +402,17 @@ void PartSet_WidgetSketchLabel::updateByPlaneSelected(const ModuleBase_ViewerPrs myWorkshop->selectionActivate()->updateSelectionFilters(); myWorkshop->selectionActivate()->updateSelectionModes(); + if (aModule) + aModule->onViewTransformed(); + // 6. Update sketcher actions XGUI_ActionsMgr* anActMgr = aWorkshop->actionsMgr(); myWorkshop->updateCommandStatus(); aWorkshop->selector()->clearSelection(); myWorkshop->viewer()->update(); + + myRemoveExternal->setVisible(false); } std::shared_ptr PartSet_WidgetSketchLabel::plane() const @@ -420,6 +455,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); } @@ -460,39 +500,61 @@ 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()); 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; } void PartSet_WidgetSketchLabel::activateCustom() { + PartSet_Module* aModule = dynamic_cast(myWorkshop->module()); + if (aModule) { + bool isBlocked = myAutoConstraints->blockSignals(true); + myAutoConstraints->setChecked(aModule->sketchReentranceMgr()->isAutoConstraints()); + myAutoConstraints->blockSignals(isBlocked); + } + std::shared_ptr aPlane = plane(); if (aPlane.get()) { myStackWidget->setCurrentIndex(1); @@ -516,6 +578,30 @@ void PartSet_WidgetSketchLabel::activateCustom() mySizeOfViewWidget->setVisible(false); } +void PartSet_WidgetSketchLabel::showEvent(QShowEvent* theEvent) +{ + ModuleBase_WidgetValidated::showEvent(theEvent); + QTimer::singleShot(10, this, SLOT(onShowPanel())); +} + +void PartSet_WidgetSketchLabel::onShowPanel() +{ + //if (mySizeOfViewWidget->isVisible()) { + if (myStackWidget->currentIndex() == 0) { + DocumentPtr aDoc = feature()->document(); + DocumentPtr aModDoc = ModelAPI_Session::get()->moduleDocument(); + if (aModDoc == aDoc) { + myPartSetMessage->move(mapToGlobal(geometry().bottomLeft())); + myPartSetMessage->show(); + } + if (mySizeOfViewWidget->isVisible()) { + QPoint aPnt = mySizeOfView->mapToGlobal(mySizeOfView->geometry().center()); + mySizeMessage->move(aPnt); + mySizeMessage->show(); + } + } +} + void PartSet_WidgetSketchLabel::deactivate() { ModuleBase_WidgetValidated::deactivate(); @@ -524,22 +610,30 @@ void PartSet_WidgetSketchLabel::deactivate() if (aHidePreview) myWorkshop->viewer()->update(); + + if (myOpenTransaction) { + SessionPtr aMgr = ModelAPI_Session::get(); + aMgr->finishOperation(); + myOpenTransaction = false; + } } -void PartSet_WidgetSketchLabel::selectionModes(QIntList& theModes, bool& isAdditional) +void PartSet_WidgetSketchLabel::selectionModes(int& theModuleSelectionModes, QIntList& theModes) { + theModuleSelectionModes = -1; std::shared_ptr aPlane = plane(); if (!aPlane.get()) theModes << TopAbs_FACE; - isAdditional = true; } -void PartSet_WidgetSketchLabel::selectionFilters(SelectMgr_ListOfFilter& theSelectionFilters) +void PartSet_WidgetSketchLabel::selectionFilters(QIntList& theModuleSelectionFilters, + SelectMgr_ListOfFilter& theSelectionFilters) { std::shared_ptr aPlane = plane(); if (aPlane.get()) return; - return ModuleBase_WidgetValidated::selectionFilters(theSelectionFilters); + return ModuleBase_WidgetValidated::selectionFilters(theModuleSelectionFilters, + theSelectionFilters); } std::shared_ptr @@ -653,3 +747,88 @@ QList> PartSet_WidgetSketchLabel::findCirc } return aResult; } + +//****************************************************** +void PartSet_WidgetSketchLabel::onChangePlane() +{ + PartSet_Module* aModule = dynamic_cast(myWorkshop->module()); + if (aModule) { + mySizeOfViewWidget->setVisible(false); + myRemoveExternal->setVisible(true); + myStackWidget->setCurrentIndex(0); + + bool aBodyIsVisualized = myPreviewPlanes->hasVisualizedBodies(myWorkshop); + + if (!aBodyIsVisualized) { + // We have to select a plane before any operation + myPreviewPlanes->showPreviewPlanes(myWorkshop); + } + + 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; + myWorkshop->viewer()->update(); + } +} + +void PartSet_WidgetSketchLabel::setShowPointsState(bool theState) +{ + bool aBlock = myShowPoints->blockSignals(true); + myShowPoints->setChecked(theState); + myShowPoints->blockSignals(aBlock); +} + +bool PartSet_WidgetSketchLabel::restoreValueCustom() +{ + if (myFeature.get()) { + CompositeFeaturePtr aSketch = std::dynamic_pointer_cast(myFeature); + if (aSketch.get() && (aSketch->numberOfSubs() > 0)) { + AttributeStringPtr aDOFStr = aSketch->string("SolverDOF"); + if (aDOFStr.get()) { + QString aVal(aDOFStr->value().c_str()); + if (aVal.contains('=')) { + // to support old data + aVal = aVal.right(aVal.length() - aVal.lastIndexOf('=')); + } + int aDoF = aVal.toInt(); + if (aDoF == 0) { + myDoFLabel->setText(tr("Sketch is fully fixed (DoF = 0)")); + myShowDOFBtn->setEnabled(false); + } else { + myDoFLabel->setText(tr("DoF (degrees of freedom) = ") + aVal); + myShowDOFBtn->setEnabled(true); + } + } + } + else { + myDoFLabel->setText(""); + myShowDOFBtn->setEnabled(false); + } + } + return true; +} + + +void PartSet_WidgetSketchLabel::onShowDOF() +{ + CompositeFeaturePtr aCompFeature = + std::dynamic_pointer_cast(myFeature); + if (aCompFeature.get()) { + static const Events_ID anEvent = Events_Loop::eventByName(EVENT_GET_DOF_OBJECTS); + ModelAPI_EventCreator::get()->sendUpdated(aCompFeature, anEvent); + Events_Loop::loop()->flush(anEvent); + } +}