X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_MenuMgr.cpp;h=a027eb77afb9d7fae36b08872b6b27355056eeee;hb=857b1f72d9703c46c6c8c9bb239821d314344c86;hp=dfc184a42646b09abc8555f9331ea3d1b767ec12;hpb=7fb62fa4f588717eaffdcba56c032fba99def105;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_MenuMgr.cpp b/src/PartSet/PartSet_MenuMgr.cpp index dfc184a42..a027eb77a 100644 --- a/src/PartSet/PartSet_MenuMgr.cpp +++ b/src/PartSet/PartSet_MenuMgr.cpp @@ -22,10 +22,15 @@ #include #include +#include +#include #include #include #include +#include +#include +#include #include #include @@ -74,10 +79,6 @@ void PartSet_MenuMgr::createActions() connect(aAction, SIGNAL(triggered(bool)), 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))); @@ -86,6 +87,11 @@ void PartSet_MenuMgr::createActions() aAction = new QAction(QIcon(":icons/edit.png"), tr("Edit..."), this); connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onEdit(bool))); myActions["EDIT_CMD"] = aAction; + + aAction = new QAction(QIcon(), tr("Select parent feature"), this); + aAction->setCheckable(false); + connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onSelectParentFeature())); + myActions["SELECT_PARENT_CMD"] = aAction; } @@ -113,7 +119,7 @@ bool PartSet_MenuMgr::addViewerMenu(QMenu* theMenu, const QMap aPrsList = aSelection->getSelected(ModuleBase_ISelection::AllControls); + QList aPrsList = aSelection->getSelected(ModuleBase_ISelection::Viewer); TopoDS_Shape aShape; ResultPtr aResult; FeaturePtr aFeature; @@ -205,6 +211,23 @@ bool PartSet_MenuMgr::addViewerMenu(QMenu* theMenu, const QMap& theStdActions) +{ + ModuleBase_Operation* anOperation = myModule->workshop()->currentOperation(); + + bool isActiveSketch = PartSet_SketcherMgr::isSketchOperation(anOperation) || + PartSet_SketcherMgr::isNestedSketchOperation(anOperation); + if (isActiveSketch) { + theStdActions["WIREFRAME_CMD"]->setEnabled(false); + theStdActions["SHADING_CMD"]->setEnabled(false); + theStdActions["SHOW_ONLY_CMD"]->setEnabled(false); + theStdActions["SHOW_CMD"]->setEnabled(false); + theStdActions["HIDE_CMD"]->setEnabled(false); + theStdActions["HIDEALL_CMD"]->setEnabled(false); + } +} + + void PartSet_MenuMgr::onLineHighlighted(QAction* theAction) { if (myPrevId != -1) { @@ -267,6 +290,8 @@ void PartSet_MenuMgr::onLineDetach(QAction* theAction) } else { aPnt = PartSet_Tools::getPoint(aConstrFeature, SketchPlugin_ConstraintCoincidence::ENTITY_B()); + if (aPnt.get() == NULL) + return; aP = aPnt->impl(); if (aOrig->isEqual(aPnt)) { aToDelFeatures.append(aConstrFeature); @@ -279,15 +304,21 @@ void PartSet_MenuMgr::onLineDetach(QAction* theAction) 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(anOpAction->id(), isSketchOp/*granted*/)) + return; // the objects are processed but can not be deleted + + anOpMgr->startOperation(anOpAction); aWorkshop->deleteFeatures(aToDelFeatures); - aMgr->finishOperation(); + + anOpMgr->commitOperation(); } myCoinsideLines.clear(); } @@ -317,8 +348,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; @@ -328,11 +362,18 @@ 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()); + anOpAction = new ModuleBase_OperationAction(anAction->text(), myModule); + bool isSketchOp = PartSet_SketcherMgr::isSketchOperation(anOperation); + + if (!anOpMgr->canStartOperation(anOpAction->id(), isSketchOp/*granted*/)) + return; // the objects are processed but can not be deleted + + anOpMgr->startOperation(anOpAction); } myModule->sketchMgr()->storeSelection(); @@ -354,12 +395,8 @@ 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(); @@ -379,7 +416,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 @@ -464,3 +503,20 @@ void PartSet_MenuMgr::onEdit(bool) if (aFeature.get() != NULL) myModule->editFeature(aFeature); } + +void PartSet_MenuMgr::onSelectParentFeature() +{ + QObjectPtrList aObjects = myModule->workshop()->selection()->selectedObjects(); + if (aObjects.size() != 1) + return; + + SessionPtr aMgr = ModelAPI_Session::get(); + ResultPtr aResult = std::dynamic_pointer_cast( aObjects.first() ); + if( !aResult.get() ) + return; + + FeaturePtr aParentFeature = aResult->document()->feature( aResult ); + QObjectPtrList aSelection; + aSelection.append( aParentFeature ); + myModule->workshop()->selection()->setSelectedObjects( aSelection ); +}