X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_WidgetSketchLabel.cpp;h=14c7fbe576df29fc159cde3c618d86a771cc4900;hb=384c819a1edf4b726e3a523c1ffd2b5e6b16a4c0;hp=5464d078f641c9910a53557cee5a8a589a629c20;hpb=a94fc319f2aa64b43c9a73b5ff7063923648faec;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_WidgetSketchLabel.cpp b/src/PartSet/PartSet_WidgetSketchLabel.cpp index 5464d078f..14c7fbe57 100644 --- a/src/PartSet/PartSet_WidgetSketchLabel.cpp +++ b/src/PartSet/PartSet_WidgetSketchLabel.cpp @@ -25,23 +25,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 @@ -193,18 +194,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) @@ -272,95 +279,72 @@ 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); - // 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())); - // 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(); - } - } - // 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); + 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; } } + if (isSetSizeOfView) + aModule->sketchMgr()->previewSketchPlane()->setSizeOfView(aSizeOfView, true); + aModule->sketchMgr()->previewSketchPlane()->createSketchPlane(aSketch, myWorkshop); + if (isSetSizeOfView) + aModule->sketchMgr()->previewSketchPlane()->setSizeOfView(aSizeOfView, 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); - } + // 2. if the planes were displayed, change the view projection + + std::shared_ptr aDir = aPlane->direction(); + gp_XYZ aXYZ = aDir->impl().XYZ(); + double aTwist = 0.0; + + // 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 (aModule) + aModule->onViewTransformed(); + // 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(); // 6. Update sketcher actions XGUI_ActionsMgr* anActMgr = aWorkshop->actionsMgr(); @@ -450,45 +434,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; } @@ -497,7 +485,6 @@ void PartSet_WidgetSketchLabel::activateCustom() std::shared_ptr aPlane = plane(); if (aPlane.get()) { myStackWidget->setCurrentIndex(1); - activateSelection(true); return; } @@ -507,7 +494,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 @@ -516,46 +503,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()) { - //QList> aEdges = findCircularEdgesInPlane(); - //foreach(std::shared_ptr aPrs, aEdges) { - //} - 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)