X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_WidgetSketchLabel.cpp;h=e4df553d7cbe92289ce95475453f4205dde148df;hb=f39b615e10f48ab13b8346c1e0b4c64500d44f51;hp=239aeb75ad18beec5d7b656c7b4f61110cf63136;hpb=d5c0128fc1e984053a2c50e1937a6c8998d76d1e;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_WidgetSketchLabel.cpp b/src/PartSet/PartSet_WidgetSketchLabel.cpp index 239aeb75a..e4df553d7 100644 --- a/src/PartSet/PartSet_WidgetSketchLabel.cpp +++ b/src/PartSet/PartSet_WidgetSketchLabel.cpp @@ -15,6 +15,7 @@ #include #include #include +#include #include #include @@ -25,6 +26,7 @@ #include #include +#include #include #include #include @@ -43,19 +45,18 @@ #include #include -//#include #include #include #include PartSet_WidgetSketchLabel::PartSet_WidgetSketchLabel(QWidget* theParent, + ModuleBase_IWorkshop* theWorkshop, const Config_WidgetAPI* theData, const std::string& theParentId, bool toShowConstraints) - : ModuleBase_WidgetValidated(theParent, theData, theParentId), - myPreviewDisplayed(false), - myWorkshop(NULL) +: ModuleBase_WidgetValidated(theParent, theWorkshop, theData, theParentId), + myPreviewDisplayed(false) { myText = QString::fromStdString(theData->getProperty("title")); myLabel = new QLabel("", theParent); @@ -64,10 +65,6 @@ PartSet_WidgetSketchLabel::PartSet_WidgetSketchLabel(QWidget* theParent, myLabel->setToolTip(""); myLabel->setIndent(5); - //mySelectionTimer = new QTimer(this); - //connect(mySelectionTimer, SIGNAL(timeout()), SLOT(setSketchingMode())); - //mySelectionTimer->setSingleShot(true); - QVBoxLayout* aLayout = new QVBoxLayout(this); ModuleBase_Tools::zeroMargins(aLayout); aLayout->addWidget(myLabel); @@ -82,7 +79,23 @@ PartSet_WidgetSketchLabel::PartSet_WidgetSketchLabel(QWidget* theParent, PartSet_WidgetSketchLabel::~PartSet_WidgetSketchLabel() { - erasePreviewPlanes(); +} + +bool PartSet_WidgetSketchLabel::setSelection(QList& theValues, + const bool theToValidate) +{ + // do not use the given selection if the plane of the sketch has been already set. + // If this check is absent, a selected plane in the viewer can be set in the sketch + // even if the sketch is built on another plane. + if (plane().get()) + return true; + + ModuleBase_ViewerPrs aPrs = theValues.first(); + bool aDone = ModuleBase_WidgetValidated::setSelection(theValues, theToValidate); + if (aDone) + updateByPlaneSelected(aPrs); + + return aDone; } QList PartSet_WidgetSketchLabel::getControls() const @@ -94,30 +107,42 @@ QList PartSet_WidgetSketchLabel::getControls() const void PartSet_WidgetSketchLabel::onSelectionChanged() { - QList aSelectedPrs = getSelectedEntitiesOrObjects( - myWorkshop->selector()->selection()); - if (aSelectedPrs.empty()) - return; - ModuleBase_ViewerPrs aPrs = aSelectedPrs.first(); - if (aPrs.isEmpty() || !isValidSelection(aPrs)) + QList aSelected = getFilteredSelected(); + + if (aSelected.empty()) return; + ModuleBase_ViewerPrs aPrs = aSelected.first(); + + bool aDone = ModuleBase_WidgetValidated::setSelection(aSelected, false); + if (aDone) { + updateByPlaneSelected(aPrs); + updateObject(myFeature); + } +} - // 2. set the selection to sketch - setSelectionCustom(aPrs); - // 3. hide main planes if they have been displayed +void PartSet_WidgetSketchLabel::updateByPlaneSelected(const ModuleBase_ViewerPrs& thePrs) +{ + // 1. hide main planes if they have been displayed erasePreviewPlanes(); - // 4. if the planes were displayed, change the view projection - TopoDS_Shape aShape = aPrs.shape(); + // 2. if the planes were displayed, change the view projection + TopoDS_Shape aShape = thePrs.shape(); std::shared_ptr aGShape; + std::shared_ptr aBaseShape; + + DataPtr aData = feature()->data(); + AttributeSelectionPtr aSelAttr = std::dynamic_pointer_cast + (aData->attribute(SketchPlugin_SketchEntity::EXTERNAL_ID())); + // selection happens in OCC viewer if (!aShape.IsNull()) { - aGShape = std::shared_ptr(new GeomAPI_Shape); + aGShape = std::shared_ptr(new GeomAPI_Shape()); aGShape->setImpl(new TopoDS_Shape(aShape)); + + if (aSelAttr && aSelAttr->context()) { + aBaseShape = aSelAttr->context()->shape(); + } } else { // selection happens in OCC viewer(on body) of in the OB browser - DataPtr aData = feature()->data(); - AttributeSelectionPtr aSelAttr = std::dynamic_pointer_cast - (aData->attribute(SketchPlugin_SketchEntity::EXTERNAL_ID())); if (aSelAttr) { aGShape = aSelAttr->value(); } @@ -126,25 +151,35 @@ void PartSet_WidgetSketchLabel::onSelectionChanged() // get plane parameters std::shared_ptr aPlane = GeomAlgoAPI_FaceBuilder::plane(aGShape); 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(); + }*/ - myWorkshop->viewer()->setViewProjection(aDir->x(), aDir->y(), aDir->z()); + myWorkshop->viewer()->setViewProjection(aXYZ.X(), aXYZ.Y(), aXYZ.Z(), aTwist); } - // 5. Clear text in the label + // 3. Clear text in the label myLabel->setText(""); myLabel->setToolTip(""); - disconnect(myWorkshop->selector(), SIGNAL(selectionChanged()), + disconnect(workshop()->selector(), SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged())); - // 6. deactivate face selection filter - activateFilters(myWorkshop->module()->workshop(), false); + // 4. deactivate face selection filter + activateFilters(false); - // 7. Clear selection mode and define sketching mode - //XGUI_Displayer* aDisp = myWorkshop->displayer(); + // 5. Clear selection mode and define sketching mode + //XGUI_Displayer* aDisp = workshop()->displayer(); //aDisp->closeLocalContexts(); emit planeSelected(plane()); - //setSketchingMode(); + // 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); - // 8. Update sketcher actions - XGUI_ActionsMgr* anActMgr = myWorkshop->actionsMgr(); + // 6. Update sketcher actions + XGUI_ActionsMgr* anActMgr = workshop()->actionsMgr(); anActMgr->update(); myWorkshop->viewer()->update(); } @@ -153,7 +188,6 @@ std::shared_ptr PartSet_WidgetSketchLabel::plane() const { CompositeFeaturePtr aSketch = std::dynamic_pointer_cast(myFeature); return PartSet_Tools::sketchPlane(aSketch); - } bool PartSet_WidgetSketchLabel::focusTo() @@ -169,10 +203,13 @@ void PartSet_WidgetSketchLabel::enableFocusProcessing() void PartSet_WidgetSketchLabel::storeAttributeValue() { + ModuleBase_WidgetValidated::storeAttributeValue(); } void PartSet_WidgetSketchLabel::restoreAttributeValue(const bool theValid) { + ModuleBase_WidgetValidated::restoreAttributeValue(theValid); + // it is not necessary to save the previous plane value because the plane is chosen once DataPtr aData = feature()->data(); AttributeSelectionPtr aSelAttr = std::dynamic_pointer_cast @@ -215,7 +252,7 @@ bool PartSet_WidgetSketchLabel::setSelectionCustom(const ModuleBase_ViewerPrs& t } else if (!aShape.IsNull()) { aDir = setSketchPlane(aShape); - isOwnerSet = aDir; + isOwnerSet = aDir.get(); } return isOwnerSet; } @@ -223,11 +260,13 @@ bool PartSet_WidgetSketchLabel::setSelectionCustom(const ModuleBase_ViewerPrs& t void PartSet_WidgetSketchLabel::activateCustom() { std::shared_ptr aPlane = plane(); - if (aPlane.get()) + if (aPlane.get()) { + activateSelection(true); return; + } bool aBodyIsVisualized = false; - XGUI_Displayer* aDisp = myWorkshop->displayer(); + XGUI_Displayer* aDisp = workshop()->displayer(); QObjectPtrList aDisplayed = aDisp->displayedObjects(); foreach (ObjectPtr anObj, aDisplayed) { ResultPtr aResult = std::dynamic_pointer_cast(anObj); @@ -242,33 +281,46 @@ void PartSet_WidgetSketchLabel::activateCustom() // We have to select a plane before any operation showPreviewPlanes(); } - QIntList aModes; - aModes << TopAbs_FACE; - aDisp->activateObjects(aModes); + activateSelection(true); myLabel->setText(myText); myLabel->setToolTip(myTooltip); - connect(myWorkshop->selector(), SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged())); - activateFilters(myWorkshop->module()->workshop(), true); + connect(workshop()->selector(), SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged())); + activateFilters(true); aDisp->updateViewer(); } void PartSet_WidgetSketchLabel::deactivate() { - // Do not set selection mode if the widget was activated for a small moment - //mySelectionTimer->stop(); - //XGUI_Displayer* aDisp = myWorkshop->displayer(); - //aDisp->closeLocalContexts(); erasePreviewPlanes(); - activateFilters(myWorkshop->module()->workshop(), false); + activateSelection(false); + + activateFilters(false); +} + +void PartSet_WidgetSketchLabel::activateSelection(bool toActivate) +{ + 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(); + } } void PartSet_WidgetSketchLabel::erasePreviewPlanes() { if (myPreviewDisplayed) { - XGUI_Displayer* aDisp = myWorkshop->displayer(); + XGUI_Displayer* aDisp = workshop()->displayer(); aDisp->eraseAIS(myYZPlane, false); aDisp->eraseAIS(myXZPlane, false); aDisp->eraseAIS(myXYPlane, false); @@ -285,7 +337,8 @@ void PartSet_WidgetSketchLabel::showPreviewPlanes() // Create Preview std::shared_ptr anOrigin(new GeomAPI_Pnt(0, 0, 0)); std::shared_ptr aYZDir(new GeomAPI_Dir(1, 0, 0)); - std::shared_ptr aXZDir(new GeomAPI_Dir(0, 1, 0)); + // -1, not 1 for correct internal sketch coords (issue 898) + std::shared_ptr aXZDir(new GeomAPI_Dir(0, -1, 0)); std::shared_ptr aXYDir(new GeomAPI_Dir(0, 0, 1)); std::vector aYZRGB, aXZRGB, aXYRGB; @@ -303,10 +356,10 @@ void PartSet_WidgetSketchLabel::showPreviewPlanes() myXZPlane = createPreviewPlane(anOrigin, aXZDir, aG); myXYPlane = createPreviewPlane(anOrigin, aXYDir, aB); } - XGUI_Displayer* aDisp = myWorkshop->displayer(); - aDisp->displayAIS(myYZPlane, false); - aDisp->displayAIS(myXZPlane, false); - aDisp->displayAIS(myXYPlane, false); + XGUI_Displayer* aDisp = workshop()->displayer(); + aDisp->displayAIS(myYZPlane, true, false); + aDisp->displayAIS(myXZPlane, true, false); + aDisp->displayAIS(myXYPlane, true, false); myPreviewDisplayed = true; } @@ -334,6 +387,8 @@ std::shared_ptr PartSet_WidgetSketchLabel::setSketchPlane(const Top std::shared_ptr aGShape(new GeomAPI_Shape); aGShape->setImpl(new TopoDS_Shape(theShape)); + + // get plane parameters std::shared_ptr aPlane = GeomAlgoAPI_FaceBuilder::plane(aGShape); @@ -369,28 +424,14 @@ std::shared_ptr PartSet_WidgetSketchLabel::setSketchPlane(const Top return aDir; } - -/*void PartSet_WidgetSketchLabel::setSketchingMode() -{ - XGUI_Displayer* aDisp = myWorkshop->displayer(); - // Clear standard selection modes if they are defined - //aDisp->activateObjects(aModes); - //aDisp->openLocalContext(); - - // Get default selection modes - - QIntList aModes; - aModes.append(SketcherPrs_Tools::Sel_Dimension_Text); - aModes.append(SketcherPrs_Tools::Sel_Dimension_Line); - aModes.append(SketcherPrs_Tools::Sel_Constraint); - aModes.append(AIS_Shape::SelectionMode((TopAbs_ShapeEnum) TopAbs_VERTEX)); - aModes.append(AIS_Shape::SelectionMode((TopAbs_ShapeEnum) TopAbs_EDGE)); - - aDisp->activateObjects(aModes); -}*/ - void PartSet_WidgetSketchLabel::showConstraints(bool theOn) { myShowConstraints->setChecked(theOn); emit showConstraintToggled(theOn); } + +XGUI_Workshop* PartSet_WidgetSketchLabel::workshop() const +{ + XGUI_ModuleConnector* aConnector = dynamic_cast(myWorkshop); + return aConnector->workshop(); +}