X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_ContextMenuMgr.cpp;h=57c622ac3ad66bfe5408be5e957258228c4cd44f;hb=868158fe6d39b25e60ac528295b1c908821e4af5;hp=8da4ebda28455e529d251aa028209ec78aff7918;hpb=e655a7347d0a53f15d1f1ee5ff6fbcbb3001124e;p=modules%2Fshaper.git

diff --git a/src/XGUI/XGUI_ContextMenuMgr.cpp b/src/XGUI/XGUI_ContextMenuMgr.cpp
index 8da4ebda2..57c622ac3 100644
--- a/src/XGUI/XGUI_ContextMenuMgr.cpp
+++ b/src/XGUI/XGUI_ContextMenuMgr.cpp
@@ -8,8 +8,13 @@
 #include "XGUI_ViewerProxy.h"
 #include "XGUI_Selection.h"
 #include "XGUI_SalomeConnector.h"
+#include "XGUI_DataModel.h"
+#include "XGUI_OperationMgr.h"
+#include "XGUI_Tools.h"
 
+#ifndef HAVE_SALOME
 #include <AppElements_MainWindow.h>
+#endif
 
 //#include "PartSetPlugin_Part.h"
 
@@ -21,14 +26,17 @@
 #include <ModelAPI_ResultParameter.h>
 #include <ModelAPI_ResultConstruction.h>
 #include <ModelAPI_ResultBody.h>
+#include <ModelAPI_Tools.h>
 
 #include <ModuleBase_IModule.h>
 #include <ModuleBase_Tools.h>
+#include <ModuleBase_OperationAction.h>
 
 #include <QAction>
 #include <QContextMenuEvent>
 #include <QMenu>
 #include <QMdiArea>
+#include <QMainWindow>
 
 
 XGUI_ContextMenuMgr::XGUI_ContextMenuMgr(XGUI_Workshop* theParent)
@@ -44,17 +52,24 @@ XGUI_ContextMenuMgr::~XGUI_ContextMenuMgr()
 
 void XGUI_ContextMenuMgr::createActions()
 {
-  QAction* aAction = new QAction(QIcon(":pictures/delete.png"), tr("Delete"), this);
+#ifdef HAVE_SALOME
+  QMainWindow* aDesktop = myWorkshop->salomeConnector()->desktop();
+#else
   QMainWindow* aDesktop = myWorkshop->mainWindow();
-  if (!aDesktop)
-    aDesktop = myWorkshop->salomeConnector()->desktop();
+#endif
+
+  QAction* aAction = new QAction(QIcon(":pictures/delete.png"), tr("Delete"), this);
   aDesktop->addAction(aAction);
 
   addAction("DELETE_CMD", aAction);
   aAction->setShortcut(Qt::Key_Delete);
   aAction->setShortcutContext(Qt::ApplicationShortcut);
 
-  aAction = new QAction(QIcon(":pictures/move.png"), tr("Move..."), this);
+  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"), XGUI_Workshop::MOVE_TO_END_COMMAND, this);
   addAction("MOVE_CMD", aAction);
 
   aAction = new QAction(QIcon(":pictures/color.png"), tr("Color..."), this);
@@ -129,13 +144,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)) {
@@ -163,36 +178,52 @@ 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)) {
+          XGUI_Displayer::DisplayMode aMode = aDisplayer->displayMode(aObject);
+          if (aMode != XGUI_Displayer::NoMode) {
+            action("WIREFRAME_CMD")->setEnabled(aMode == XGUI_Displayer::Shading);
+            action("SHADING_CMD")->setEnabled(aMode == XGUI_Displayer::Wireframe);
+          } else {
+            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<ModelAPI_Result>(aObject));
+          if (aHasSubResults) {
             action("HIDE_CMD")->setEnabled(true);
-          } else if (hasResult && (!hasParameter)) {
             action("SHOW_CMD")->setEnabled(true);
           }
-
-          ResultPartPtr aPartRes = std::dynamic_pointer_cast<ModelAPI_ResultPart>(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(!hasSubFeature);
+        }
       }
     } 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);
@@ -200,11 +231,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()
@@ -213,13 +275,14 @@ void XGUI_ContextMenuMgr::updateViewerMenu()
     aAction->setEnabled(false);
 
   XGUI_SelectionMgr* aSelMgr = myWorkshop->selector();
