X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_WidgetSketchLabel.cpp;h=4a5edfa01266b8b6093f1fb59bbbf450bf1e9feb;hb=06e7f5859095193fc7f498bd89a7d28009794f53;hp=2ba13e6bd49603d358cc91df161154b9997cddb8;hpb=d588149317acbc2bd8e6ceb00f8e82e806571775;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_WidgetSketchLabel.cpp b/src/PartSet/PartSet_WidgetSketchLabel.cpp index 2ba13e6bd..4a5edfa01 100644 --- a/src/PartSet/PartSet_WidgetSketchLabel.cpp +++ b/src/PartSet/PartSet_WidgetSketchLabel.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2019 CEA/DEN, EDF R&D +// Copyright (C) 2014-2023 CEA, EDF // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -63,7 +63,6 @@ #include #include #include -#include #include #include @@ -76,9 +75,14 @@ #include #include #include -#include #include #include +#include +#include + +#ifdef WIN32 +#pragma warning(disable : 4456) // for nested foreach +#endif #ifndef DBL_MAX #define DBL_MAX 1.7976931348623158e+308 @@ -113,6 +117,23 @@ myIsSelection(false) mySizeOfView->setValidator(aValidator); aSizeLayout->addWidget(mySizeOfView); + 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); @@ -140,15 +161,29 @@ myIsSelection(false) ModuleBase_Tools::zeroMargins(aLayout); QGroupBox* aViewBox = new QGroupBox(tr("Sketcher plane"), this); - QVBoxLayout* aViewLayout = new QVBoxLayout(aViewBox); + QGridLayout* aViewLayout = new QGridLayout(aViewBox); myViewInverted = new QCheckBox(tr("Reversed"), aViewBox); - aViewLayout->addWidget(myViewInverted); + aViewLayout->addWidget(myViewInverted, 0, 0); + + // Sketch plane visibility + myViewVisible = new QCheckBox(tr("Visible"), aViewBox); + PartSet_Module* aModule = dynamic_cast(myWorkshop->module()); + PartSet_PreviewSketchPlane* aPreviewPlane = aModule->sketchMgr()->previewSketchPlane(); + if (aPreviewPlane->isPlaneCreated()) + // init with current state + myViewVisible->setChecked(aPreviewPlane->isDisplayed()); + else + // true by default (at start of sketch creation) + myViewVisible->setChecked(true); + + aViewLayout->addWidget(myViewVisible, 0, 1, Qt::AlignRight); + connect(myViewVisible, SIGNAL(toggled(bool)), this, SLOT(onShowViewPlane(bool))); QPushButton* aSetViewBtn = new QPushButton(QIcon(":icons/plane_view.png"), tr("Set plane view"), aViewBox); connect(aSetViewBtn, SIGNAL(clicked(bool)), this, SLOT(onSetPlaneView())); - aViewLayout->addWidget(aSetViewBtn); + aViewLayout->addWidget(aSetViewBtn, 1, 0, 1, 2); aLayout->addWidget(aViewBox); @@ -295,7 +330,7 @@ bool PartSet_WidgetSketchLabel::setSelectionInternal( bool aDone = false; if (theValues.empty()) { // In order to make reselection possible, set empty object and shape should be done - setSelectionCustom(std::shared_ptr( + setSelectionCustom(ModuleBase_ViewerPrsPtr( new ModuleBase_ViewerPrs(ObjectPtr(), GeomShapePtr(), NULL))); aDone = false; } @@ -314,26 +349,37 @@ bool PartSet_WidgetSketchLabel::setSelectionInternal( void PartSet_WidgetSketchLabel::updateByPlaneSelected(const ModuleBase_ViewerPrsPtr& thePrs) { + // Nullify a temporary remembered plane + if (myTmpPlane.get()) + myTmpPlane.reset(); + 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); + QString aSizeOfViewStr = mySizeOfView->text(); + bool isSetSizeOfView = false; + double aSizeOfView = 0; + if (!aSizeOfViewStr.isEmpty()) { + aSizeOfView = aSizeOfViewStr.toDouble(&isSetSizeOfView); + if (isSetSizeOfView && aSizeOfView <= 0) { + isSetSizeOfView = false; + } + } 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); + if (myViewVisible->isChecked()) + aModule->sketchMgr()->previewSketchPlane()->createSketchPlane(aSketch, myWorkshop); + else + aModule->sketchMgr()->previewSketchPlane()->clearPlanePreview(); } // 2. if the planes were displayed, change the view projection @@ -347,18 +393,13 @@ void PartSet_WidgetSketchLabel::updateByPlaneSelected(const ModuleBase_ViewerPrs 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); - } + if (isSetSizeOfView && 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 (myOpenTransaction) { @@ -383,9 +424,6 @@ void PartSet_WidgetSketchLabel::updateByPlaneSelected(const ModuleBase_ViewerPrs if (aModule) aModule->onViewTransformed(); - // 6. Update sketcher actions - XGUI_ActionsMgr* anActMgr = aWorkshop->actionsMgr(); - myWorkshop->updateCommandStatus(); aWorkshop->selector()->clearSelection(); myWorkshop->viewer()->update(); @@ -429,6 +467,15 @@ void PartSet_WidgetSketchLabel::restoreAttributeValue(const AttributePtr& theAtt GeomShapePtr anEmptyShape; aSelAttr->setValue(anEmptyResult, anEmptyShape); } + std::shared_ptr anOrigin = std::dynamic_pointer_cast( + aData->attribute(SketchPlugin_Sketch::ORIGIN_ID())); + anOrigin->reset(); + std::shared_ptr aNormal = std::dynamic_pointer_cast( + aData->attribute(SketchPlugin_Sketch::NORM_ID())); + aNormal->reset(); + std::shared_ptr aDirX = std::dynamic_pointer_cast( + aData->attribute(SketchPlugin_Sketch::DIRX_ID())); + aDirX->reset(); } bool PartSet_WidgetSketchLabel::setSelectionCustom(const ModuleBase_ViewerPrsPtr& thePrs) @@ -454,8 +501,6 @@ bool PartSet_WidgetSketchLabel::canFillSketch(const ModuleBase_ViewerPrsPtr& the } // check plane or planar face of any non-sketch object if (aCanFillSketch) { - std::shared_ptr aGeomFace; - GeomShapePtr aGeomShape = thePrs->shape(); if ((!aGeomShape.get() || aGeomShape->isNull()) && aResult.get()) { aGeomShape = aResult->shape(); @@ -508,13 +553,13 @@ bool PartSet_WidgetSketchLabel::fillSketchPlaneBySelection(const ModuleBase_View } else { aSelAttr->setValue(aFeature, GeomShapePtr()); - GeomShapePtr aShape = aSelAttr->value(); - if (!aShape.get() && aSelAttr->contextFeature().get() && + GeomShapePtr aSelShape = aSelAttr->value(); + if (!aSelShape.get() && aSelAttr->contextFeature().get() && aSelAttr->contextFeature()->firstResult().get()) { - aShape = aSelAttr->contextFeature()->firstResult()->shape(); + aSelShape = aSelAttr->contextFeature()->firstResult()->shape(); } - if (aShape.get() && aShape->isPlanar()) { - const TopoDS_Shape& aTDShape = aShape->impl(); + if (aSelShape.get() && aSelShape->isPlanar()) { + const TopoDS_Shape& aTDShape = aSelShape->impl(); setSketchPlane(aTDShape); isOwnerSet = true; } @@ -526,6 +571,10 @@ bool PartSet_WidgetSketchLabel::fillSketchPlaneBySelection(const ModuleBase_View void PartSet_WidgetSketchLabel::activateCustom() { + QWidget* aTopWidget = window(); + if (aTopWidget) + aTopWidget->installEventFilter(this); + PartSet_Module* aModule = dynamic_cast(myWorkshop->module()); if (aModule) { bool isBlocked = myAutoConstraints->blockSignals(true); @@ -556,8 +605,51 @@ 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::hideEvent(QHideEvent* theEvent) +{ + ModuleBase_WidgetValidated::hideEvent(theEvent); + if (myPartSetMessage->isVisible()) + myPartSetMessage->hide(); + if (mySizeMessage->isVisible()) + mySizeMessage->hide(); +} + + +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() { + QWidget* aTopWidget = window(); + if (aTopWidget) + aTopWidget->removeEventFilter(this); + + if (myTmpPlane.get()) { + setSketchPlane(myTmpPlane); + myTmpPlane.reset(); + } + ModuleBase_WidgetValidated::deactivate(); bool aHidePreview = myPreviewPlanes->isPreviewDisplayed(); myPreviewPlanes->erasePreviewPlanes(myWorkshop); @@ -660,7 +752,7 @@ void PartSet_WidgetSketchLabel::onSetPlaneView() //****************************************************** -QList> PartSet_WidgetSketchLabel::findCircularEdgesInPlane() +QList PartSet_WidgetSketchLabel::findCircularEdgesInPlane() { QList> aResult; XGUI_Workshop* aWorkshop = XGUI_Tools::workshop(myWorkshop); @@ -682,7 +774,7 @@ QList> PartSet_WidgetSketchLabel::findCirc 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) { + foreach(ModuleBase_ViewerPrsPtr aPrs, aResult) { GeomAPI_Edge aUsedEdge(aPrs->shape()); if (aUsedEdge.isEqual(aEdgeShape)) { isContains = true; @@ -690,8 +782,7 @@ QList> PartSet_WidgetSketchLabel::findCirc } } if (!isContains) { - std::shared_ptr - aPrs(new ModuleBase_ViewerPrs(aResObj, aEdgeShape)); + ModuleBase_ViewerPrsPtr aPrs(new ModuleBase_ViewerPrs(aResObj, aEdgeShape)); aResult.append(aPrs); } } @@ -719,6 +810,7 @@ void PartSet_WidgetSketchLabel::onChangePlane() } CompositeFeaturePtr aSketch = std::dynamic_pointer_cast(myFeature); + myTmpPlane = PartSet_Tools::sketchPlane(aSketch); PartSet_Tools::nullifySketchPlane(aSketch); Handle(SelectMgr_Filter) aFilter = aModule->selectionFilter(SF_SketchPlaneFilter); @@ -784,5 +876,43 @@ void PartSet_WidgetSketchLabel::onShowDOF() static const Events_ID anEvent = Events_Loop::eventByName(EVENT_GET_DOF_OBJECTS); ModelAPI_EventCreator::get()->sendUpdated(aCompFeature, anEvent); Events_Loop::loop()->flush(anEvent); + + // Transfer focus to the current viewport for correct processing of a key event + QWidget* aViewPort = myWorkshop->viewer()->activeViewPort(); + if (aViewPort) + aViewPort->setFocus(); } } + +bool PartSet_WidgetSketchLabel::eventFilter(QObject* theObj, QEvent* theEvent) +{ + if (theObj == window()) { + int aType = theEvent->type(); + if ((aType == QEvent::Hide) || (aType == QEvent::WindowDeactivate)) { + if (myPartSetMessage->isVisible()) + myPartSetMessage->hide(); + if (mySizeMessage->isVisible()) + mySizeMessage->hide(); + } + else if ((aType == QEvent::Show) || (aType == QEvent::WindowActivate)) + onShowPanel(); + } + return ModuleBase_WidgetValidated::eventFilter(theObj, theEvent); +} + +void PartSet_WidgetSketchLabel::onShowViewPlane(bool toShow) +{ + PartSet_Module* aModule = dynamic_cast(myWorkshop->module()); + PartSet_PreviewSketchPlane* aPreviewPlane = aModule->sketchMgr()->previewSketchPlane(); + if (toShow) { + CompositeFeaturePtr aSketch = std::dynamic_pointer_cast(myFeature); + if (aPreviewPlane->isPlaneCreated()) + aPreviewPlane->displaySketchPlane(myWorkshop); + else + aPreviewPlane->createSketchPlane(aSketch, myWorkshop); + } + else { + aPreviewPlane->eraseSketchPlane(myWorkshop, false); + } + myWorkshop->viewer()->update(); +}