X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_MenuMgr.cpp;h=9b82b66c3460a2bba5e43223dd5def81c76164ae;hb=d9aad73be5a44ff8e42162a30a0d9045df7f3837;hp=91b6f859e32c9ba101dce6d18885978fc8b9cb44;hpb=58185df5c4d0877054ea33a0fe8ebded75bd9d7b;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_MenuMgr.cpp b/src/PartSet/PartSet_MenuMgr.cpp index 91b6f859e..9b82b66c3 100644 --- a/src/PartSet/PartSet_MenuMgr.cpp +++ b/src/PartSet/PartSet_MenuMgr.cpp @@ -9,6 +9,8 @@ #include "PartSet_SketcherMgr.h" #include "PartSet_Tools.h" +#include + #include #include @@ -20,14 +22,21 @@ #include #include +#include +#include #include #include #include +#include +#include +#include #include #include #include +#include +#include #include #include @@ -60,11 +69,29 @@ void PartSet_MenuMgr::addAction(const QString& theId, QAction* theAction) void PartSet_MenuMgr::createActions() { - QAction* anAction; + QAction* aAction; + + aAction = new QAction(tr("Auxiliary"), this); + 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))); + myActions["ACTIVATE_PART_CMD"] = aAction; + + // Activate PartSet + aAction = new QAction(QIcon(":icons/activate.png"), tr("Activate"), this); + connect(aAction, SIGNAL(triggered(bool)), 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))); + myActions["EDIT_CMD"] = aAction; - anAction = new QAction(tr("Auxiliary"), this); - anAction->setCheckable(true); - addAction("AUXILIARY_CMD", anAction); + 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; } @@ -78,68 +105,7 @@ void PartSet_MenuMgr::onAction(bool isChecked) } } -/// Returns point of coincidence feature -/// \param theFeature the coincidence feature -/// \param theAttribute the attribute name -std::shared_ptr getPoint(std::shared_ptr& theFeature, - const std::string& theAttribute) -{ - std::shared_ptr aPointAttr; - - if (!theFeature->data()) - return std::shared_ptr(); - - FeaturePtr aFeature; - std::shared_ptr anAttr = std::dynamic_pointer_cast< - ModelAPI_AttributeRefAttr>(theFeature->data()->attribute(theAttribute)); - if (anAttr) - aFeature = ModelAPI_Feature::feature(anAttr->object()); - - if (aFeature && aFeature->getKind() == SketchPlugin_Point::ID()) - aPointAttr = std::dynamic_pointer_cast( - aFeature->data()->attribute(SketchPlugin_Point::COORD_ID())); - - else if (aFeature && aFeature->getKind() == SketchPlugin_Circle::ID()) - aPointAttr = std::dynamic_pointer_cast( - aFeature->data()->attribute(SketchPlugin_Circle::CENTER_ID())); - - else if (anAttr->attr()) { - aPointAttr = std::dynamic_pointer_cast(anAttr->attr()); - } - if (aPointAttr.get() != NULL) - return aPointAttr->pnt(); - return std::shared_ptr(); -} - -/// Returns list of features connected in a councedence feature point -/// \param theStartCoin the coincidence feature -/// \param theList a list which collects lines features -/// \param theAttr the attribute name -void findCoincidences(FeaturePtr theStartCoin, QList& theList, std::string theAttr) -{ - AttributeRefAttrPtr aPnt = theStartCoin->refattr(theAttr); - FeaturePtr aObj = ModelAPI_Feature::feature(aPnt->object()); - if (!theList.contains(aObj)) { - std::shared_ptr aOrig = getPoint(theStartCoin, theAttr); - theList.append(aObj); - const std::set& aRefsList = aObj->data()->refsToMe(); - std::set::const_iterator aIt; - 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 aPnt = getPoint(aConstrFeature, theAttr); - if (aOrig->isEqual(aPnt)) { - findCoincidences(aConstrFeature, theList, SketchPlugin_ConstraintCoincidence::ENTITY_A()); - findCoincidences(aConstrFeature, theList, SketchPlugin_ConstraintCoincidence::ENTITY_B()); - } - } - } - } -} - - -bool PartSet_MenuMgr::addViewerItems(QMenu* theMenu, const QMap& theStdActions) const +bool PartSet_MenuMgr::addViewerMenu(QMenu* theMenu, const QMap& theStdActions) const { ModuleBase_Operation* anOperation = myModule->workshop()->currentOperation(); if (!PartSet_SketcherMgr::isSketchOperation(anOperation) && @@ -153,7 +119,7 @@ bool PartSet_MenuMgr::addViewerItems(QMenu* theMenu, const QMap aPrsList = aSelection->getSelected(); + QList aPrsList = aSelection->getSelected(ModuleBase_ISelection::Viewer); TopoDS_Shape aShape; ResultPtr aResult; FeaturePtr aFeature; @@ -191,18 +157,28 @@ bool PartSet_MenuMgr::addViewerItems(QMenu* theMenu, const QMap aAttr = (*aIt); FeaturePtr aConstrFeature = std::dynamic_pointer_cast(aAttr->owner()); if (aConstrFeature->getKind() == SketchPlugin_ConstraintCoincidence::ID()) { - std::shared_ptr a2dPnt = getPoint(aConstrFeature, SketchPlugin_ConstraintCoincidence::ENTITY_A()); - if (aSelPnt->isEqual(a2dPnt)) { + 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; + } + } } } // If we have coincidence then add Detach menu if (aCoincident.get() != NULL) { mySelectedFeature = aCoincident; - findCoincidences(mySelectedFeature, myCoinsideLines, SketchPlugin_ConstraintCoincidence::ENTITY_A()); - findCoincidences(mySelectedFeature, myCoinsideLines, SketchPlugin_ConstraintCoincidence::ENTITY_B()); + PartSet_Tools::findCoincidences(mySelectedFeature, myCoinsideLines, + SketchPlugin_ConstraintCoincidence::ENTITY_A()); + PartSet_Tools::findCoincidences(mySelectedFeature, myCoinsideLines, + SketchPlugin_ConstraintCoincidence::ENTITY_B()); if (myCoinsideLines.size() > 0) { aIsDetach = true; QMenu* aSubMenu = theMenu->addMenu(tr("Detach")); @@ -235,6 +211,23 @@ bool PartSet_MenuMgr::addViewerItems(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) { @@ -268,7 +261,12 @@ void PartSet_MenuMgr::onLineDetach(QAction* theAction) { int aId = theAction->data().toInt(); FeaturePtr aLine = myCoinsideLines.at(aId); - std::shared_ptr aOrig = getPoint(mySelectedFeature, SketchPlugin_ConstraintCoincidence::ENTITY_A()); + 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(); @@ -279,12 +277,21 @@ void PartSet_MenuMgr::onLineDetach(QAction* theAction) std::shared_ptr aAttr = (*aIt); FeaturePtr aConstrFeature = std::dynamic_pointer_cast(aAttr->owner()); if (aConstrFeature->getKind() == SketchPlugin_ConstraintCoincidence::ID()) { - std::shared_ptr aPnt = getPoint(aConstrFeature, SketchPlugin_ConstraintCoincidence::ENTITY_A()); + 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()); + if (aPnt.get() == NULL) + return; gp_Pnt aP = aPnt->impl(); if (aOrig->isEqual(aPnt)) { aToDelFeatures.append(aConstrFeature); } else { - aPnt = getPoint(aConstrFeature, SketchPlugin_ConstraintCoincidence::ENTITY_B()); + aPnt = PartSet_Tools::getPoint(aConstrFeature, + SketchPlugin_ConstraintCoincidence::ENTITY_B()); + if (aPnt.get() == NULL) + return; aP = aPnt->impl(); if (aOrig->isEqual(aPnt)) { aToDelFeatures.append(aConstrFeature); @@ -297,17 +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(); - std::set anIgnoredFeatures; - anIgnoredFeatures.insert(myModule->sketchMgr()->activeSketch()); - - QString aName = tr("Detach %1").arg(aLine->data()->name().c_str()); - aMgr->startOperation(aName.toStdString()); - aWorkshop->deleteFeatures(aToDelFeatures, anIgnoredFeatures); - aMgr->finishOperation(); + 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); + + anOpMgr->commitOperation(); } myCoinsideLines.clear(); } @@ -337,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; @@ -348,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(); @@ -374,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(); @@ -399,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 @@ -434,3 +453,71 @@ bool PartSet_MenuMgr::canSetAuxiliary(bool& theValue) const theValue = anObjects.size() && !isNotAuxiliaryFound; return anEnabled; } + +void PartSet_MenuMgr::onActivatePart(bool) +{ + if (myModule->workshop()->currentOperation()) + return; + QObjectPtrList aObjects = myModule->workshop()->selection()->selectedObjects(); + if (aObjects.size() > 0) { + ObjectPtr aObj = aObjects.first(); + ResultPartPtr aPart = std::dynamic_pointer_cast(aObj); + if (!aPart.get()) { + FeaturePtr aPartFeature = std::dynamic_pointer_cast(aObj); + if (aPartFeature.get() && (aPartFeature->getKind() == PartSetPlugin_Part::ID())) { + aPart = std::dynamic_pointer_cast(aPartFeature->firstResult()); + } + } + if (aPart.get()) + aPart->activate(); + } +} + +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"); + aMgr->setActiveDocument(aMgr->moduleDocument()); + if (isNewTransaction) aMgr->finishOperation(); +} + +void PartSet_MenuMgr::onEdit(bool) +{ + QObjectPtrList aObjects = myModule->workshop()->selection()->selectedObjects(); + FeaturePtr aFeature = std::dynamic_pointer_cast(aObjects.first()); + if (aFeature == NULL) { + ResultParameterPtr aParam = + std::dynamic_pointer_cast(aObjects.first()); + if (aParam.get() != NULL) { + aFeature = ModelAPI_Feature::feature(aParam); + } + } + 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 ); +}