X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_MenuMgr.cpp;h=7b60d802cd274cf7027b32a926c5908a1c17f39b;hb=383021cb51c4720904096ca851db5ee79255b402;hp=c5ad640cbfc728b4feb850051c3a03585ba2b3c0;hpb=82d3fff7d0ed2c089da5aa6b106789be076081f3;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_MenuMgr.cpp b/src/PartSet/PartSet_MenuMgr.cpp index c5ad640cb..7b60d802c 100644 --- a/src/PartSet/PartSet_MenuMgr.cpp +++ b/src/PartSet/PartSet_MenuMgr.cpp @@ -22,12 +22,16 @@ #include #include +#include +#include +#include +#include #include #include #include #include -#include +#include #include #include @@ -35,8 +39,10 @@ #include #include +#include #include #include +#include #include #include @@ -68,25 +74,22 @@ void PartSet_MenuMgr::createActions() { QAction* aAction; - aAction = new QAction(tr("Auxiliary"), this); + QWidget* aParent = myModule->workshop()->desktop(); + aAction = ModuleBase_Tools::createAction(QIcon(), tr("Auxiliary"), aParent); aAction->setCheckable(true); addAction("AUXILIARY_CMD", aAction); - aAction = new QAction(QIcon(":icons/activate.png"), tr("Activate"), this); - connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onActivatePart(bool))); + aAction = ModuleBase_Tools::createAction(QIcon(":icons/activate.png"), tr("Activate"), aParent, + this, SLOT(onActivatePart(bool))); myActions["ACTIVATE_PART_CMD"] = aAction; - aAction = new QAction(QIcon(":icons/deactivate.png"), tr("Deactivate"), this); - connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onActivatePartSet(bool))); - myActions["DEACTIVATE_PART_CMD"] = aAction; - // Activate PartSet - aAction = new QAction(QIcon(":icons/activate.png"), tr("Activate"), this); - connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onActivatePartSet(bool))); + aAction = ModuleBase_Tools::createAction(QIcon(":icons/activate.png"), tr("Activate"), aParent, + this, SLOT(onActivatePartSet(bool))); myActions["ACTIVATE_PARTSET_CMD"] = aAction; - aAction = new QAction(QIcon(":icons/edit.png"), tr("Edit..."), this); - connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onEdit(bool))); + aAction = ModuleBase_Tools::createAction(QIcon(":icons/edit.png"), tr("Edit..."), aParent, + this, SLOT(onEdit(bool))); myActions["EDIT_CMD"] = aAction; } @@ -101,8 +104,12 @@ void PartSet_MenuMgr::onAction(bool isChecked) } } -bool PartSet_MenuMgr::addViewerMenu(QMenu* theMenu, const QMap& theStdActions) const +bool PartSet_MenuMgr::addViewerMenu(const QMap& theStdActions, + QWidget* theParent, + QMap& theMenuActions) const { + int anIndex = 0; + ModuleBase_Operation* anOperation = myModule->workshop()->currentOperation(); if (!PartSet_SketcherMgr::isSketchOperation(anOperation) && !PartSet_SketcherMgr::isNestedSketchOperation(anOperation)) @@ -115,69 +122,52 @@ bool PartSet_MenuMgr::addViewerMenu(QMenu* theMenu, const QMap aPrsList = aSelection->getSelected(ModuleBase_ISelection::Viewer); - TopoDS_Shape aShape; - ResultPtr aResult; - FeaturePtr aFeature; - foreach(ModuleBase_ViewerPrs aPrs, aPrsList) { - aResult = std::dynamic_pointer_cast(aPrs.object()); - if (aResult.get() != NULL) { - aShape = aPrs.shape(); - if (aShape.IsEqual(aResult->shape()->impl())) - hasFeature = true; - else - hasAttribute = true; - } else { - aFeature = std::dynamic_pointer_cast(aPrs.object()); - hasFeature = (aFeature.get() != NULL); + QList aPrsList = aSelection->getSelected(ModuleBase_ISelection::Viewer); + if (aPrsList.size() > 1) { + hasFeature = true; + } else if (aPrsList.size() == 1) { + ResultPtr aResult; + FeaturePtr aFeature; + foreach(ModuleBase_ViewerPrsPtr aPrs, aPrsList) { + aResult = std::dynamic_pointer_cast(aPrs->object()); + if (aResult.get() != NULL) { + const GeomShapePtr& aShape = aPrs->shape(); + if (aShape.get() && aShape->isEqual(aResult->shape())) + hasFeature = true; + else + hasAttribute = true; + } else { + aFeature = std::dynamic_pointer_cast(aPrs->object()); + hasFeature = (aFeature.get() != NULL); + } } - } - if (aPrsList.size() == 1) { - TopoDS_Shape aShape = aPrsList.first().shape(); - if ((!aShape.IsNull()) && aShape.ShapeType() == TopAbs_VERTEX) { + const GeomShapePtr& aShape = aPrsList.first()->shape(); + if (aShape.get() && !aShape->isNull() && aShape->shapeType() == GeomAPI_Shape::VERTEX) { // Find 2d coordinates FeaturePtr aSketchFea = myModule->sketchMgr()->activeSketch(); if (aSketchFea->getKind() == SketchPlugin_Sketch::ID()) { - gp_Pnt aPnt = BRep_Tool::Pnt(TopoDS::Vertex(aShape)); + const TopoDS_Shape& aTDShape = aShape->impl(); + gp_Pnt aPnt = BRep_Tool::Pnt(TopoDS::Vertex(aTDShape)); std::shared_ptr aPnt3d(new GeomAPI_Pnt(aPnt.X(), aPnt.Y(), aPnt.Z())); std::shared_ptr aSelPnt = PartSet_Tools::convertTo2D(aSketchFea, aPnt3d); // Find coincident in these coordinates - ObjectPtr aObj = aPrsList.first().object(); + ObjectPtr aObj = aPrsList.first()->object(); FeaturePtr aFeature = ModelAPI_Feature::feature(aObj); - const std::set& aRefsList = aFeature->data()->refsToMe(); - std::set::const_iterator aIt; - FeaturePtr aCoincident; - for (aIt = aRefsList.cbegin(); aIt != aRefsList.cend(); ++aIt) { - std::shared_ptr aAttr = (*aIt); - FeaturePtr aConstrFeature = std::dynamic_pointer_cast(aAttr->owner()); - if (aConstrFeature->getKind() == SketchPlugin_ConstraintCoincidence::ID()) { - std::shared_ptr a2dPnt = - PartSet_Tools::getPoint(aConstrFeature, SketchPlugin_ConstraintCoincidence::ENTITY_A()); - if (a2dPnt.get() && aSelPnt->isEqual(a2dPnt)) { - aCoincident = aConstrFeature; - break; - } else { - a2dPnt = PartSet_Tools::getPoint(aConstrFeature, - SketchPlugin_ConstraintCoincidence::ENTITY_B()); - if (a2dPnt.get() && aSelPnt->isEqual(a2dPnt)) { - aCoincident = aConstrFeature; - break; - } - } - } - } + FeaturePtr aCoincident = PartSet_Tools::findFirstCoincidence(aFeature, aSelPnt); // If we have coincidence then add Detach menu if (aCoincident.get() != NULL) { + QList aCoins; mySelectedFeature = aCoincident; - PartSet_Tools::findCoincidences(mySelectedFeature, myCoinsideLines, + PartSet_Tools::findCoincidences(mySelectedFeature, myCoinsideLines, aCoins, SketchPlugin_ConstraintCoincidence::ENTITY_A()); - PartSet_Tools::findCoincidences(mySelectedFeature, myCoinsideLines, + PartSet_Tools::findCoincidences(mySelectedFeature, myCoinsideLines, aCoins, SketchPlugin_ConstraintCoincidence::ENTITY_B()); if (myCoinsideLines.size() > 0) { aIsDetach = true; - QMenu* aSubMenu = theMenu->addMenu(tr("Detach")); + QMenu* aSubMenu = new QMenu(tr("Detach"), theParent); + theMenuActions[anIndex++] = aSubMenu->menuAction(); QAction* aAction; int i = 0; foreach (FeaturePtr aCoins, myCoinsideLines) { @@ -193,17 +183,20 @@ bool PartSet_MenuMgr::addViewerMenu(QMenu* theMenu, const QMapaddAction(theStdActions["DELETE_CMD"]); + if (!hasAttribute) { + bool isAuxiliary; + if (canSetAuxiliary(isAuxiliary)) { + QAction* anAction = action("AUXILIARY_CMD"); + theMenuActions[anIndex++] = anAction; + anAction->setChecked(isAuxiliary); + } } - if (hasAttribute) - return true; - bool isAuxiliary; - if (canSetAuxiliary(isAuxiliary)) { - QAction* anAction = action("AUXILIARY_CMD"); - theMenu->addAction(anAction); - anAction->setChecked(isAuxiliary); + + if (!aIsDetach && hasFeature) { + // Delete item should be the last in the list of actions + theMenuActions[1000] = theStdActions["DELETE_CMD"]; } + return true; } @@ -253,60 +246,66 @@ QColor PartSet_MenuMgr::setLineColor(int theId, const QColor theColor, bool theU } -void PartSet_MenuMgr::onLineDetach(QAction* theAction) +void addRefCoincidentFeatures(const std::set& theRefList, + std::shared_ptr& theRefPnt, + QObjectPtrList& theOutList) { - int aId = theAction->data().toInt(); - FeaturePtr aLine = myCoinsideLines.at(aId); - std::shared_ptr aOrig = PartSet_Tools::getPoint(mySelectedFeature, - SketchPlugin_ConstraintCoincidence::ENTITY_A()); - if (aOrig.get() == NULL) - aOrig = PartSet_Tools::getPoint(mySelectedFeature, - SketchPlugin_ConstraintCoincidence::ENTITY_B()); - - gp_Pnt aOr = aOrig->impl(); - const std::set& aRefsList = aLine->data()->refsToMe(); - - QObjectPtrList aToDelFeatures; std::set::const_iterator aIt; - // Find all coincedences corresponded to the selected line in the selected point - for (aIt = aRefsList.cbegin(); aIt != aRefsList.cend(); ++aIt) { + for (aIt = theRefList.cbegin(); aIt != theRefList.cend(); ++aIt) { std::shared_ptr aAttr = (*aIt); FeaturePtr aConstrFeature = std::dynamic_pointer_cast(aAttr->owner()); if (aConstrFeature->getKind() == SketchPlugin_ConstraintCoincidence::ID()) { - std::shared_ptr aPnt = PartSet_Tools::getPoint(aConstrFeature, - SketchPlugin_ConstraintCoincidence::ENTITY_A()); - if (aPnt.get() == NULL) - aPnt = PartSet_Tools::getPoint(aConstrFeature, - SketchPlugin_ConstraintCoincidence::ENTITY_B()); + std::shared_ptr aPnt = PartSet_Tools::getCoincedencePoint(aConstrFeature); if (aPnt.get() == NULL) return; gp_Pnt aP = aPnt->impl(); - if (aOrig->isEqual(aPnt)) { - aToDelFeatures.append(aConstrFeature); - } else { - aPnt = PartSet_Tools::getPoint(aConstrFeature, - SketchPlugin_ConstraintCoincidence::ENTITY_B()); - aP = aPnt->impl(); - if (aOrig->isEqual(aPnt)) { - aToDelFeatures.append(aConstrFeature); - break; - } - } + if (theRefPnt->isEqual(aPnt) && (!theOutList.contains(aConstrFeature))) { + theOutList.append(aConstrFeature); + } } } +} + +void PartSet_MenuMgr::onLineDetach(QAction* theAction) +{ + int aId = theAction->data().toInt(); + FeaturePtr aLine = myCoinsideLines.at(aId); + std::shared_ptr aOrig = PartSet_Tools::getCoincedencePoint(mySelectedFeature); + if (!aOrig.get()) + return; + + const std::set& aRefsList = aLine->data()->refsToMe(); + + QObjectPtrList aToDelFeatures; + + addRefCoincidentFeatures(aRefsList, aOrig, aToDelFeatures); + + const std::list& aResults = aLine->results(); + std::list::const_iterator aResIt; + for (aResIt = aResults.cbegin(); aResIt != aResults.cend(); aResIt++) { + ResultPtr aResult = (*aResIt); + const std::set& aRefList = aResult->data()->refsToMe(); + addRefCoincidentFeatures(aRefList, aOrig, aToDelFeatures); + } if (aToDelFeatures.size() > 0) { XGUI_ModuleConnector* aConnector = dynamic_cast(myModule->workshop()); XGUI_Workshop* aWorkshop = aConnector->workshop(); ModuleBase_Operation* anOperation = myModule->workshop()->currentOperation(); - if (PartSet_SketcherMgr::isNestedSketchOperation(anOperation)) - anOperation->abort(); - - SessionPtr aMgr = ModelAPI_Session::get(); - QString aName = tr("Detach %1").arg(aLine->data()->name().c_str()); - aMgr->startOperation(aName.toStdString()); + ModuleBase_OperationAction* anOpAction = new ModuleBase_OperationAction( + tr("Detach %1").arg(aLine->data()->name().c_str()), myModule); + bool isSketchOp = PartSet_SketcherMgr::isSketchOperation(anOperation); + XGUI_OperationMgr* anOpMgr = aConnector->workshop()->operationMgr(); + // the active nested sketch operation should be aborted unconditionally + // the Delete action should be additionally granted for the Sketch operation + // in order to do not abort/commit it + if (!anOpMgr->canStartOperation(tr("Detach"))) + return; // the objects are processed but can not be deleted + + anOpMgr->startOperation(anOpAction); aWorkshop->deleteFeatures(aToDelFeatures); - aMgr->finishOperation(); + + anOpMgr->commitOperation(); } myCoinsideLines.clear(); } @@ -336,8 +335,11 @@ void PartSet_MenuMgr::setAuxiliary(const bool isChecked) bool isUseTransaction = false; // 1. change auxiliary type of a created feature if (PartSet_SketcherMgr::isNestedCreateOperation(anOperation) && - PartSet_SketcherMgr::isEntity(anOperation->id().toStdString()) ) { - anObjects.append(anOperation->feature()); + PartSet_SketcherMgr::isEntity(anOperation->id().toStdString()) ) { + ModuleBase_OperationFeature* aFOperation = dynamic_cast + (anOperation); + if (aFOperation) + anObjects.append(aFOperation->feature()); } else { isUseTransaction = true; @@ -347,14 +349,19 @@ void PartSet_MenuMgr::setAuxiliary(const bool isChecked) } QAction* anAction = action("AUXILIARY_CMD"); - SessionPtr aMgr = ModelAPI_Session::get(); + //SessionPtr aMgr = ModelAPI_Session::get(); + ModuleBase_OperationAction* anOpAction = 0; + XGUI_ModuleConnector* aConnector = dynamic_cast(myModule->workshop()); + XGUI_OperationMgr* anOpMgr = aConnector->workshop()->operationMgr(); if (isUseTransaction) { - if (PartSet_SketcherMgr::isNestedSketchOperation(anOperation)) - anOperation->abort(); - aMgr->startOperation(anAction->text().toStdString()); - } - myModule->sketchMgr()->storeSelection(); + anOpAction = new ModuleBase_OperationAction(anAction->text(), myModule); + bool isSketchOp = PartSet_SketcherMgr::isSketchOperation(anOperation); + if (!anOpMgr->canStartOperation(anOpAction->id())) + return; // the objects are processed but can not be deleted + + anOpMgr->startOperation(anOpAction); + } if (anObjects.size() > 0) { QObjectPtrList::const_iterator anIt = anObjects.begin(), aLast = anObjects.end(); for (; anIt != aLast; anIt++) { @@ -373,15 +380,10 @@ void PartSet_MenuMgr::setAuxiliary(const bool isChecked) } } } - if (isUseTransaction) { - aMgr->finishOperation(); - XGUI_ModuleConnector* aConnector = dynamic_cast(myModule->workshop()); - XGUI_Workshop* aWorkshop = aConnector->workshop(); - aWorkshop->updateCommandStatus(); - } + if (isUseTransaction) + anOpMgr->commitOperation(); Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_UPDATED)); - myModule->sketchMgr()->restoreSelection(); } bool PartSet_MenuMgr::canSetAuxiliary(bool& theValue) const @@ -398,7 +400,9 @@ bool PartSet_MenuMgr::canSetAuxiliary(bool& theValue) const // 1. change auxiliary type of a created feature if (PartSet_SketcherMgr::isNestedCreateOperation(anOperation) && PartSet_SketcherMgr::isEntity(anOperation->id().toStdString()) ) { - anObjects.append(anOperation->feature()); + ModuleBase_OperationFeature* aFOperation = dynamic_cast(anOperation); + if (aFOperation) + anObjects.append(aFOperation->feature()); } else { /// The operation should not be aborted here, because the method does not changed @@ -450,6 +454,7 @@ void PartSet_MenuMgr::onActivatePart(bool) } if (aPart.get()) aPart->activate(); + myModule->workshop()->updateCommandStatus(); } } @@ -457,15 +462,27 @@ void PartSet_MenuMgr::onActivatePartSet(bool) { if (myModule->workshop()->currentOperation()) return; + activatePartSet(); +} + +void PartSet_MenuMgr::activatePartSet() const +{ SessionPtr aMgr = ModelAPI_Session::get(); bool isNewTransaction = !aMgr->isOperation(); // activation may cause changes in current features in document, so it must be in transaction - if (isNewTransaction) { - aMgr->startOperation("Activation"); - } + if (isNewTransaction) aMgr->startOperation("Activation"); aMgr->setActiveDocument(aMgr->moduleDocument()); - if (isNewTransaction) { - aMgr->finishOperation(); + if (isNewTransaction) aMgr->finishOperation(); + + myModule->workshop()->updateCommandStatus(); +} + +void PartSet_MenuMgr::grantedOperationIds(ModuleBase_Operation* theOperation, + QStringList& theIds) const +{ + if (PartSet_SketcherMgr::isSketchOperation(theOperation)) { + theIds.append(tr("Detach")); + theIds.append(tr("Auxiliary")); } } @@ -483,3 +500,13 @@ void PartSet_MenuMgr::onEdit(bool) if (aFeature.get() != NULL) myModule->editFeature(aFeature); } + +bool PartSet_MenuMgr::eventFilter(QObject* theObj, QEvent* theEvent) +{ + if (theEvent->type() == QEvent::MouseButtonDblClick) { + SessionPtr aMgr = ModelAPI_Session::get(); + if (aMgr->activeDocument() != aMgr->moduleDocument()) + activatePartSet(); + } + return QObject::eventFilter(theObj, theEvent); +} \ No newline at end of file