Merge branch 'vsr/make_test' into Dev_1.5.0

[modules/shaper.git] / src / XGUI / XGUI_ContextMenuMgr.cpp

diff --git a/src/XGUI/XGUI_ContextMenuMgr.cpp b/src/XGUI/XGUI_ContextMenuMgr.cpp
index 1a138f747dd4282a49a217cc59df5b818ea19dd4..190f2ef3d50e54ab4cc89b3d33ffc4c52079ec43 100644 (file)
--- a/src/XGUI/XGUI_ContextMenuMgr.cpp
+++ b/src/XGUI/XGUI_ContextMenuMgr.cpp
@@ -8,6 +8,9 @@
 #include "XGUI_ViewerProxy.h"
 #include "XGUI_Selection.h"
 #include "XGUI_SalomeConnector.h"
+#include "XGUI_DataModel.h"
+#include "XGUI_OperationMgr.h"
+#include "XGUI_Tools.h"
 
 #include <AppElements_MainWindow.h>
 
@@ -25,6 +28,7 @@
 
 #include <ModuleBase_IModule.h>
 #include <ModuleBase_Tools.h>
+#include <ModuleBase_OperationAction.h>
 
 #include <QAction>
 #include <QContextMenuEvent>
@@ -59,7 +63,7 @@ void XGUI_ContextMenuMgr::createActions()
   addAction("RENAME_CMD", aAction);
   connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onRename()));
 
-  aAction = new QAction(QIcon(":pictures/move.png"), tr("Move..."), this);
+  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);
@@ -176,8 +180,14 @@ void XGUI_ContextMenuMgr::updateObjectBrowserMenu()
       ObjectPtr aObject = aObjects.first();
       if (aObject) {
         if (hasResult && myWorkshop->canBeShaded(aObject)) {
-          action("WIREFRAME_CMD")->setEnabled(true);
-          action("SHADING_CMD")->setEnabled(true);
+          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) {
           bool aHasSubResults = ModelAPI_Tools::hasSubResults(
@@ -217,8 +227,7 @@ void XGUI_ContextMenuMgr::updateObjectBrowserMenu()
     }
     bool allActive = true;
     foreach( ObjectPtr aObject, aObjects )
-      if( aMgr->activeDocument() != aObject->document() )
-      {
+      if( aMgr->activeDocument() != aObject->document() )  {
         allActive = false;
         break;
       }
@@ -228,10 +237,19 @@ void XGUI_ContextMenuMgr::updateObjectBrowserMenu()
     }
   }
 
-  bool isPartSetDocActive = 
-    ModelAPI_Session::get()->activeDocument()==ModelAPI_Session::get()->moduleDocument();
-  if( !isPartSetDocActive )
-  {
+  // 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);
@@ -269,8 +287,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);
@@ -401,6 +426,7 @@ void XGUI_ContextMenuMgr::addObjBrowserMenu(QMenu* theMenu) const
       aActions.append(mySeparator);
       aActions.append(action("DELETE_CMD"));
       //aActions.append(action("MOVE_CMD"));
+      aActions.append(action("COLOR_CMD"));
   }
   theMenu->addActions(aActions);
 
@@ -429,8 +455,10 @@ void XGUI_ContextMenuMgr::addViewerMenu(QMenu* theMenu) const
     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"));
   }
   theMenu->addActions(aActions);
 
@@ -467,5 +495,9 @@ QStringList XGUI_ContextMenuMgr::actionObjectGroups(const QString& theName)
 
 void XGUI_ContextMenuMgr::onRename()
 {
+  ModuleBase_OperationAction* anAction = new ModuleBase_OperationAction("Rename", this);
+  XGUI_OperationMgr* anOpMgr = myWorkshop->operationMgr();
+  anOpMgr->startOperation(anAction);
   myWorkshop->objectBrowser()->onEditItem();
+  anOpMgr->commitOperation();
 }