X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_ContextMenuMgr.cpp;h=226aa30dda252dfedcba4bca6b533df7f10a1a5d;hb=4838c3a4883dd0f7194d4fe672381a4e82f9469c;hp=178fc3f9daa7439bafe21732c0ac2305aba676ac;hpb=e29f901221e0f39da359f7401c09f3d0afd58d2a;p=modules%2Fshaper.git diff --git a/src/XGUI/XGUI_ContextMenuMgr.cpp b/src/XGUI/XGUI_ContextMenuMgr.cpp index 178fc3f9d..226aa30dd 100644 --- a/src/XGUI/XGUI_ContextMenuMgr.cpp +++ b/src/XGUI/XGUI_ContextMenuMgr.cpp @@ -1,4 +1,21 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D --> +// Copyright (C) 2014-2019 CEA/DEN, EDF R&D +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include "XGUI_ContextMenuMgr.h" #include "XGUI_Workshop.h" @@ -6,8 +23,9 @@ #include "XGUI_SelectionMgr.h" #include "XGUI_Displayer.h" #include "XGUI_ViewerProxy.h" -#include "XGUI_Selection.h" #include "XGUI_SalomeConnector.h" +#include "XGUI_Selection.h" +#include "XGUI_SelectionActivate.h" #include "XGUI_DataModel.h" #include "XGUI_OperationMgr.h" #include "XGUI_Tools.h" @@ -28,6 +46,10 @@ #include #include #include +#include +#include +#include +#include #include @@ -44,11 +66,10 @@ #include #include - XGUI_ContextMenuMgr::XGUI_ContextMenuMgr(XGUI_Workshop* theParent) : QObject(theParent), myWorkshop(theParent), - mySeparator(0) + mySeparator1(0), mySeparator2(0), mySeparator3(0) { } @@ -86,6 +107,13 @@ void XGUI_ContextMenuMgr::createActions() aAction = ModuleBase_Tools::createAction(QIcon(":pictures/color.png"), tr("Color..."), aDesktop); addAction("COLOR_CMD", aAction); + aAction = ModuleBase_Tools::createAction(QIcon(""), tr("Deflection..."), aDesktop); + addAction("DEFLECTION_CMD", aAction); + + aAction = ModuleBase_Tools::createAction(QIcon(":pictures/transparency.png"), + tr("Transparency..."), aDesktop); + addAction("TRANSPARENCY_CMD", aAction); + aAction = ModuleBase_Tools::createAction(QIcon(":pictures/eye_pencil.png"), tr("Show"), aDesktop); addAction("SHOW_CMD", aAction); @@ -108,35 +136,34 @@ void XGUI_ContextMenuMgr::createActions() aDesktop); addAction("WIREFRAME_CMD", aAction); - mySeparator = ModuleBase_Tools::createAction(QIcon(), "", aDesktop); - mySeparator->setSeparator(true); + mySeparator1 = ModuleBase_Tools::createAction(QIcon(), "", aDesktop); + mySeparator1->setSeparator(true); - //mySelectActions = new QActionGroup(this); - //mySelectActions->setExclusive(true); + mySeparator2 = ModuleBase_Tools::createAction(QIcon(), "", aDesktop); + mySeparator2->setSeparator(true); + + mySeparator3 = ModuleBase_Tools::createAction(QIcon(), "", aDesktop); + mySeparator3->setSeparator(true); aAction = ModuleBase_Tools::createAction(QIcon(":pictures/vertex.png"), tr("Vertices"), aDesktop, this, SLOT(onShapeSelection(bool))); aAction->setCheckable(true); addAction("SELECT_VERTEX_CMD", aAction); - //mySelectActions->addAction(aAction); aAction = ModuleBase_Tools::createAction(QIcon(":pictures/edge.png"), tr("Edges"), aDesktop, this, SLOT(onShapeSelection(bool))); aAction->setCheckable(true); addAction("SELECT_EDGE_CMD", aAction); - //mySelectActions->addAction(aAction); aAction = ModuleBase_Tools::createAction(QIcon(":pictures/face.png"), tr("Faces"), aDesktop, this, SLOT(onShapeSelection(bool))); aAction->setCheckable(true); addAction("SELECT_FACE_CMD", aAction); - //mySelectActions->addAction(aAction); - aAction = ModuleBase_Tools::createAction(QIcon(":pictures/result.png"), tr("Result"), aDesktop, + aAction = ModuleBase_Tools::createAction(QIcon(":pictures/result.png"), tr("Results"), aDesktop, this, SLOT(onResultSelection(bool))); aAction->setCheckable(true); addAction("SELECT_RESULT_CMD", aAction); - //mySelectActions->addAction(aAction); aAction->setChecked(true); @@ -148,6 +175,40 @@ void XGUI_ContextMenuMgr::createActions() tr("Select parent feature"), aDesktop); addAction("SHOW_FEATURE_CMD", aAction); +#ifdef TINSPECTOR + aAction = ModuleBase_Tools::createAction(QIcon(), tr("TInspector"), aDesktop); + addAction("TINSPECTOR_VIEW", aAction); +#endif + + // Features folders actions + aAction = ModuleBase_Tools::createAction(QIcon(":pictures/create_folder.png"), + tr("Insert a folder before"), aDesktop); + addAction("INSERT_FOLDER_CMD", aAction); + + aAction = ModuleBase_Tools::createAction(QIcon(":pictures/insert_folder_before.png"), + tr("Move into the previous folder"), aDesktop); + addAction("ADD_TO_FOLDER_BEFORE_CMD", aAction); + + aAction = ModuleBase_Tools::createAction(QIcon(":pictures/insert_folder_after.png"), + tr("Move into the next folder"), aDesktop); + addAction("ADD_TO_FOLDER_AFTER_CMD", aAction); + + aAction = ModuleBase_Tools::createAction(QIcon(":pictures/move_out_before.png"), + tr("Move out before the folder"), aDesktop); + addAction("ADD_OUT_FOLDER_BEFORE_CMD", aAction); + + aAction = ModuleBase_Tools::createAction(QIcon(":pictures/move_out_after.png"), + tr("Move out after the folder"), aDesktop); + addAction("ADD_OUT_FOLDER_AFTER_CMD", aAction); + + aAction = ModuleBase_Tools::createAction(QIcon(":pictures/normal-view-inversed.png"), + tr("Set view by inverted normal to face"), aDesktop); + addAction("SET_VIEW_INVERTEDNORMAL_CMD", aAction); + + aAction = ModuleBase_Tools::createAction(QIcon(":pictures/normal-view.png"), + tr("Set view by normal to face"), aDesktop); + addAction("SET_VIEW_NORMAL_CMD", aAction); + buildObjBrowserMenu(); buildViewerMenu(); } @@ -215,7 +276,7 @@ void XGUI_ContextMenuMgr::onContextMenuRequest(QContextMenuEvent* theEvent) } } -void XGUI_ContextMenuMgr::updateObjectBrowserMenu() +void XGUI_ContextMenuMgr::updateObjectBrowserMenu() { foreach(QAction* aAction, myActions) aAction->setEnabled(false); @@ -230,10 +291,13 @@ void XGUI_ContextMenuMgr::updateObjectBrowserMenu() bool hasFeature = false; bool hasParameter = false; bool hasCompositeOwner = false; + bool hasResultInHistory = false; + bool hasFolder = false; + bool canBeDeleted = true; ModuleBase_Tools::checkObjects(aObjects, hasResult, hasFeature, hasParameter, - hasCompositeOwner); + hasCompositeOwner, hasResultInHistory, hasFolder); //Process Feature - if (aSelected == 1) { + if (aSelected == 1) { // single selection ObjectPtr aObject = aObjects.first(); if (aObject) { if (hasResult && myWorkshop->canBeShaded(aObject)) { @@ -269,12 +333,19 @@ void XGUI_ContextMenuMgr::updateObjectBrowserMenu() if( aMgr->activeDocument() == aObject->document() ) { action("RENAME_CMD")->setEnabled(true); - action("DELETE_CMD")->setEnabled(!hasCompositeOwner); + if (aObject->groupName() == ModelAPI_ResultConstruction::group()) { + FeaturePtr aFeature = ModelAPI_Feature::feature(aObject); + canBeDeleted = aFeature->isInHistory(); + action("DELETE_CMD")->setEnabled(canBeDeleted); + } + else + action("DELETE_CMD")->setEnabled(!hasCompositeOwner); action("CLEAN_HISTORY_CMD")->setEnabled(!hasCompositeOwner && (hasFeature || hasParameter)); } } - } else { + // end single selection + } else { // multi-selection // parameter is commented because the actions are not in the list of result parameter actions if (hasResult /*&& (!hasParameter)*/) { action("SHOW_CMD")->setEnabled(true); @@ -282,8 +353,108 @@ void XGUI_ContextMenuMgr::updateObjectBrowserMenu() action("SHOW_ONLY_CMD")->setEnabled(true); action("SHADING_CMD")->setEnabled(true); action("WIREFRAME_CMD")->setEnabled(true); + + foreach(ObjectPtr aObj, aObjects) { + FeaturePtr aFeature = ModelAPI_Feature::feature(aObj); + if (!aFeature->isInHistory()) { + canBeDeleted = false; + break; + } + } + action("DELETE_CMD")->setEnabled(canBeDeleted); } - } + } // end multi-selection + + // Check folder management commands state if only features are selected + if ((!hasResult) && hasFeature && (!hasParameter) && (!hasCompositeOwner) && + (!hasResultInHistory) && (!hasFolder)) { + std::list aFeatures = aSelMgr->getSelectedFeatures(); + if (aFeatures.size() > 0) { // Check that features do not include Parts + QModelIndexList aIndexes = aSelMgr->selection()->selectedIndexes(); + QModelIndex aFirstIdx = aIndexes.first(); + QModelIndex aLastIdx = aIndexes.last(); + QModelIndex aParentIdx = aFirstIdx.parent(); + + // if all selected are from the same level + bool isSameParent = true; + foreach(QModelIndex aIdx, aIndexes) { + if (aIdx.parent() != aParentIdx) { + isSameParent = false; + break; + } + } + if (isSameParent) { + // Check is selection continuous + XGUI_DataModel* aModel = myWorkshop->objectBrowser()->dataModel(); + DocumentPtr aDoc = aMgr->activeDocument(); + std::list aFeatures = aSelMgr->getSelectedFeatures(); + + bool isContinuos = true; + if (aSelected > 1) { + int aId = -1; + foreach(FeaturePtr aF, aFeatures) { + if (aId == -1) + aId = aDoc->index(aF); + else { + aId++; + if (aId != aDoc->index(aF)) { + isContinuos = false; + break; + } + } + } + } + if (isContinuos) { + ObjectPtr aDataObj = aModel->object(aParentIdx); + + ObjectPtr aPrevObj; + if (aFirstIdx.row() > 0) { + QModelIndex aPrevIdx = aFirstIdx.sibling(aFirstIdx.row() - 1, 0); + aPrevObj = aModel->object(aPrevIdx); + } + + ObjectPtr aNextObj; + if (aLastIdx.row() < (aModel->rowCount(aParentIdx) - 1)) { + QModelIndex aNextIdx = aFirstIdx.sibling(aLastIdx.row() + 1, 0); + aNextObj = aModel->object(aNextIdx); + } + + bool isPrevFolder = (aPrevObj.get() && + (aPrevObj->groupName() == ModelAPI_Folder::group())); + bool isNextFolder = (aNextObj.get() && + (aNextObj->groupName() == ModelAPI_Folder::group())); + bool isInFolder = (aDataObj.get() && + (aDataObj->groupName() == ModelAPI_Folder::group())); + bool isOutsideFolder = !isInFolder; + + bool hasFirst = false; + bool hasLast = false; + if (isInFolder) { + FolderPtr aFolder = std::dynamic_pointer_cast(aDataObj); + FeaturePtr aFirstFeatureInFolder; + AttributeReferencePtr aFirstFeatAttr = + aFolder->data()->reference(ModelAPI_Folder::FIRST_FEATURE_ID()); + if (aFirstFeatAttr) + aFirstFeatureInFolder = ModelAPI_Feature::feature(aFirstFeatAttr->value()); + hasFirst = (aFirstFeatureInFolder == aFeatures.front()); + + FeaturePtr aLastFeatureInFolder; + AttributeReferencePtr aLastFeatAttr = + aFolder->data()->reference(ModelAPI_Folder::LAST_FEATURE_ID()); + if (aLastFeatAttr) + aLastFeatureInFolder = ModelAPI_Feature::feature(aLastFeatAttr->value()); + hasLast = (aLastFeatureInFolder == aFeatures.back()); + } + action("INSERT_FOLDER_CMD")->setEnabled(isOutsideFolder); + action("ADD_TO_FOLDER_BEFORE_CMD")->setEnabled(isOutsideFolder && isPrevFolder); + action("ADD_TO_FOLDER_AFTER_CMD")->setEnabled(isOutsideFolder && isNextFolder); + action("ADD_OUT_FOLDER_BEFORE_CMD")->setEnabled(isInFolder && hasFirst); + action("ADD_OUT_FOLDER_AFTER_CMD")->setEnabled(isInFolder && hasLast); + } + } + } + } // end folder management commands + bool allActive = true; foreach( ObjectPtr aObject, aObjects ) if( aMgr->activeDocument() != aObject->document() ) { @@ -291,15 +462,15 @@ void XGUI_ContextMenuMgr::updateObjectBrowserMenu() break; } if (!hasCompositeOwner && allActive ) { - if (hasFeature || hasParameter) - action("DELETE_CMD")->setEnabled(true); + if (hasResult || hasFeature || hasParameter) // #2924 results can be erased + action("DELETE_CMD")->setEnabled(canBeDeleted); } if (!hasCompositeOwner && allActive && (hasFeature|| hasParameter)) action("CLEAN_HISTORY_CMD")->setEnabled(true); action("SHOW_RESULTS_CMD")->setEnabled(hasFeature); - action("SHOW_FEATURE_CMD")->setEnabled(hasResult); - } + action("SHOW_FEATURE_CMD")->setEnabled(hasResult && hasResultInHistory); + } // end selection processing // Show/Hide command has to be disabled for objects from non active document bool aDeactivate = false; @@ -313,14 +484,21 @@ void XGUI_ContextMenuMgr::updateObjectBrowserMenu() } } if (aDeactivate) { - // If at leas a one objec can not be edited then Show/Hide has to be disabled + // If at leas a one object 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); + action("COLOR_CMD")->setEnabled(myWorkshop->canChangeProperty("COLOR_CMD")); + action("DEFLECTION_CMD")->setEnabled(myWorkshop->canChangeProperty("DEFLECTION_CMD")); + action("TRANSPARENCY_CMD")->setEnabled(myWorkshop->canChangeProperty("TRANSPARENCY_CMD")); + #ifdef _DEBUG + #ifdef TINSPECTOR + action("TINSPECTOR_VIEW")->setEnabled(true); + #endif + #endif + ModuleBase_IModule* aModule = myWorkshop->module(); if (aModule) @@ -334,20 +512,29 @@ void XGUI_ContextMenuMgr::updateViewerMenu() XGUI_SelectionMgr* aSelMgr = myWorkshop->selector(); XGUI_Displayer* aDisplayer = myWorkshop->displayer(); - QList aPrsList = aSelMgr->selection()->getSelected(ModuleBase_ISelection::Viewer); + QList aPrsList = + aSelMgr->selection()->getSelected(ModuleBase_ISelection::Viewer); if (aPrsList.size() > 0) { bool isVisible = false; bool isShading = false; bool canBeShaded = false; + bool hasPlanar = false; ObjectPtr aObject; foreach(ModuleBase_ViewerPrsPtr aPrs, aPrsList) { aObject = aPrs->object(); - ResultPtr aRes = std::dynamic_pointer_cast(aObject); - if (aRes && aRes->isDisplayed()) { + if (!aObject.get()) + continue; + GeomShapePtr aShape = aPrs->shape(); + if (aObject->isDisplayed()) { isVisible = true; canBeShaded = myWorkshop->displayer()->canBeShaded(aObject); - isShading = (myWorkshop->displayer()->displayMode(aObject) == XGUI_Displayer::Shading); - break; + isShading = + (myWorkshop->displayer()->displayMode(aObject) == XGUI_Displayer::Shading); + } + if (aShape.get()) { + if (aShape->isPlanar()) { + hasPlanar = true; + } } } if (isVisible) { @@ -365,12 +552,20 @@ void XGUI_ContextMenuMgr::updateViewerMenu() action("HIDE_CMD")->setEnabled(true); } else action("SHOW_CMD")->setEnabled(true); + + action("SET_VIEW_NORMAL_CMD")->setEnabled(hasPlanar); + action("SET_VIEW_INVERTEDNORMAL_CMD")->setEnabled(hasPlanar); } + //issue #2159 Hide all incomplete behavior +#ifdef HAVE_SALOME + action("HIDEALL_CMD")->setEnabled(true); +#else if (myWorkshop->displayer()->objectsCount() > 0) action("HIDEALL_CMD")->setEnabled(true); +#endif // Update selection menu - QIntList aModes = aDisplayer->activeSelectionModes(); + QIntList aModes = myWorkshop->selectionActivate()->activeSelectionModes(); action("SELECT_VERTEX_CMD")->setEnabled(true); action("SELECT_EDGE_CMD")->setEnabled(true); action("SELECT_FACE_CMD")->setEnabled(true); @@ -386,10 +581,10 @@ void XGUI_ContextMenuMgr::updateViewerMenu() } else { foreach(int aMode, aModes) { switch (aMode) { - case TopAbs_VERTEX: + case TopAbs_VERTEX: action("SELECT_VERTEX_CMD")->setChecked(true); break; - case TopAbs_EDGE: + case TopAbs_EDGE: action("SELECT_EDGE_CMD")->setChecked(true); break; case TopAbs_FACE: @@ -399,16 +594,23 @@ void XGUI_ContextMenuMgr::updateViewerMenu() action("SELECT_RESULT_CMD")->setChecked(true); } } - } + } ModuleBase_IModule* aModule = myWorkshop->module(); if (aModule) aModule->updateViewerMenu(myActions); - if (myWorkshop->canChangeColor()) + if (myWorkshop->canChangeProperty("COLOR_CMD")) action("COLOR_CMD")->setEnabled(true); - action("DELETE_CMD")->setEnabled(true); + if (myWorkshop->canChangeProperty("DEFLECTION_CMD")) + action("DEFLECTION_CMD")->setEnabled(true); + + if (myWorkshop->canChangeProperty("TRANSPARENCY_CMD")) + action("TRANSPARENCY_CMD")->setEnabled(true); + + // Delete command is not used in viewer pop-up menu + action("DELETE_CMD")->setEnabled(false); } void XGUI_ContextMenuMgr::connectObjectBrowser() @@ -435,10 +637,14 @@ 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(mySeparator1); aList.append(action("RENAME_CMD")); aList.append(action("COLOR_CMD")); + aList.append(action("DEFLECTION_CMD")); + aList.append(action("TRANSPARENCY_CMD")); aList.append(action("SHOW_FEATURE_CMD")); + aList.append(mySeparator2); + aList.append(action("DELETE_CMD")); myObjBrowserMenus[ModelAPI_ResultConstruction::group()] = aList; //------------------------------------- @@ -446,18 +652,23 @@ void XGUI_ContextMenuMgr::buildObjBrowserMenu() aList.clear(); aList.append(action("WIREFRAME_CMD")); aList.append(action("SHADING_CMD")); - aList.append(mySeparator); // this separator is not shown as this action is added after show only + aList.append(mySeparator1); // this separator is not shown as this action is added after show only // qt list container contains only one instance of the same action aList.append(action("SHOW_CMD")); aList.append(action("HIDE_CMD")); aList.append(action("SHOW_ONLY_CMD")); - aList.append(mySeparator); + aList.append(mySeparator2); aList.append(action("RENAME_CMD")); aList.append(action("COLOR_CMD")); + aList.append(action("DEFLECTION_CMD")); + aList.append(action("TRANSPARENCY_CMD")); aList.append(action("SHOW_FEATURE_CMD")); + aList.append(mySeparator3); + aList.append(action("DELETE_CMD")); myObjBrowserMenus[ModelAPI_ResultBody::group()] = aList; // Group menu myObjBrowserMenus[ModelAPI_ResultGroup::group()] = aList; + myObjBrowserMenus[ModelAPI_ResultField::group()] = aList; // Result part menu myObjBrowserMenus[ModelAPI_ResultPart::group()] = aList; //------------------------------------- @@ -466,28 +677,53 @@ void XGUI_ContextMenuMgr::buildObjBrowserMenu() aList.append(action("RENAME_CMD")); aList.append(action("SHOW_RESULTS_CMD")); aList.append(action("MOVE_CMD")); - aList.append(mySeparator); + aList.append(mySeparator1); + aList.append(action("INSERT_FOLDER_CMD")); + aList.append(action("ADD_TO_FOLDER_BEFORE_CMD")); + aList.append(action("ADD_TO_FOLDER_AFTER_CMD")); + aList.append(mySeparator2); + aList.append(action("ADD_OUT_FOLDER_BEFORE_CMD")); + aList.append(action("ADD_OUT_FOLDER_AFTER_CMD")); + aList.append(mySeparator3); aList.append(action("CLEAN_HISTORY_CMD")); aList.append(action("DELETE_CMD")); myObjBrowserMenus[ModelAPI_Feature::group()] = aList; aList.clear(); aList.append(action("RENAME_CMD")); - aList.append(mySeparator); + aList.append(mySeparator1); aList.append(action("CLEAN_HISTORY_CMD")); aList.append(action("DELETE_CMD")); myObjBrowserMenus[ModelAPI_ResultParameter::group()] = aList; //------------------------------------- + + aList.clear(); + aList.append(action("RENAME_CMD")); + aList.append(action("DELETE_CMD")); + myObjBrowserMenus[ModelAPI_Folder::group()] = aList; + + //--------------------------------------- + // Step objects menu + aList.clear(); + aList.append(action("SHOW_CMD")); + aList.append(action("HIDE_CMD")); + aList.append(action("SHOW_ONLY_CMD")); + myObjBrowserMenus[ModelAPI_ResultField::ModelAPI_FieldStep::group()] = aList; } void XGUI_ContextMenuMgr::buildViewerMenu() { QActionsList aList; // Result construction menu - aList.append(action("HIDE_CMD")); - aList.append(action("SHOW_ONLY_CMD")); - aList.append(mySeparator); aList.append(action("COLOR_CMD")); + aList.append(action("DEFLECTION_CMD")); + aList.append(action("TRANSPARENCY_CMD")); + aList.append(mySeparator3); + aList.append(action("SET_VIEW_NORMAL_CMD")); + aList.append(action("SET_VIEW_INVERTEDNORMAL_CMD")); + aList.append(mySeparator1); + aList.append(action("SHOW_ONLY_CMD")); + aList.append(action("HIDE_CMD")); myViewerMenu[ModelAPI_ResultConstruction::group()] = aList; // Result part menu myViewerMenu[ModelAPI_ResultPart::group()] = aList; @@ -496,15 +732,25 @@ void XGUI_ContextMenuMgr::buildViewerMenu() aList.clear(); aList.append(action("WIREFRAME_CMD")); aList.append(action("SHADING_CMD")); - aList.append(mySeparator); - aList.append(action("HIDE_CMD")); - aList.append(action("SHOW_ONLY_CMD")); - aList.append(mySeparator); + aList.append(mySeparator2); aList.append(action("COLOR_CMD")); + aList.append(action("DEFLECTION_CMD")); + aList.append(action("TRANSPARENCY_CMD")); + aList.append(mySeparator3); + aList.append(action("SET_VIEW_NORMAL_CMD")); + aList.append(action("SET_VIEW_INVERTEDNORMAL_CMD")); + aList.append(mySeparator1); + aList.append(action("SHOW_ONLY_CMD")); + aList.append(action("HIDE_CMD")); myViewerMenu[ModelAPI_ResultBody::group()] = aList; // Group menu myViewerMenu[ModelAPI_ResultGroup::group()] = aList; + myViewerMenu[ModelAPI_ResultField::group()] = aList; //------------------------------------- + // Step objects menu + aList.clear(); + aList.append(action("HIDE_CMD")); + myViewerMenu[ModelAPI_ResultField::ModelAPI_FieldStep::group()] = aList; } @@ -528,16 +774,30 @@ void XGUI_ContextMenuMgr::addObjBrowserMenu(QMenu* theMenu) const } else if (aSelected > 1) { aActions.append(action("WIREFRAME_CMD")); aActions.append(action("SHADING_CMD")); - aActions.append(mySeparator); + aActions.append(mySeparator1); aActions.append(action("SHOW_CMD")); aActions.append(action("HIDE_CMD")); aActions.append(action("SHOW_ONLY_CMD")); - aActions.append(mySeparator); + aActions.append(mySeparator2); + aActions.append(action("ADD_TO_FOLDER_BEFORE_CMD")); + aActions.append(action("ADD_TO_FOLDER_AFTER_CMD")); + aActions.append(action("ADD_OUT_FOLDER_BEFORE_CMD")); + aActions.append(action("ADD_OUT_FOLDER_AFTER_CMD")); + aActions.append(mySeparator3); //aActions.append(action("MOVE_CMD")); aActions.append(action("COLOR_CMD")); + aActions.append(action("DEFLECTION_CMD")); + aActions.append(action("TRANSPARENCY_CMD")); aActions.append(action("CLEAN_HISTORY_CMD")); aActions.append(action("DELETE_CMD")); } +#ifdef _DEBUG + if (aSelected == 0) { + #ifdef TINSPECTOR + aActions.append(action("TINSPECTOR_VIEW")); + #endif + } +#endif theMenu->addActions(aActions); addFeatures(theMenu); @@ -549,15 +809,15 @@ void XGUI_ContextMenuMgr::addObjBrowserMenu(QMenu* theMenu) const void XGUI_ContextMenuMgr::addViewerMenu(QMenu* theMenu) const { XGUI_SelectionMgr* aSelMgr = myWorkshop->selector(); - QList aPrsList = aSelMgr->selection()->getSelected(ModuleBase_ISelection::Viewer); + QList aPrsList = + aSelMgr->selection()->getSelected(ModuleBase_ISelection::Viewer); int aSelected = aPrsList.size(); QActionsList aActions; // Create selection menu XGUI_OperationMgr* aOpMgr = myWorkshop->operationMgr(); - QIntList aModes; - myWorkshop->module()->activeSelectionModes(aModes); - if ((!aOpMgr->hasOperation()) && aModes.isEmpty()) { + if (!aOpMgr->hasOperation() && + myWorkshop->selectionActivate()->activeSelectionPlace() == XGUI_SelectionActivate::Workshop) { QMenu* aSelMenu = new QMenu(tr("Selection mode"), theMenu); aSelMenu->addAction(action("SELECT_VERTEX_CMD")); aSelMenu->addAction(action("SELECT_EDGE_CMD")); @@ -576,12 +836,15 @@ void XGUI_ContextMenuMgr::addViewerMenu(QMenu* theMenu) const aActions = myViewerMenu[aName]; } } else if (aSelected > 1) { + aActions.append(action("COLOR_CMD")); + aActions.append(action("DEFLECTION_CMD")); + aActions.append(action("TRANSPARENCY_CMD")); + aActions.append(mySeparator1); + aActions.append(action("SHOW_ONLY_CMD")); aActions.append(action("HIDE_CMD")); } // hide all is shown always even if selection in the viewer is empty aActions.append(action("HIDEALL_CMD")); - aActions.append(action("COLOR_CMD")); - theMenu->addActions(aActions); QMap aMenuActions; @@ -639,7 +902,7 @@ void XGUI_ContextMenuMgr::onRename() { QObjectPtrList anObjects = myWorkshop->selector()->selection()->selectedObjects(); if (!myWorkshop->abortAllOperations()) - return; + return; // restore selection in case if dialog box was shown myWorkshop->objectBrowser()->setObjectsSelected(anObjects); myWorkshop->objectBrowser()->onEditItem(); @@ -660,25 +923,23 @@ void XGUI_ContextMenuMgr::addFeatures(QMenu* theMenu) const bool aIsRoot = false; foreach(QModelIndex aIdx, aSelectedIndexes) { // Process only first column - if (aIdx.column() == 0) { + if (aIdx.column() == 1) { aIsRoot = !aIdx.parent().isValid(); // Exit if the selected index belongs to non active document if (aIsRoot && (aActiveDoc != aMgr->moduleDocument())) return; - if ((!aIsRoot) && (aIdx.internalPointer() != aActiveDoc.get())) - return; - + // Get name of the selected index aName = aIdx.data().toString(); aLen = aName.indexOf('('); if (aLen != -1) { aName = aName.left(--aLen); } - std::string aFeaturesStr = aIsRoot? + std::string aFeaturesStr = aIsRoot? aDataModelXML->rootFolderFeatures(aName.toStdString()) : aDataModelXML->subFolderFeatures(aName.toStdString()); if (aFeaturesStr.length() > 0) { - QStringList aFeturesList = + QStringList aFeturesList = QString(aFeaturesStr.c_str()).split(",", QString::SkipEmptyParts); foreach(QString aFea, aFeturesList) { QAction* aAction = aActionMgr->action(aFea);