X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_WidgetSketchLabel.cpp;h=b8c78602c9726a482baac5d078488197c274f0e8;hb=031179ada6681b874314c450eeda806f9f8abd28;hp=5570182990f55b7a8ff0fab76f7f4f73bf630ebb;hpb=fd4dd622a85a0dd19ff5616391f94e980abc26a1;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_WidgetSketchLabel.cpp b/src/PartSet/PartSet_WidgetSketchLabel.cpp index 557018299..b8c78602c 100644 --- a/src/PartSet/PartSet_WidgetSketchLabel.cpp +++ b/src/PartSet/PartSet_WidgetSketchLabel.cpp @@ -6,6 +6,7 @@ #include "PartSet_WidgetSketchLabel.h" #include "PartSet_Tools.h" +#include "PartSet_Module.h" #include "SketchPlugin_SketchEntity.h" @@ -15,13 +16,18 @@ #include #include #include +#include #include #include #include #include +#include +#include + #include +#include #include #include #include @@ -40,131 +46,265 @@ #include #include -//#include #include #include #include +#include +#include +#include PartSet_WidgetSketchLabel::PartSet_WidgetSketchLabel(QWidget* theParent, - const Config_WidgetAPI* theData, - const std::string& theParentId, - bool toShowConstraints) - : ModuleBase_WidgetValidated(theParent, theData, theParentId), - myPreviewDisplayed(false), - myWorkshop(NULL) + ModuleBase_IWorkshop* theWorkshop, + const Config_WidgetAPI* theData, + const std::string& theParentId, + const QMap& toShowConstraints) +: ModuleBase_WidgetValidated(theParent, theWorkshop, theData, theParentId), + myPreviewDisplayed(false) { - myText = QString::fromStdString(theData->getProperty("title")); - myLabel = new QLabel("", theParent); - myLabel->setWordWrap(true); - myTooltip = QString::fromStdString(theData->getProperty("tooltip")); - myLabel->setToolTip(""); - myLabel->setIndent(5); + QVBoxLayout* aLayout = new QVBoxLayout(this); + ModuleBase_Tools::zeroMargins(aLayout); - //mySelectionTimer = new QTimer(this); - //connect(mySelectionTimer, SIGNAL(timeout()), SLOT(setSketchingMode())); - //mySelectionTimer->setSingleShot(true); + myStackWidget = new QStackedWidget(this); + myStackWidget->setContentsMargins(0,0,0,0); + aLayout->addWidget(myStackWidget); - QVBoxLayout* aLayout = new QVBoxLayout(this); + // Define label for plane selection + QWidget* aFirstWgt = new QWidget(this); + + QString aText = QString::fromStdString(theData->getProperty("title")); + QLabel* aLabel = new QLabel(aText, aFirstWgt); + aLabel->setWordWrap(true); + QString aTooltip = QString::fromStdString(theData->getProperty("tooltip")); + aLabel->setToolTip(aTooltip); + aLabel->setIndent(5); + + aLayout = new QVBoxLayout(aFirstWgt); ModuleBase_Tools::zeroMargins(aLayout); - aLayout->addWidget(myLabel); + aLayout->addWidget(aLabel); + + myStackWidget->addWidget(aFirstWgt); + + // Define widget for sketch manmagement + QWidget* aSecondWgt = new QWidget(this); + aLayout = new QVBoxLayout(aSecondWgt); + ModuleBase_Tools::zeroMargins(aLayout); + + QGroupBox* aViewBox = new QGroupBox(tr("Sketcher plane"), this); + QVBoxLayout* aViewLayout = new QVBoxLayout(aViewBox); + + myViewInverted = new QCheckBox(tr("Reversed"), aViewBox); + aViewLayout->addWidget(myViewInverted); - myShowConstraints = new QCheckBox(tr("Show constraints"), this); - aLayout->addWidget(myShowConstraints); + 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); - setLayout(aLayout); - connect(myShowConstraints, SIGNAL(toggled(bool)), this, SIGNAL(showConstraintToggled(bool))); - myShowConstraints->setChecked(toShowConstraints); + aLayout->addWidget(aViewBox); + + QMap aStates; + aStates[PartSet_Tools::Geometrical] = tr("Show geometrical constraints"); + aStates[PartSet_Tools::Dimensional] = tr("Show dimensional constraints"); + + QMap::const_iterator anIt = aStates.begin(), + aLast = aStates.end(); + for (; anIt != aLast; anIt++) { + QCheckBox* aShowConstraints = new QCheckBox(anIt.value(), this); + connect(aShowConstraints, SIGNAL(toggled(bool)), this, SLOT(onShowConstraint(bool))); + aLayout->addWidget(aShowConstraints); + + PartSet_Tools::ConstraintVisibleState aState = anIt.key(); + myShowConstraints[aState] = aShowConstraints; + + if (toShowConstraints.contains(aState)) + aShowConstraints->setChecked(toShowConstraints[aState]); + } + + myStackWidget->addWidget(aSecondWgt); + //setLayout(aLayout); } 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 { QList aResult; - aResult << myLabel; + aResult << myStackWidget; return aResult; } -void PartSet_WidgetSketchLabel::onPlaneSelected() +void PartSet_WidgetSketchLabel::onSelectionChanged() { + QList aSelected = getFilteredSelected(); - XGUI_Selection* aSelection = myWorkshop->selector()->selection(); - QList aSelected = aSelection->getSelected(); - if (!aSelected.empty()) { - ModuleBase_ViewerPrs aPrs = aSelected.first(); - Handle(SelectMgr_EntityOwner) anOwner = aSelected.first().owner(); - if (isValid(anOwner)) { - setSelection(anOwner); - - TopoDS_Shape aShape = aPrs.shape(); - if (!aShape.IsNull()) { - erasePreviewPlanes(); - DataPtr aData = feature()->data(); - AttributeSelectionPtr aSelAttr = std::dynamic_pointer_cast - (aData->attribute(SketchPlugin_SketchEntity::EXTERNAL_ID())); - if (aSelAttr) { - GeomShapePtr aShapePtr = aSelAttr->value(); - if (aShapePtr.get() == NULL || aShapePtr->isNull()) { - std::shared_ptr aGShape(new GeomAPI_Shape); - aGShape->setImpl(new TopoDS_Shape(aShape)); - // get plane parameters - std::shared_ptr aPlane = GeomAlgoAPI_FaceBuilder::plane(aGShape); - std::shared_ptr aDir = aPlane->direction(); - - myWorkshop->viewer()->setViewProjection(aDir->x(), aDir->y(), aDir->z()); - } - } + if (aSelected.empty()) + return; + ModuleBase_ViewerPrs aPrs = aSelected.first(); - // Clear text in the label - myLabel->setText(""); - myLabel->setToolTip(""); - disconnect(myWorkshop->selector(), SIGNAL(selectionChanged()), - this, SLOT(onPlaneSelected())); - activateFilters(myWorkshop->module()->workshop(), false); - - // Clear selection mode and define sketching mode - //XGUI_Displayer* aDisp = myWorkshop->displayer(); - //aDisp->closeLocalContexts(); - emit planeSelected(plane()); - //setSketchingMode(); - - // Update sketcher actions - XGUI_ActionsMgr* anActMgr = myWorkshop->actionsMgr(); - anActMgr->update(); - myWorkshop->viewer()->update(); - } + bool aDone = ModuleBase_WidgetValidated::setSelection(aSelected, false); + if (aDone) { + updateByPlaneSelected(aPrs); + updateObject(myFeature); + } +} + +void PartSet_WidgetSketchLabel::onShowConstraint(bool theOn) +{ + QCheckBox* aSenderCheckBox = qobject_cast(sender()); + + QMap::const_iterator + anIt = myShowConstraints.begin(), aLast = myShowConstraints.end(); + + PartSet_Tools::ConstraintVisibleState aState = PartSet_Tools::Geometrical; + bool aFound = false; + for (; anIt != aLast && !aFound; anIt++) { + aFound = anIt.value() == aSenderCheckBox; + if (aFound) + aState = anIt.key(); + } + if (aFound) + emit showConstraintToggled(theOn, aState); +} + +void PartSet_WidgetSketchLabel::blockAttribute(const bool& theToBlock, bool& isFlushesActived, + bool& isAttributeSetInitializedBlocked) +{ + ModuleBase_WidgetValidated::blockAttribute(theToBlock, isFlushesActived, + isAttributeSetInitializedBlocked); + // We do not restore the previous state of isAttributeSetInitializedBlocked for each of + // attributes. It it is necessary, these states should be append to the method attributes + // or stored in the widget + + std::list anAttributes = myFeature->data()->attributes(""); + std::list::const_iterator anIt = anAttributes.begin(), aLast = anAttributes.end(); + QStringList aValues; + for(; anIt != aLast; anIt++) { + AttributePtr anAttribute = *anIt; + if (theToBlock) + anAttribute->blockSetInitialized(true); + else + anAttribute->blockSetInitialized(isAttributeSetInitializedBlocked); + } +} + +void PartSet_WidgetSketchLabel::updateByPlaneSelected(const ModuleBase_ViewerPrs& thePrs) +{ + // 1. hide main planes if they have been displayed + erasePreviewPlanes(); + // 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->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 + if (aSelAttr) { + aGShape = aSelAttr->value(); + } + } + if (aGShape.get() != NULL) { + // 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(); + }*/ + + // 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 planes", "rotate_to_plane", "false"); + if (aRotate) { + myWorkshop->viewer()->setViewProjection(aXYZ.X(), aXYZ.Y(), aXYZ.Z(), aTwist); + PartSet_Module* aModule = dynamic_cast(myWorkshop->module()); + if (aModule) + aModule->onViewTransformed(); + } + } + // 3. Clear text in the label + myStackWidget->setCurrentIndex(1); + //myLabel->setText(""); + //myLabel->setToolTip(""); + disconnect(workshop()->selector(), SIGNAL(selectionChanged()), + this, SLOT(onSelectionChanged())); + // 4. deactivate face selection filter + activateFilters(false); + + // 5. Clear selection mode and define sketching mode + //XGUI_Displayer* aDisp = workshop()->displayer(); + //aDisp->closeLocalContexts(); + 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); + + // 6. Update sketcher actions + XGUI_ActionsMgr* anActMgr = workshop()->actionsMgr(); + myWorkshop->updateCommandStatus(); + myWorkshop->viewer()->update(); } std::shared_ptr PartSet_WidgetSketchLabel::plane() const { CompositeFeaturePtr aSketch = std::dynamic_pointer_cast(myFeature); return PartSet_Tools::sketchPlane(aSketch); - } bool PartSet_WidgetSketchLabel::focusTo() { - myLabel->setFocus(); + ModuleBase_Tools::setFocus(myStackWidget, "PartSet_WidgetSketchLabel::focusTo()"); return true; } void PartSet_WidgetSketchLabel::enableFocusProcessing() { - myLabel->installEventFilter(this); + myStackWidget->installEventFilter(this); } 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 @@ -176,34 +316,38 @@ void PartSet_WidgetSketchLabel::restoreAttributeValue(const bool theValid) } } -bool PartSet_WidgetSketchLabel::setSelection(const Handle_SelectMgr_EntityOwner& theOwner) +bool PartSet_WidgetSketchLabel::setSelectionCustom(const ModuleBase_ViewerPrs& thePrs) { bool isOwnerSet = false; - ModuleBase_ViewerPrs aPrs; - myWorkshop->selector()->selection()->fillPresentation(aPrs, theOwner); - - const TopoDS_Shape& aShape = aPrs.shape(); + const TopoDS_Shape& aShape = thePrs.shape(); std::shared_ptr aDir; - if (aPrs.object() && (feature() != aPrs.object())) { + if (thePrs.object() && (feature() != thePrs.object())) { DataPtr aData = feature()->data(); AttributeSelectionPtr aSelAttr = std::dynamic_pointer_cast (aData->attribute(SketchPlugin_SketchEntity::EXTERNAL_ID())); if (aSelAttr) { - ResultPtr aRes = std::dynamic_pointer_cast(aPrs.object()); + ResultPtr aRes = std::dynamic_pointer_cast(thePrs.object()); if (aRes) { GeomShapePtr aShapePtr(new GeomAPI_Shape()); - aShapePtr->setImpl(new TopoDS_Shape(aShape)); - aSelAttr->setValue(aRes, aShapePtr); - isOwnerSet = true; + if (aShape.IsNull()) { // selection happens in the OCC viewer + aShapePtr = ModelAPI_Tools::shape(aRes); + } + else { // selection happens in OB browser + aShapePtr->setImpl(new TopoDS_Shape(aShape)); + } + if (aShapePtr.get() != NULL) { + aSelAttr->setValue(aRes, aShapePtr); + isOwnerSet = true; + } } } } else if (!aShape.IsNull()) { aDir = setSketchPlane(aShape); - isOwnerSet = aDir; + isOwnerSet = aDir.get(); } return isOwnerSet; } @@ -211,47 +355,71 @@ bool PartSet_WidgetSketchLabel::setSelection(const Handle_SelectMgr_EntityOwner& void PartSet_WidgetSketchLabel::activateCustom() { std::shared_ptr aPlane = plane(); - if (aPlane) { - //setSketchingMode(); - // In order to avoid Opening/Closing of context too often - // it can be useful for a delay on the property panel filling - // it is possible that it is not necessary anymore, but it requires a check - //mySelectionTimer->start(20); - } else { - // We have to select a plane before any operation - showPreviewPlanes(); + if (aPlane.get()) { + myStackWidget->setCurrentIndex(1); + activateSelection(true); + return; + } - XGUI_Displayer* aDisp = myWorkshop->displayer(); - //aDisp->openLocalContext(); - //aDisp->activateObjects(QIntList()); - QIntList aModes; - aModes << TopAbs_FACE; - aDisp->activateObjects(aModes); + myStackWidget->setCurrentIndex(0); + bool aBodyIsVisualized = false; + XGUI_Displayer* aDisp = workshop()->displayer(); + QObjectPtrList aDisplayed = aDisp->displayedObjects(); + foreach (ObjectPtr anObj, aDisplayed) { + ResultPtr aResult = std::dynamic_pointer_cast(anObj); + if (aResult.get() != NULL) { + aBodyIsVisualized = aResult->groupName() == ModelAPI_ResultBody::group(); + if (aBodyIsVisualized) + break; + } + } - myLabel->setText(myText); - myLabel->setToolTip(myTooltip); + if (!aBodyIsVisualized) { + // We have to select a plane before any operation + showPreviewPlanes(); + } + activateSelection(true); - connect(myWorkshop->selector(), SIGNAL(selectionChanged()), this, SLOT(onPlaneSelected())); - activateFilters(myWorkshop->module()->workshop(), true); + //myLabel->setText(myText); + //myLabel->setToolTip(myTooltip); - aDisp->updateViewer(); - } + connect(workshop()->selector(), SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged())); + activateFilters(true); } 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(); + ModuleBase_ModelWidget::deactivate(); + bool aHidePreview = myPreviewDisplayed; erasePreviewPlanes(); - activateFilters(myWorkshop->module()->workshop(), false); + activateSelection(false); + + activateFilters(false); + if (aHidePreview) + myWorkshop->viewer()->update(); +} + +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); @@ -268,7 +436,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; @@ -286,10 +455,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; } @@ -317,8 +486,12 @@ 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); + if (!aPlane.get()) + return std::shared_ptr(); // set plane parameters to feature std::shared_ptr aData = feature()->data(); @@ -352,28 +525,24 @@ std::shared_ptr PartSet_WidgetSketchLabel::setSketchPlane(const Top return aDir; } - -/*void PartSet_WidgetSketchLabel::setSketchingMode() +XGUI_Workshop* PartSet_WidgetSketchLabel::workshop() const { - 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) + XGUI_ModuleConnector* aConnector = dynamic_cast(myWorkshop); + return aConnector->workshop(); +} + + +void PartSet_WidgetSketchLabel::onSetPlaneView() { - myShowConstraints->setChecked(theOn); - emit showConstraintToggled(theOn); + std::shared_ptr aPlane = plane(); + if (aPlane.get()) { + std::shared_ptr aDirection = aPlane->direction(); + gp_Dir aDir = aDirection->impl(); + if (myViewInverted->isChecked()) + aDir.Reverse(); + myWorkshop->viewer()->setViewProjection(aDir.X(), aDir.Y(), aDir.Z(), 0.); + PartSet_Module* aModule = dynamic_cast(myWorkshop->module()); + if (aModule) + aModule->onViewTransformed(); + } }