-  QObjectPtrList aObjects = aSelMgr->selection()->selectedObjects();
-  if (aObjects.size() > 0) {
+  QList<ModuleBase_ViewerPrs> 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<ModelAPI_Result>(aObject);
       if (aRes && aRes->isDisplayed()) {
         isVisible = true;
@@ -230,8 +293,15 @@ void XGUI_ContextMenuMgr::updateViewerMenu()
     }
     if (isVisible) {
       if (canBeShaded) {
-        action("WIREFRAME_CMD")->setEnabled(true);
-        action("SHADING_CMD")->setEnabled(true);
+        XGUI_Displayer* aDisplayer = myWorkshop->displayer();
+        XGUI_Displayer::DisplayMode aMode = aDisplayer->displayMode(aObject);
+        if (aMode != XGUI_Displayer::NoMode) {
+          action("WIREFRAME_CMD")->setEnabled(aMode == XGUI_Displayer::Shading);
+          action("SHADING_CMD")->setEnabled(aMode == XGUI_Displayer::Wireframe);
+        } else {
+          action("WIREFRAME_CMD")->setEnabled(true);
+          action("SHADING_CMD")->setEnabled(true);
+        }
       }
       action("SHOW_ONLY_CMD")->setEnabled(true);
       action("HIDE_CMD")->setEnabled(true);
@@ -244,6 +314,10 @@ void XGUI_ContextMenuMgr::updateViewerMenu()
     action("COLOR_CMD")->setEnabled(true);
 
   action("DELETE_CMD")->setEnabled(true);
+
+  ModuleBase_IModule* aModule = myWorkshop->module();
+  if (aModule)
+    aModule->updateViewerMenu(myActions);
 }
 
 void XGUI_ContextMenuMgr::connectObjectBrowser()
@@ -271,9 +345,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();
@@ -284,18 +358,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;
   //-------------------------------------
 }
@@ -306,7 +388,6 @@ void XGUI_ContextMenuMgr::buildViewerMenu()
   // Result construction menu
   aList.append(action("HIDE_CMD"));
   aList.append(action("SHOW_ONLY_CMD"));
-  aList.append(action("HIDEALL_CMD"));
   aList.append(action("COLOR_CMD"));
   myViewerMenu[ModelAPI_ResultConstruction::group()] = aList;
   // Result part menu
@@ -320,7 +401,6 @@ void XGUI_ContextMenuMgr::buildViewerMenu()
   aList.append(mySeparator);
   aList.append(action("HIDE_CMD"));
   aList.append(action("SHOW_ONLY_CMD"));
-  aList.append(action("HIDEALL_CMD"));
   myViewerMenu[ModelAPI_ResultBody::group()] = aList;
   // Group menu
   myViewerMenu[ModelAPI_ResultGroup::group()] = aList;
@@ -329,9 +409,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();
@@ -351,50 +430,52 @@ QMenu* XGUI_ContextMenuMgr::objBrowserMenu() const
       aActions.append(mySeparator);
       aActions.append(action("DELETE_CMD"));
       //aActions.append(action("MOVE_CMD"));
+      aActions.append(action("COLOR_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<ModuleBase_ViewerPrs> 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];
+    aActions.append(action("COLOR_CMD"));
   } else if (aSelected > 1) {
     aActions.append(action("HIDE_CMD"));
+    aActions.append(action("COLOR_CMD"));
   }
-  aMenu->addActions(aActions);
-
-  if (!myWorkshop->isSalomeMode()) {
-    aMenu->addSeparator();
-    QMdiArea* aMDI = myWorkshop->mainWindow()->mdiArea();
-    if (aMDI->actions().size() > 0) {
-      QMenu* aSubMenu = aMenu->addMenu(tr("Windows"));
-      aSubMenu->addActions(aMDI->actions());
-    }
+  // hide all is shown always even if selection in the viewer is empty
+  aActions.append(action("HIDEALL_CMD"));
+  theMenu->addActions(aActions);
+
+#ifndef HAVE_SALOME
+  theMenu->addSeparator();
+  QMdiArea* aMDI = myWorkshop->mainWindow()->mdiArea();
+  if (aMDI->actions().size() > 0) {
+    QMenu* aSubMenu = theMenu->addMenu(tr("Windows"));
+    aSubMenu->addActions(aMDI->actions());
   }
-  return aMenu;
+#endif
 }
 
 QStringList XGUI_ContextMenuMgr::actionObjectGroups(const QString& theName)
@@ -417,3 +498,13 @@ QStringList XGUI_ContextMenuMgr::actionObjectGroups(const QString& theName)
   }
   return aGroups;
 }
+
+void XGUI_ContextMenuMgr::onRename()
+{
+  QObjectPtrList anObjects = myWorkshop->selector()->selection()->selectedObjects();
+  if (!myWorkshop->abortAllOperations())
+    return; 
+  // restore selection in case if dialog box was shown
+  myWorkshop->objectBrowser()->setObjectsSelected(anObjects);
+  myWorkshop->objectBrowser()->onEditItem();
+}