Merge branch 'master' into BR_PYTHON_PLUGIN

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

diff --git a/src/XGUI/XGUI_ContextMenuMgr.cpp b/src/XGUI/XGUI_ContextMenuMgr.cpp
index 34c3341471d515eacffb195aa701b84d52ea4d6b..f951d7a279fc590625f6225a739585838f92caf9 100644 (file)
--- a/src/XGUI/XGUI_ContextMenuMgr.cpp
+++ b/src/XGUI/XGUI_ContextMenuMgr.cpp
@@ -13,6 +13,8 @@
 #include <ModelAPI_AttributeDocRef.h>
 #include <ModelAPI_Object.h>
 #include <ModelAPI_ResultPart.h>
+#include <ModelAPI_Session.h>
+#include <ModelAPI_ResultGroup.h>
 
 #include <QAction>
 #include <QContextMenuEvent>
@@ -51,6 +53,15 @@ void XGUI_ContextMenuMgr::createActions()
 
   aAction = new QAction(QIcon(":pictures/eye_pencil_closed.png"), tr("Hide"), this);
   addAction("HIDE_CMD", aAction);
+
+  aAction = new QAction(QIcon(":pictures/eye_pencil_closed.png"), tr("Hide all"), this);
+  addAction("HIDEALL_CMD", aAction);
+
+  aAction = new QAction(QIcon(":pictures/shading.png"), tr("Shading"), this);
+  addAction("SHADING_CMD", aAction);
+
+  aAction = new QAction(QIcon(":pictures/wireframe.png"), tr("Wireframe"), this);
+  addAction("WIREFRAME_CMD", aAction);
 }
 
 void XGUI_ContextMenuMgr::addAction(const QString& theId, QAction* theAction)
