X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FPartSet%2FPartSet_WidgetSketchLabel.cpp;h=54a8250ffa48340e52e0725b6c34df23700cce13;hb=3b02241a66e6be241eebbe70df42349293c5f4ab;hp=242773ea366dc27977e591f58d7e1a1237903abc;hpb=2cb130f1bba2bb8dba6f2c053963d126860805f4;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_WidgetSketchLabel.cpp b/src/PartSet/PartSet_WidgetSketchLabel.cpp index 242773ea3..54a8250ff 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-2022 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 @@ -63,7 +63,6 @@ #include #include #include -#include #include #include @@ -81,6 +80,10 @@ #include #include +#ifdef WIN32 +#pragma warning(disable : 4456) // for nested foreach +#endif + #ifndef DBL_MAX #define DBL_MAX 1.7976931348623158e+308 #endif @@ -158,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); @@ -313,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; } @@ -346,20 +363,23 @@ void PartSet_WidgetSketchLabel::updateByPlaneSelected(const ModuleBase_ViewerPrs // 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 @@ -373,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) { @@ -409,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(); @@ -489,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(); @@ -543,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; } @@ -742,7 +752,7 @@ void PartSet_WidgetSketchLabel::onSetPlaneView() //****************************************************** -QList> PartSet_WidgetSketchLabel::findCircularEdgesInPlane() +QList PartSet_WidgetSketchLabel::findCircularEdgesInPlane() { QList> aResult; XGUI_Workshop* aWorkshop = XGUI_Tools::workshop(myWorkshop); @@ -764,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; @@ -772,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); } } @@ -867,6 +876,8 @@ 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(); @@ -887,4 +898,21 @@ bool PartSet_WidgetSketchLabel::eventFilter(QObject* theObj, QEvent* theEvent) onShowPanel(); } return ModuleBase_WidgetValidated::eventFilter(theObj, theEvent); -} \ No newline at end of file +} + +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(); +}