X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_ActionsMgr.cpp;h=8b6fbadd1c685e94305ef78d791405823e73c060;hb=64fc7e4fdd63997ec7a502b233ef5f88186d5bbb;hp=8d2eada7c492bd5ae4a04d0a51c8c03182e2d5ce;hpb=1b585947597658057eedf6223a230011e20a959d;p=modules%2Fshaper.git diff --git a/src/XGUI/XGUI_ActionsMgr.cpp b/src/XGUI/XGUI_ActionsMgr.cpp index 8d2eada7c..8b6fbadd1 100644 --- a/src/XGUI/XGUI_ActionsMgr.cpp +++ b/src/XGUI/XGUI_ActionsMgr.cpp @@ -20,6 +20,7 @@ #include #include #include +#include #include @@ -95,15 +96,16 @@ bool XGUI_ActionsMgr::isNested(const QString& theId) const void XGUI_ActionsMgr::update() { FeaturePtr anActiveFeature = FeaturePtr(); - if (myOperationMgr->hasOperation()) { - ModuleBase_Operation* anOperation = myOperationMgr->currentOperation(); - anActiveFeature = anOperation->feature(); + ModuleBase_OperationFeature* aFOperation = dynamic_cast + (myOperationMgr->currentOperation()); + if (aFOperation) { + anActiveFeature = aFOperation->feature(); if(anActiveFeature.get()) { setAllEnabled(false); QString aFeatureId = QString::fromStdString(anActiveFeature->getKind()); setActionEnabled(aFeatureId, true); } - setNestedStackEnabled(anOperation); + setNestedStackEnabled(aFOperation); } else { setAllEnabled(true); setNestedCommandsEnabled(false); @@ -256,6 +258,15 @@ QAction* XGUI_ActionsMgr::operationStateAction(OperationStateActionId theId, QOb return aResult; } +QAction* XGUI_ActionsMgr::action(const QString& theId) +{ + QAction* anAction = 0; + if(myActions.contains(theId)) { + anAction = myActions.value(theId); + } + return anAction; +} + ActionInfo XGUI_ActionsMgr::actionInfoById(const QString& theId) { ActionInfo aResult; @@ -295,9 +306,10 @@ void XGUI_ActionsMgr::setNestedCommandsEnabled(bool theEnabled, const QString& t void XGUI_ActionsMgr::setNestedStackEnabled(ModuleBase_Operation* theOperation) { - if(!theOperation || !theOperation->feature()) + ModuleBase_OperationFeature* anOperation = dynamic_cast(theOperation); + if(!anOperation || !anOperation->feature()) return; - FeaturePtr aFeature = theOperation->feature(); + FeaturePtr aFeature = anOperation->feature(); QString aFeatureId = QString::fromStdString(aFeature->getKind()); setActionEnabled(aFeatureId, true); setNestedCommandsEnabled(true, aFeatureId);