X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_ContextMenuMgr.cpp;h=ad3ce3ea8e4b537be2190ecc55ed9e7c06654b3b;hb=64fc7e4fdd63997ec7a502b233ef5f88186d5bbb;hp=a91cf9defa0d6b2b40d14ecf12fcb8e4d6f2c09b;hpb=9ce7c711842c30d7c95d3a43e4190c7d98fb9952;p=modules%2Fshaper.git diff --git a/src/XGUI/XGUI_ContextMenuMgr.cpp b/src/XGUI/XGUI_ContextMenuMgr.cpp index a91cf9def..ad3ce3ea8 100644 --- a/src/XGUI/XGUI_ContextMenuMgr.cpp +++ b/src/XGUI/XGUI_ContextMenuMgr.cpp @@ -8,6 +8,7 @@ #include "XGUI_ViewerProxy.h" #include "XGUI_Selection.h" #include "XGUI_SalomeConnector.h" +#include "XGUI_DataModel.h" #include @@ -21,6 +22,7 @@ #include #include #include +#include #include #include @@ -54,6 +56,13 @@ void XGUI_ContextMenuMgr::createActions() aAction->setShortcut(Qt::Key_Delete); aAction->setShortcutContext(Qt::ApplicationShortcut); + aAction = new QAction(QIcon(":pictures/rename_edit.png"), tr("Rename"), this); + addAction("RENAME_CMD", aAction); + connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onRename())); + + aAction = new QAction(QIcon(":pictures/move.png"), tr("Move to the end"), this); + addAction("MOVE_CMD", aAction); + aAction = new QAction(QIcon(":pictures/color.png"), tr("Color..."), this); addAction("COLOR_CMD", aAction); @@ -126,13 +135,13 @@ void XGUI_ContextMenuMgr::updateCommandsStatus() void XGUI_ContextMenuMgr::onContextMenuRequest(QContextMenuEvent* theEvent) { - QMenu* aMenu = 0; + QMenu* aMenu = new QMenu(); if (sender() == myWorkshop->objectBrowser()) { updateObjectBrowserMenu(); - aMenu = objBrowserMenu(); + addObjBrowserMenu(aMenu); } else if (sender() == myWorkshop->viewer()) { updateViewerMenu(); - aMenu = viewerMenu(); + addViewerMenu(aMenu); } if (aMenu && (aMenu->actions().size() > 0)) { @@ -160,34 +169,46 @@ void XGUI_ContextMenuMgr::updateObjectBrowserMenu() bool hasResult = false; bool hasFeature = false; bool hasParameter = false; - ModuleBase_Tools::checkObjects(aObjects, hasResult, hasFeature, hasParameter); + bool hasSubFeature = false; + ModuleBase_Tools::checkObjects(aObjects, hasResult, hasFeature, hasParameter, hasSubFeature); //Process Feature if (aSelected == 1) { ObjectPtr aObject = aObjects.first(); if (aObject) { + if (hasResult && myWorkshop->canBeShaded(aObject)) { + action("WIREFRAME_CMD")->setEnabled(true); + action("SHADING_CMD")->setEnabled(true); + } if (!hasFeature) { - if (aObject->isDisplayed()) { - if (aDisplayer->canBeShaded(aObject)) { - action("WIREFRAME_CMD")->setEnabled(true); - action("SHADING_CMD")->setEnabled(true); - } + bool aHasSubResults = ModelAPI_Tools::hasSubResults( + std::dynamic_pointer_cast(aObject)); + if (aHasSubResults) { action("HIDE_CMD")->setEnabled(true); - } else if (hasResult && (!hasParameter)) { action("SHOW_CMD")->setEnabled(true); } - - ResultPartPtr aPartRes = std::dynamic_pointer_cast(aObject); - if (aPartRes) { - action("SHOW_CMD")->setEnabled(true); + else { + if (aObject->isDisplayed()) { + action("HIDE_CMD")->setEnabled(true); + } else if (hasResult && (!hasParameter)) { + action("SHOW_CMD")->setEnabled(true); + } } - if (!(hasParameter || hasFeature)) action("SHOW_ONLY_CMD")->setEnabled(true); } - } + else if (hasFeature && myWorkshop->canMoveFeature()) + action("MOVE_CMD")->setEnabled(true); + + if( aMgr->activeDocument() == aObject->document() ) + { + action("RENAME_CMD")->setEnabled(true); + action("DELETE_CMD")->setEnabled(true); + } + } } else { - if (hasResult && (!hasParameter)) { + // parameter is commented because the actions are not in the list of result parameter actions + if (hasResult /*&& (!hasParameter)*/) { action("SHOW_CMD")->setEnabled(true); action("HIDE_CMD")->setEnabled(true); action("SHOW_ONLY_CMD")->setEnabled(true); @@ -195,11 +216,42 @@ void XGUI_ContextMenuMgr::updateObjectBrowserMenu() action("WIREFRAME_CMD")->setEnabled(true); } } - if (hasFeature || hasParameter) - action("DELETE_CMD")->setEnabled(true); + bool allActive = true; + foreach( ObjectPtr aObject, aObjects ) + if( aMgr->activeDocument() != aObject->document() ) { + allActive = false; + break; + } + if (!hasSubFeature && allActive ) { + if (hasFeature || hasParameter) + action("DELETE_CMD")->setEnabled(true); + } } + + // Show/Hide command has to be disabled for objects from non active document + bool aDeactivate = false; + foreach (ObjectPtr aObj, aObjects) { + if (!aObj->document()->isActive()) { + if ((aObj->document() != ModelAPI_Session::get()->moduleDocument()) || + aObj->groupName() == ModelAPI_ResultPart::group()) { + aDeactivate = true; + break; + } + } + } + if (aDeactivate) { + // If at leas a one objec can not be edited then Show/Hide has to be disabled + action("SHOW_CMD")->setEnabled(false); + action("HIDE_CMD")->setEnabled(false); + action("SHOW_ONLY_CMD")->setEnabled(false); + } + if (myWorkshop->canChangeColor()) action("COLOR_CMD")->setEnabled(true); + + ModuleBase_IModule* aModule = myWorkshop->module(); + if (aModule) + aModule->updateObjectBrowserMenu(myActions); } void XGUI_ContextMenuMgr::updateViewerMenu() @@ -208,13 +260,14 @@ void XGUI_ContextMenuMgr::updateViewerMenu() aAction->setEnabled(false); XGUI_SelectionMgr* aSelMgr = myWorkshop->selector(); - QObjectPtrList aObjects = aSelMgr->selection()->selectedObjects(); - if (aObjects.size() > 0) { + QList aPrsList = aSelMgr->selection()->getSelected(ModuleBase_ISelection::Viewer); + if (aPrsList.size() > 0) { bool isVisible = false; bool isShading = false; bool canBeShaded = false; - foreach(ObjectPtr aObject, aObjects) - { + ObjectPtr aObject; + foreach(ModuleBase_ViewerPrs aPrs, aPrsList) { + aObject = aPrs.object(); ResultPtr aRes = std::dynamic_pointer_cast(aObject); if (aRes && aRes->isDisplayed()) { isVisible = true; @@ -237,6 +290,12 @@ void XGUI_ContextMenuMgr::updateViewerMenu() action("HIDEALL_CMD")->setEnabled(true); if (myWorkshop->canChangeColor()) action("COLOR_CMD")->setEnabled(true); + + action("DELETE_CMD")->setEnabled(true); + + ModuleBase_IModule* aModule = myWorkshop->module(); + if (aModule) + aModule->updateViewerMenu(myActions); } void XGUI_ContextMenuMgr::connectObjectBrowser() @@ -264,9 +323,9 @@ void XGUI_ContextMenuMgr::buildObjBrowserMenu() aList.append(action("HIDE_CMD")); aList.append(action("SHOW_ONLY_CMD")); aList.append(action("COLOR_CMD")); + aList.append(mySeparator); + aList.append(action("RENAME_CMD")); myObjBrowserMenus[ModelAPI_ResultConstruction::group()] = aList; - // Result part menu - myObjBrowserMenus[ModelAPI_ResultPart::group()] = aList; //------------------------------------- // Result body menu aList.clear(); @@ -277,14 +336,26 @@ void XGUI_ContextMenuMgr::buildObjBrowserMenu() aList.append(action("SHOW_CMD")); aList.append(action("HIDE_CMD")); aList.append(action("SHOW_ONLY_CMD")); + aList.append(mySeparator); + aList.append(action("RENAME_CMD")); myObjBrowserMenus[ModelAPI_ResultBody::group()] = aList; // Group menu myObjBrowserMenus[ModelAPI_ResultGroup::group()] = aList; + // Result part menu + myObjBrowserMenus[ModelAPI_ResultPart::group()] = aList; //------------------------------------- // Feature menu aList.clear(); aList.append(action("DELETE_CMD")); + aList.append(action("MOVE_CMD")); + aList.append(mySeparator); + aList.append(action("RENAME_CMD")); myObjBrowserMenus[ModelAPI_Feature::group()] = aList; + + aList.clear(); + aList.append(action("DELETE_CMD")); + aList.append(mySeparator); + aList.append(action("RENAME_CMD")); myObjBrowserMenus[ModelAPI_ResultParameter::group()] = aList; //------------------------------------- } @@ -318,9 +389,8 @@ void XGUI_ContextMenuMgr::buildViewerMenu() } -QMenu* XGUI_ContextMenuMgr::objBrowserMenu() const +void XGUI_ContextMenuMgr::addObjBrowserMenu(QMenu* theMenu) const { - QMenu* aMenu = new QMenu(); XGUI_SelectionMgr* aSelMgr = myWorkshop->selector(); QObjectPtrList aObjects = aSelMgr->selection()->selectedObjects(); int aSelected = aObjects.size(); @@ -331,53 +401,80 @@ QMenu* XGUI_ContextMenuMgr::objBrowserMenu() const if (myObjBrowserMenus.contains(aName)) aActions = myObjBrowserMenus[aName]; } else if (aSelected > 1) { + aActions.append(action("SHADING_CMD")); + aActions.append(action("WIREFRAME_CMD")); + aActions.append(mySeparator); + aActions.append(action("SHOW_CMD")); aActions.append(action("HIDE_CMD")); aActions.append(action("SHOW_ONLY_CMD")); aActions.append(mySeparator); - aActions.append(action("SHADING_CMD")); - aActions.append(action("WIREFRAME_CMD")); + aActions.append(action("DELETE_CMD")); + //aActions.append(action("MOVE_CMD")); } - aMenu->addActions(aActions); + theMenu->addActions(aActions); ModuleBase_IModule* aModule = myWorkshop->module(); if (aModule) { - aMenu->addSeparator(); - aModule->addObjectBrowserMenu(aMenu); + theMenu->addSeparator(); + aModule->addObjectBrowserMenu(theMenu); } - aMenu->addSeparator(); - aMenu->addActions(myWorkshop->objectBrowser()->actions()); - - return aMenu; + theMenu->addSeparator(); + theMenu->addActions(myWorkshop->objectBrowser()->actions()); } -QMenu* XGUI_ContextMenuMgr::viewerMenu() const +void XGUI_ContextMenuMgr::addViewerMenu(QMenu* theMenu) const { - QMenu* aMenu = new QMenu(); ModuleBase_IModule* aModule = myWorkshop->module(); - if (aModule) - aModule->addViewerMenu(aMenu, myActions); - + if (aModule) { + if (aModule->addViewerMenu(theMenu, myActions)) + theMenu->addSeparator(); + } XGUI_SelectionMgr* aSelMgr = myWorkshop->selector(); - QObjectPtrList aObjects = aSelMgr->selection()->selectedObjects(); - int aSelected = aObjects.size(); + QList aPrsList = aSelMgr->selection()->getSelected(ModuleBase_ISelection::Viewer); + int aSelected = aPrsList.size(); QActionsList aActions; if (aSelected == 1) { - ObjectPtr aObject = aObjects.first(); + ObjectPtr aObject = aPrsList.first().object(); std::string aName = aObject->groupName(); if (myViewerMenu.contains(aName)) aActions = myViewerMenu[aName]; } else if (aSelected > 1) { aActions.append(action("HIDE_CMD")); } - aMenu->addActions(aActions); + theMenu->addActions(aActions); if (!myWorkshop->isSalomeMode()) { - aMenu->addSeparator(); + theMenu->addSeparator(); QMdiArea* aMDI = myWorkshop->mainWindow()->mdiArea(); if (aMDI->actions().size() > 0) { - QMenu* aSubMenu = aMenu->addMenu(tr("Windows")); + QMenu* aSubMenu = theMenu->addMenu(tr("Windows")); aSubMenu->addActions(aMDI->actions()); } } - return aMenu; +} + +QStringList XGUI_ContextMenuMgr::actionObjectGroups(const QString& theName) +{ + QStringList aGroups; + + QMap::const_iterator anIt = myObjBrowserMenus.begin(), + aLast = myObjBrowserMenus.end(); + for (; anIt != aLast; anIt++) { + QString aGroupName(anIt.key().c_str()); + if (aGroups.contains(aGroupName)) + continue; + QActionsList anActions = anIt.value(); + QActionsList::const_iterator anAIt = anActions.begin(), anALast = anActions.end(); + bool aFound = false; + for (; anAIt != anALast && !aFound; anAIt++) + aFound = (*anAIt)->data().toString() == theName; + if (aFound) + aGroups.append(aGroupName); + } + return aGroups; +} + +void XGUI_ContextMenuMgr::onRename() +{ + myWorkshop->objectBrowser()->onEditItem(); }