@@ -108,54 +119,68 @@ QMenu* XGUI_ContextMenuMgr::objectBrowserMenu() const
   if (aSelected > 0) {
     SessionPtr aMgr = ModelAPI_Session::get();
     XGUI_Displayer* aDisplayer = myWorkshop->displayer();
+    bool hasResult = false;
+    bool hasFeature = false;
+    bool hasGroup = false;
+    foreach(ObjectPtr aObj, aObjects)
+    {
+      FeaturePtr aFeature = boost::dynamic_pointer_cast<ModelAPI_Feature>(aObj);
+      ResultPtr aResult = boost::dynamic_pointer_cast<ModelAPI_Result>(aObj);
+      ResultGroupPtr aGroupRes = boost::dynamic_pointer_cast<ModelAPI_ResultGroup>(aObj);
+      if (aResult)
+        hasResult = true;
+      if (aFeature)
+        hasFeature = true;
+      if (aGroupRes)
+        hasGroup = true;
+      if (hasFeature && hasResult && hasGroup)
+        break;
+    }
     //Process Feature
-    if (aSelected == 1) {
-      ObjectPtr aObject = aObjects.first();
-      if (aObject) {
-        ResultPartPtr aPart = boost::dynamic_pointer_cast<ModelAPI_ResultPart>(aObject);
-        FeaturePtr aFeature = boost::dynamic_pointer_cast<ModelAPI_Feature>(aObject);
-        if (aPart) {
-          if (aMgr->currentDocument() == aPart->partDoc())
-            aMenu->addAction(action("DEACTIVATE_PART_CMD"));
-          else
-            aMenu->addAction(action("ACTIVATE_PART_CMD"));
-        } else if (aFeature) {
-          aMenu->addAction(action("EDIT_CMD"));
-        } else {
-          if (aDisplayer->isVisible(aObject))
-            aMenu->addAction(action("HIDE_CMD"));
-          else {
-            aMenu->addAction(action("SHOW_CMD"));
+    if (!hasGroup) {
+      if (aSelected == 1) {
+        ObjectPtr aObject = aObjects.first();
+        if (aObject) {
+          ResultPartPtr aPart = boost::dynamic_pointer_cast<ModelAPI_ResultPart>(aObject);
+          if (aPart) {
+            if (aMgr->activeDocument() == aPart->partDoc())
+              aMenu->addAction(action("DEACTIVATE_PART_CMD"));
+            else
+              aMenu->addAction(action("ACTIVATE_PART_CMD"));
+          } else if (hasFeature) {
+            aMenu->addAction(action("EDIT_CMD"));
+          } else {
+            if (aDisplayer->isVisible(aObject)) {
+              if (aDisplayer->displayMode(aObject) == XGUI_Displayer::Shading)
+                aMenu->addAction(action("WIREFRAME_CMD"));
+              else
+                aMenu->addAction(action("SHADING_CMD"));
+              aMenu->addSeparator();
+              aMenu->addAction(action("HIDE_CMD"));
+            } else {
+              aMenu->addAction(action("SHOW_CMD"));
+            }
+            aMenu->addAction(action("SHOW_ONLY_CMD"));
           }
+        } else {  // If feature is 0 the it means that selected root object (document)
+          if (aMgr->activeDocument() != aMgr->moduleDocument())
+            aMenu->addAction(action("ACTIVATE_PART_CMD"));
+        }
+      } else {
+        if (hasResult) {
+          aMenu->addAction(action("SHOW_CMD"));
+          aMenu->addAction(action("HIDE_CMD"));
           aMenu->addAction(action("SHOW_ONLY_CMD"));
+          aMenu->addSeparator();
+          aMenu->addAction(action("SHADING_CMD"));
+          aMenu->addAction(action("WIREFRAME_CMD"));
         }
-      } else {  // If feature is 0 the it means that selected root object (document)
-        if (aMgr->currentDocument() != aMgr->rootDocument())
-          aMenu->addAction(action("ACTIVATE_PART_CMD"));
-      }
-    } else if (aSelected >= 1) {
-      bool hasResult = false;
-      bool hasFeature = false;
-      foreach(ObjectPtr aObj, aObjects)
-      {
-        FeaturePtr aFeature = boost::dynamic_pointer_cast<ModelAPI_Feature>(aObj);
-        ResultPtr aResult = boost::dynamic_pointer_cast<ModelAPI_Result>(aObj);
-        if (aResult)
-          hasResult = true;
-        if (aFeature)
-          hasFeature = true;
-        if (hasFeature && hasResult)
-          break;
-      }
-      if (hasResult) {
-        aMenu->addAction(action("SHOW_CMD"));
-        aMenu->addAction(action("HIDE_CMD"));
-        aMenu->addAction(action("SHOW_ONLY_CMD"));
       }
       if (hasFeature)
         aMenu->addAction(action("DELETE_CMD"));
     }
   }
+  aMenu->addSeparator();
   aMenu->addActions(myWorkshop->objectBrowser()->actions());
   if (aMenu->actions().size() > 0) {
     return aMenu;
@@ -183,21 +208,32 @@ void XGUI_ContextMenuMgr::addViewerItems(QMenu* theMenu) const
     //if (aObjects.size() == 1)
     //  theMenu->addAction(action("EDIT_CMD"));
     bool isVisible = false;
+    bool isShading = false;
     foreach(ObjectPtr aObject, aObjects)
     {
       ResultPtr aRes = boost::dynamic_pointer_cast<ModelAPI_Result>(aObject);
       if (aRes && myWorkshop->displayer()->isVisible(aRes)) {
         isVisible = true;
+        isShading = (myWorkshop->displayer()->displayMode(aObject) == XGUI_Displayer::Shading);      
         break;
       }
     }
-    if (isVisible)
+    if (isVisible) {
+      if (isShading)
+        theMenu->addAction(action("WIREFRAME_CMD"));
+      else
+        theMenu->addAction(action("SHADING_CMD"));
+      theMenu->addSeparator();
+      theMenu->addAction(action("SHOW_ONLY_CMD"));
       theMenu->addAction(action("HIDE_CMD"));
-    else
+    } else
       theMenu->addAction(action("SHOW_CMD"));
     //theMenu->addAction(action("DELETE_CMD"));
   }
+  if (myWorkshop->displayer()->objectsCount() > 0)
+    theMenu->addAction(action("HIDEALL_CMD"));
   if (!myWorkshop->isSalomeMode()) {
+    theMenu->addSeparator();
     QMdiArea* aMDI = myWorkshop->mainWindow()->mdiArea();
     if (aMDI->actions().size() > 0) {
       QMenu* aSubMenu = theMenu->addMenu(tr("Windows"));