updated copyright message

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

diff --git a/src/XGUI/XGUI_ContextMenuMgr.cpp b/src/XGUI/XGUI_ContextMenuMgr.cpp
index d5b9bf15a782ee514f2f9a709c650e6fd01d5e3b..9550326bd0f1f6b7b0ad1c2db76d066724cd9142 100644 (file)
--- a/src/XGUI/XGUI_ContextMenuMgr.cpp
+++ b/src/XGUI/XGUI_ContextMenuMgr.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2020  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2023  CEA, EDF
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -66,6 +66,10 @@
 #include <QMainWindow>
 #include <QModelIndex>
 
+#ifdef WIN32
+#pragma warning(disable : 4456) // for nested foreach
+#endif
+
 XGUI_ContextMenuMgr::XGUI_ContextMenuMgr(XGUI_Workshop* theParent)
     : QObject(theParent),
       myWorkshop(theParent),
@@ -85,69 +89,90 @@ void XGUI_ContextMenuMgr::createActions()
   QMainWindow* aDesktop = myWorkshop->mainWindow();
 #endif
 
-  QAction* aAction = ModuleBase_Tools::createAction(QIcon(":pictures/delete.png"), tr("Delete"),
+  QAction* anAction = ModuleBase_Tools::createAction(QIcon(":pictures/delete.png"), tr("Delete"),
                                                     aDesktop);
-  aDesktop->addAction(aAction);
+  aDesktop->addAction(anAction);
 
-  addAction("DELETE_CMD", aAction);
-  aAction->setShortcutContext(Qt::ApplicationShortcut);
+  addAction("DELETE_CMD", anAction);
+  anAction->setShortcutContext(Qt::ApplicationShortcut);
 
-  aAction = ModuleBase_Tools::createAction(QIcon(":pictures/rename_edit.png"), tr("Rename"),
+  anAction = ModuleBase_Tools::createAction(QIcon(":pictures/rename_edit.png"), tr("Rename"),
                                            aDesktop, this, SLOT(onRename()));
-  aAction->setShortcut(Qt::Key_F2);
-  addAction("RENAME_CMD", aAction);
+  anAction->setShortcut(Qt::Key_F2);
+  addAction("RENAME_CMD", anAction);
 
-  aAction = ModuleBase_Tools::createAction(QIcon(":pictures/move_to_end.png"),
+#ifdef HAVE_SALOME
+  anAction = ModuleBase_Tools::createAction(QIcon(":pictures/move_to_end.png"),
                                            XGUI_Workshop::MOVE_TO_END_COMMAND, this);
-  addAction("MOVE_CMD", aAction);
+  addAction("MOVE_CMD", anAction);
 
-  aAction = ModuleBase_Tools::createAction(QIcon(":pictures/move_to_end_split.png"),
+  anAction = ModuleBase_Tools::createAction(QIcon(":pictures/move_to_end_split.png"),
     XGUI_Workshop::MOVE_TO_END_SPLIT_COMMAND, this);
-  addAction("MOVE_SPLIT_CMD", aAction);
+  addAction("MOVE_SPLIT_CMD", anAction);
+#endif
+
+  anAction = ModuleBase_Tools::createAction(QIcon(":pictures/recover.png"),
+    tr("Recover"), this);
+  addAction("RECOVER_CMD", anAction);
 
-  aAction = ModuleBase_Tools::createAction(QIcon(":pictures/clean_history.png"),
+  anAction = ModuleBase_Tools::createAction(QIcon(":pictures/clean_history.png"),
                                            tr("Clean history"), aDesktop);
-  addAction("CLEAN_HISTORY_CMD", aAction);
+  addAction("CLEAN_HISTORY_CMD", anAction);
 
-  aAction = ModuleBase_Tools::createAction(QIcon(":pictures/color.png"), tr("Color..."), aDesktop);
-  addAction("COLOR_CMD", aAction);
+  anAction = ModuleBase_Tools::createAction(QIcon(":pictures/color.png"), tr("Color..."), aDesktop);
+  addAction("COLOR_CMD", anAction);
 
-  aAction = ModuleBase_Tools::createAction(QIcon(""), tr("Deflection..."), aDesktop);
-  addAction("DEFLECTION_CMD", aAction);
+  anAction = ModuleBase_Tools::createAction(QIcon(":pictures/autocolor.png"),
+                                                  tr("Auto color"), aDesktop);
+  addAction("AUTOCOLOR_CMD", anAction);
 
-  aAction = ModuleBase_Tools::createAction(QIcon(":pictures/transparency.png"),
+  anAction = ModuleBase_Tools::createAction(QIcon(""), tr("Deflection..."), aDesktop);
+  addAction("DEFLECTION_CMD", anAction);
+
+  anAction = ModuleBase_Tools::createAction(QIcon(":pictures/transparency.png"),
                                            tr("Transparency..."), aDesktop);
-  addAction("TRANSPARENCY_CMD", aAction);
+  addAction("TRANSPARENCY_CMD", anAction);
 
-  aAction = ModuleBase_Tools::createAction(QIcon(":pictures/eye_pencil.png"), tr("Show"), aDesktop);
-  addAction("SHOW_CMD", aAction);
+  anAction = ModuleBase_Tools::createAction(QIcon(":pictures/eye_pencil.png"),
+                                                  tr("Show"), aDesktop);
+  addAction("SHOW_CMD", anAction);
 
-  aAction = ModuleBase_Tools::createAction(QIcon(":pictures/eye_pencil.png"), tr("Show only"),
-                                           aDesktop);
-  addAction("SHOW_ONLY_CMD", aAction);
+  anAction = ModuleBase_Tools::createAction(QIcon(":pictures/eye_pencil.png"),
+                                            tr("Show only"), aDesktop);
+  addAction("SHOW_ONLY_CMD", anAction);
 
-  aAction = ModuleBase_Tools::createAction(QIcon(":pictures/eye_pencil_closed.png"), tr("Hide"),
+  anAction = ModuleBase_Tools::createAction(QIcon(":pictures/eye_pencil_closed.png"), tr("Hide"),
                                            aDesktop);
-  addAction("HIDE_CMD", aAction);
+  addAction("HIDE_CMD", anAction);
 
-  aAction = ModuleBase_Tools::createAction(QIcon(":pictures/eye_pencil_closed.png"), tr("Hide all"),
-                                           aDesktop);
-  addAction("HIDEALL_CMD", aAction);
+  anAction = ModuleBase_Tools::createAction(QIcon(":pictures/eye_pencil_closed.png"),
+                                            tr("Hide all"), aDesktop);
+  addAction("HIDEALL_CMD", anAction);
 
-  aAction = ModuleBase_Tools::createAction(QIcon(":pictures/shading.png"), tr("Shading"), aDesktop);
-  addAction("SHADING_CMD", aAction);
+  anAction = ModuleBase_Tools::createAction(QIcon(":pictures/shading.png"),
+                                            tr("Shading"), aDesktop);
+  addAction("SHADING_CMD", anAction);
+
+  anAction = ModuleBase_Tools::createAction(QIcon(":pictures/wireframe.png"), tr("Wireframe"),
+                                           aDesktop);
+  addAction("WIREFRAME_CMD", anAction);
 
-  aAction = ModuleBase_Tools::createAction(QIcon(":pictures/wireframe.png"), tr("Wireframe"),
+  anAction = ModuleBase_Tools::createAction(QIcon(":pictures/edges_dir.png"), tr("Show edges direction"),
                                            aDesktop);
-  addAction("WIREFRAME_CMD", aAction);
+  anAction->setCheckable(true);
+  addAction("SHOW_EDGES_DIRECTION_CMD", anAction);
 
-  aAction = ModuleBase_Tools::createAction(QIcon(":pictures/iso_lines.png"), tr("Define Isos..."),
+  anAction = ModuleBase_Tools::createAction(QIcon(":pictures/iso_lines.png"), tr("Define Isos..."),
                                            aDesktop);
-  addAction("ISOLINES_CMD", aAction);
+  addAction("ISOLINES_CMD", anAction);
 
-  aAction = ModuleBase_Tools::createAction(QIcon(), tr("Show Isos"), aDesktop);
-  aAction->setCheckable(true);
-  addAction("SHOW_ISOLINES_CMD", aAction);
+  anAction = ModuleBase_Tools::createAction(QIcon(), tr("Show Isos"), aDesktop);
+  anAction->setCheckable(true);
+  addAction("SHOW_ISOLINES_CMD", anAction);
+
+  anAction = ModuleBase_Tools::createAction(QIcon(), tr("Bring To Front"), aDesktop);
+  anAction->setCheckable(true);
+  addAction("BRING_TO_FRONT_CMD", anAction);
 
   mySeparator1 = ModuleBase_Tools::createAction(QIcon(), "", aDesktop);
   mySeparator1->setSeparator(true);
@@ -158,69 +183,72 @@ void XGUI_ContextMenuMgr::createActions()
   mySeparator3 = ModuleBase_Tools::createAction(QIcon(), "", aDesktop);
   mySeparator3->setSeparator(true);
 
-  aAction = ModuleBase_Tools::createAction(QIcon(":pictures/vertex.png"), tr("Vertices"), aDesktop,
+  mySeparator4 = ModuleBase_Tools::createAction(QIcon(), "", aDesktop);
+  mySeparator4->setSeparator(true);
+
+  anAction = ModuleBase_Tools::createAction(QIcon(":pictures/vertex.png"), tr("Vertices"), aDesktop,
                                            this, SLOT(onShapeSelection(bool)));
-  aAction->setCheckable(true);
-  addAction("SELECT_VERTEX_CMD", aAction);
+  anAction->setCheckable(true);
+  addAction("SELECT_VERTEX_CMD", anAction);
 
-  aAction = ModuleBase_Tools::createAction(QIcon(":pictures/edge.png"), tr("Edges"), aDesktop,
+  anAction = ModuleBase_Tools::createAction(QIcon(":pictures/edge.png"), tr("Edges"), aDesktop,
                                            this, SLOT(onShapeSelection(bool)));
-  aAction->setCheckable(true);
-  addAction("SELECT_EDGE_CMD", aAction);
+  anAction->setCheckable(true);
+  addAction("SELECT_EDGE_CMD", anAction);
 
-  aAction = ModuleBase_Tools::createAction(QIcon(":pictures/face.png"), tr("Faces"), aDesktop,
+  anAction = ModuleBase_Tools::createAction(QIcon(":pictures/face.png"), tr("Faces"), aDesktop,
                                            this, SLOT(onShapeSelection(bool)));
-  aAction->setCheckable(true);
-  addAction("SELECT_FACE_CMD", aAction);
+  anAction->setCheckable(true);
+  addAction("SELECT_FACE_CMD", anAction);
 
-  aAction = ModuleBase_Tools::createAction(QIcon(":pictures/result.png"), tr("Results"), aDesktop,
+  anAction = ModuleBase_Tools::createAction(QIcon(":pictures/result.png"), tr("Results"), aDesktop,
                                            this, SLOT(onResultSelection(bool)));
-  aAction->setCheckable(true);
-  addAction("SELECT_RESULT_CMD", aAction);
+  anAction->setCheckable(true);
+  addAction("SELECT_RESULT_CMD", anAction);
 
-  aAction->setChecked(true);
+  anAction->setChecked(true);
 
-  aAction = ModuleBase_Tools::createAction(QIcon(":pictures/find_result.png"),
+  anAction = ModuleBase_Tools::createAction(QIcon(":pictures/find_result.png"),
                                            tr("Select results"), aDesktop);
-  addAction("SHOW_RESULTS_CMD", aAction);
+  addAction("SHOW_RESULTS_CMD", anAction);
 
-  aAction = ModuleBase_Tools::createAction(QIcon(":pictures/find_result.png"),
+  anAction = ModuleBase_Tools::createAction(QIcon(":pictures/find_result.png"),
                                            tr("Select parent feature"), aDesktop);
-  addAction("SHOW_FEATURE_CMD", aAction);
+  addAction("SHOW_FEATURE_CMD", anAction);
 
 #ifdef TINSPECTOR
-  aAction = ModuleBase_Tools::createAction(QIcon(), tr("TInspector"), aDesktop);
-  addAction("TINSPECTOR_VIEW", aAction);
+  anAction = ModuleBase_Tools::createAction(QIcon(), tr("TInspector"), aDesktop);
+  addAction("TINSPECTOR_VIEW", anAction);
 #endif
 
   // Features folders actions
-  aAction = ModuleBase_Tools::createAction(QIcon(":pictures/create_folder.png"),
+  anAction = ModuleBase_Tools::createAction(QIcon(":pictures/create_folder.png"),
                                            tr("Insert a folder before"), aDesktop);
-  addAction("INSERT_FOLDER_CMD", aAction);
+  addAction("INSERT_FOLDER_CMD", anAction);
 
-  aAction = ModuleBase_Tools::createAction(QIcon(":pictures/insert_folder_before.png"),
+  anAction = ModuleBase_Tools::createAction(QIcon(":pictures/insert_folder_before.png"),
                                            tr("Move into the previous folder"), aDesktop);
-  addAction("ADD_TO_FOLDER_BEFORE_CMD", aAction);
+  addAction("ADD_TO_FOLDER_BEFORE_CMD", anAction);
 
-  aAction = ModuleBase_Tools::createAction(QIcon(":pictures/insert_folder_after.png"),
+  anAction = ModuleBase_Tools::createAction(QIcon(":pictures/insert_folder_after.png"),
                                            tr("Move into the next folder"), aDesktop);
-  addAction("ADD_TO_FOLDER_AFTER_CMD", aAction);
+  addAction("ADD_TO_FOLDER_AFTER_CMD", anAction);
 
-  aAction = ModuleBase_Tools::createAction(QIcon(":pictures/move_out_before.png"),
+  anAction = ModuleBase_Tools::createAction(QIcon(":pictures/move_out_before.png"),
                                            tr("Move out before the folder"), aDesktop);
-  addAction("ADD_OUT_FOLDER_BEFORE_CMD", aAction);
+  addAction("ADD_OUT_FOLDER_BEFORE_CMD", anAction);
 
-  aAction = ModuleBase_Tools::createAction(QIcon(":pictures/move_out_after.png"),
+  anAction = ModuleBase_Tools::createAction(QIcon(":pictures/move_out_after.png"),
                                            tr("Move out after the folder"), aDesktop);
-  addAction("ADD_OUT_FOLDER_AFTER_CMD", aAction);
+  addAction("ADD_OUT_FOLDER_AFTER_CMD", anAction);
 
-  aAction = ModuleBase_Tools::createAction(QIcon(":pictures/normal-view-inversed.png"),
+  anAction = ModuleBase_Tools::createAction(QIcon(":pictures/normal-view-inversed.png"),
                                            tr("Set view by inverted normal to face"), aDesktop);
-  addAction("SET_VIEW_INVERTEDNORMAL_CMD", aAction);
+  addAction("SET_VIEW_INVERTEDNORMAL_CMD", anAction);
 
-  aAction = ModuleBase_Tools::createAction(QIcon(":pictures/normal-view.png"),
+  anAction = ModuleBase_Tools::createAction(QIcon(":pictures/normal-view.png"),
                                            tr("Set view by normal to face"), aDesktop);
-  addAction("SET_VIEW_NORMAL_CMD", aAction);
+  addAction("SET_VIEW_NORMAL_CMD", anAction);
 
   buildObjBrowserMenu();
   buildViewerMenu();
@@ -259,8 +287,8 @@ QStringList XGUI_ContextMenuMgr::actionIds() const
 
 void XGUI_ContextMenuMgr::onAction(bool isChecked)
 {
-  QAction* aAction = static_cast<QAction*>(sender());
-  emit actionTriggered(aAction->data().toString(), isChecked);
+  QAction* anAction = static_cast<QAction*>(sender());
+  emit actionTriggered(anAction->data().toString(), isChecked);
 }
 
 void XGUI_ContextMenuMgr::updateCommandsStatus()
@@ -291,8 +319,8 @@ void XGUI_ContextMenuMgr::onContextMenuRequest(QContextMenuEvent* theEvent)
 
 void XGUI_ContextMenuMgr::updateObjectBrowserMenu()
 {
-  foreach(QAction* aAction, myActions)
-    aAction->setEnabled(false);
+  foreach(QAction* anAction, myActions)
+    anAction->setEnabled(false);
 
   XGUI_SelectionMgr* aSelMgr = myWorkshop->selector();
   QObjectPtrList aObjects = aSelMgr->selection()->selectedObjects();
@@ -306,8 +334,9 @@ void XGUI_ContextMenuMgr::updateObjectBrowserMenu()
     bool hasCompositeOwner = false;
     bool hasResultInHistory = false;
     bool hasFolder = false;
+    bool hasGroupsOnly = false;
     ModuleBase_Tools::checkObjects(aObjects, hasResult, hasFeature, hasParameter,
-                                   hasCompositeOwner, hasResultInHistory, hasFolder);
+                                   hasCompositeOwner, hasResultInHistory, hasFolder, hasGroupsOnly);
     //Process Feature
     if (aSelected == 1) { // single selection
       ObjectPtr aObject = aObjects.first();
@@ -324,6 +353,12 @@ void XGUI_ContextMenuMgr::updateObjectBrowserMenu()
             action("WIREFRAME_CMD")->setEnabled(true);
             action("SHADING_CMD")->setEnabled(true);
           }
+          action("SHOW_EDGES_DIRECTION_CMD")->setEnabled(true);
+          action("SHOW_EDGES_DIRECTION_CMD")->setChecked(ModelAPI_Tools::isShowEdgesDirection(aResult));
+
+          action("BRING_TO_FRONT_CMD")->setEnabled(hasGroupsOnly);
+          action("BRING_TO_FRONT_CMD")->setChecked(ModelAPI_Tools::isBringToFront(aResult));
+
           action("SHOW_ISOLINES_CMD")->setEnabled(true);
           action("SHOW_ISOLINES_CMD")->setChecked(ModelAPI_Tools::isShownIsoLines(aResult));
           action("ISOLINES_CMD")->setEnabled(true);
@@ -344,10 +379,24 @@ void XGUI_ContextMenuMgr::updateObjectBrowserMenu()
           if (!(hasParameter || hasFeature))
             action("SHOW_ONLY_CMD")->setEnabled(true);
         }
+#ifdef HAVE_SALOME
         else if (hasFeature && myWorkshop->canMoveFeature()) {
           action("MOVE_CMD")->setEnabled(true);
           action("MOVE_SPLIT_CMD")->setEnabled(true);
         }
+#endif
+        if (hasFeature && aObject->document() != aMgr->moduleDocument() &&
+            aObject->document() == aMgr->activeDocument())
+        {
+          XGUI_OperationMgr* anOperationMgr = myWorkshop->operationMgr();
+          if (!anOperationMgr->hasOperation()) {
+            FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(aObject);
+            std::list<std::shared_ptr<ModelAPI_Result> > aResults;
+            ModelAPI_Tools::getConcealedResults(aFeature, aResults);
+            if (!aResults.empty()) // check the feature conceals at least one result
+              action("RECOVER_CMD")->setEnabled(true);
+          }
+        }
 
         if( aMgr->activeDocument() == aObject->document() )
         {
@@ -366,6 +415,8 @@ void XGUI_ContextMenuMgr::updateObjectBrowserMenu()
         action("SHOW_ONLY_CMD")->setEnabled(true);
         action("SHADING_CMD")->setEnabled(true);
         action("WIREFRAME_CMD")->setEnabled(true);
+        action("SHOW_EDGES_DIRECTION_CMD")->setEnabled(true);
+        action("BRING_TO_FRONT_CMD")->setEnabled(hasGroupsOnly);
         action("SHOW_ISOLINES_CMD")->setEnabled(true);
         action("ISOLINES_CMD")->setEnabled(true);
       }
@@ -502,6 +553,8 @@ void XGUI_ContextMenuMgr::updateObjectBrowserMenu()
   action("COLOR_CMD")->setEnabled(myWorkshop->canChangeProperty("COLOR_CMD"));
   action("DEFLECTION_CMD")->setEnabled(myWorkshop->canChangeProperty("DEFLECTION_CMD"));
   action("TRANSPARENCY_CMD")->setEnabled(myWorkshop->canChangeProperty("TRANSPARENCY_CMD"));
+  action("AUTOCOLOR_CMD")->setEnabled(myWorkshop->canChangeProperty("AUTOCOLOR_CMD"));
+
   #ifdef _DEBUG
     #ifdef TINSPECTOR
       action("TINSPECTOR_VIEW")->setEnabled(true);
@@ -516,8 +569,8 @@ void XGUI_ContextMenuMgr::updateObjectBrowserMenu()
 
 void XGUI_ContextMenuMgr::updateViewerMenu()
 {
-  foreach(QAction* aAction, myActions)
-    aAction->setEnabled(false);
+  foreach(QAction* anAction, myActions)
+    anAction->setEnabled(false);
 
   XGUI_SelectionMgr* aSelMgr = myWorkshop->selector();
   XGUI_Displayer* aDisplayer = myWorkshop->displayer();
@@ -558,6 +611,15 @@ void XGUI_ContextMenuMgr::updateViewerMenu()
           if (aResult.get()) {
             action("SHOW_ISOLINES_CMD")->setEnabled(true);
             action("SHOW_ISOLINES_CMD")->setChecked(ModelAPI_Tools::isShownIsoLines(aResult));
+
+            action("SHOW_EDGES_DIRECTION_CMD")->setEnabled(true);
+            action("SHOW_EDGES_DIRECTION_CMD")->setChecked(
+              ModelAPI_Tools::isShowEdgesDirection(aResult));
+
+            // Only enable the "Bring To Front" command for Groups
+            ResultGroupPtr aGroup = std::dynamic_pointer_cast<ModelAPI_ResultGroup>(aResult);
+            action("BRING_TO_FRONT_CMD")->setEnabled(aGroup.get() != NULL);
+            action("BRING_TO_FRONT_CMD")->setChecked(ModelAPI_Tools::isBringToFront(aResult));
           }
         }
       }
@@ -645,6 +707,7 @@ void XGUI_ContextMenuMgr::buildObjBrowserMenu()
 
   QActionsList aList;
 
+  //-------------------------------------
   // Result construction menu
   aList.append(action("SHOW_CMD"));
   aList.append(action("HIDE_CMD"));
@@ -660,10 +723,11 @@ void XGUI_ContextMenuMgr::buildObjBrowserMenu()
   myObjBrowserMenus[ModelAPI_ResultConstruction::group()] = aList;
 
   //-------------------------------------
-  // Result body menu
+  // Result body/field/part menu
   aList.clear();
   aList.append(action("WIREFRAME_CMD"));
   aList.append(action("SHADING_CMD"));
+  aList.append(action("SHOW_EDGES_DIRECTION_CMD"));
   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"));
@@ -679,12 +743,38 @@ void XGUI_ContextMenuMgr::buildObjBrowserMenu()
   aList.append(action("SHOW_FEATURE_CMD"));
   aList.append(mySeparator3);
   aList.append(action("DELETE_CMD"));
+  // Result body menu
   myObjBrowserMenus[ModelAPI_ResultBody::group()] = aList;
-  // Group menu
-  myObjBrowserMenus[ModelAPI_ResultGroup::group()] = aList;
+  // Field menu
   myObjBrowserMenus[ModelAPI_ResultField::group()] = aList;
   // Result part menu
   myObjBrowserMenus[ModelAPI_ResultPart::group()] = aList;
+
+  //-------------------------------------
+  // Group menu
+  aList.clear();
+  aList.append(action("WIREFRAME_CMD"));
+  aList.append(action("SHADING_CMD"));
+  aList.append(action("SHOW_EDGES_DIRECTION_CMD"));
+  aList.append(mySeparator1);
+  aList.append(action("BRING_TO_FRONT_CMD"));
+  aList.append(mySeparator2);
+  aList.append(action("SHOW_CMD"));
+  aList.append(action("HIDE_CMD"));
+  aList.append(action("SHOW_ONLY_CMD"));
+  aList.append(mySeparator3);
+  aList.append(action("AUTOCOLOR_CMD"));
+  aList.append(action("RENAME_CMD"));
+  aList.append(action("COLOR_CMD"));
+  aList.append(action("DEFLECTION_CMD"));
+  aList.append(action("TRANSPARENCY_CMD"));
+  aList.append(action("SHOW_ISOLINES_CMD"));
+  aList.append(action("ISOLINES_CMD"));
+  aList.append(action("SHOW_FEATURE_CMD"));
+  aList.append(mySeparator4);
+  aList.append(action("DELETE_CMD"));
+  myObjBrowserMenus[ModelAPI_ResultGroup::group()] = aList;
+
   //-------------------------------------
   // Feature menu
   aList.clear();
@@ -692,6 +782,7 @@ void XGUI_ContextMenuMgr::buildObjBrowserMenu()
   aList.append(action("SHOW_RESULTS_CMD"));
   aList.append(action("MOVE_CMD"));
   aList.append(action("MOVE_SPLIT_CMD"));
+  aList.append(action("RECOVER_CMD"));
   aList.append(mySeparator1);
   aList.append(action("INSERT_FOLDER_CMD"));
   aList.append(action("ADD_TO_FOLDER_BEFORE_CMD"));
@@ -704,14 +795,17 @@ void XGUI_ContextMenuMgr::buildObjBrowserMenu()
   aList.append(action("DELETE_CMD"));
   myObjBrowserMenus[ModelAPI_Feature::group()] = aList;
 
+  //-------------------------------------
+  // Parameter menu
   aList.clear();
   aList.append(action("RENAME_CMD"));
   aList.append(mySeparator1);
   aList.append(action("CLEAN_HISTORY_CMD"));
   aList.append(action("DELETE_CMD"));
   myObjBrowserMenus[ModelAPI_ResultParameter::group()] = aList;
-  //-------------------------------------
 
+  //-------------------------------------
+  // Folder menu
   aList.clear();
   aList.append(action("RENAME_CMD"));
   aList.append(action("DELETE_CMD"));
@@ -729,7 +823,7 @@ void XGUI_ContextMenuMgr::buildObjBrowserMenu()
 void XGUI_ContextMenuMgr::buildViewerMenu()
 {
   QActionsList aList;
-  // Result construction menu
+  // Result construction/part menu
   aList.append(action("COLOR_CMD"));
   aList.append(action("DEFLECTION_CMD"));
   aList.append(action("TRANSPARENCY_CMD"));
@@ -740,13 +834,14 @@ void XGUI_ContextMenuMgr::buildViewerMenu()
   aList.append(action("SHOW_ONLY_CMD"));
   aList.append(action("HIDE_CMD"));
   myViewerMenu[ModelAPI_ResultConstruction::group()] = aList;
-  // Result part menu
   myViewerMenu[ModelAPI_ResultPart::group()] = aList;
+
   //-------------------------------------
   // Result body menu
   aList.clear();
   aList.append(action("WIREFRAME_CMD"));
   aList.append(action("SHADING_CMD"));
+  aList.append(action("SHOW_EDGES_DIRECTION_CMD"));
   aList.append(mySeparator2);
   aList.append(action("COLOR_CMD"));
   aList.append(action("DEFLECTION_CMD"));
@@ -760,9 +855,30 @@ void XGUI_ContextMenuMgr::buildViewerMenu()
   aList.append(action("SHOW_ONLY_CMD"));
   aList.append(action("HIDE_CMD"));
   myViewerMenu[ModelAPI_ResultBody::group()] = aList;
+  myViewerMenu[ModelAPI_ResultField::group()] = aList;
+
+  //-------------------------------------
   // Group menu
+  aList.clear();
+  aList.append(action("WIREFRAME_CMD"));
+  aList.append(action("SHADING_CMD"));
+  aList.append(action("SHOW_EDGES_DIRECTION_CMD"));
+  aList.append(mySeparator1);
+  aList.append(action("BRING_TO_FRONT_CMD"));
+  aList.append(mySeparator2);
+  aList.append(action("COLOR_CMD"));
+  aList.append(action("DEFLECTION_CMD"));
+  aList.append(action("TRANSPARENCY_CMD"));
+  aList.append(action("SHOW_ISOLINES_CMD"));
+  aList.append(action("ISOLINES_CMD"));
+  aList.append(mySeparator3);
+  aList.append(action("SET_VIEW_NORMAL_CMD"));
+  aList.append(action("SET_VIEW_INVERTEDNORMAL_CMD"));
+  aList.append(mySeparator4);
+  aList.append(action("SHOW_ONLY_CMD"));
+  aList.append(action("HIDE_CMD"));
   myViewerMenu[ModelAPI_ResultGroup::group()] = aList;
-  myViewerMenu[ModelAPI_ResultField::group()] = aList;
+
   //-------------------------------------
   // Step objects menu
   aList.clear();
@@ -782,43 +898,46 @@ void XGUI_ContextMenuMgr::addObjBrowserMenu(QMenu* theMenu) const
   XGUI_SelectionMgr* aSelMgr = myWorkshop->selector();
   QObjectPtrList aObjects = aSelMgr->selection()->selectedObjects();
   int aSelected = aObjects.size();
-  QActionsList aActions;
+  QActionsList anActions;
   if (aSelected == 1) {
     ObjectPtr aObject = aObjects.first();
     std::string aName = aObject->groupName();
     if (myObjBrowserMenus.contains(aName))
-      aActions = myObjBrowserMenus[aName];
+      anActions = myObjBrowserMenus[aName];
   } else if (aSelected > 1) {
-      aActions.append(action("WIREFRAME_CMD"));
-      aActions.append(action("SHADING_CMD"));
-      aActions.append(mySeparator1);
-      aActions.append(action("SHOW_CMD"));
-      aActions.append(action("HIDE_CMD"));
-      aActions.append(action("SHOW_ONLY_CMD"));
-      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("MOVE_SPLIT_CMD"));
-      aActions.append(action("COLOR_CMD"));
-      aActions.append(action("DEFLECTION_CMD"));
-      aActions.append(action("TRANSPARENCY_CMD"));
-      aActions.append(action("SHOW_ISOLINES_CMD"));
-      aActions.append(action("ISOLINES_CMD"));
-      aActions.append(action("CLEAN_HISTORY_CMD"));
-      aActions.append(action("DELETE_CMD"));
+      anActions.append(action("WIREFRAME_CMD"));
+      anActions.append(action("SHADING_CMD"));
+      anActions.append(action("SHOW_EDGES_DIRECTION_CMD"));
+      anActions.append(mySeparator1);
+      anActions.append(action("BRING_TO_FRONT_CMD"));
+      anActions.append(mySeparator2);
+      anActions.append(action("SHOW_CMD"));
+      anActions.append(action("HIDE_CMD"));
+      anActions.append(action("SHOW_ONLY_CMD"));
+      anActions.append(mySeparator3);
+      anActions.append(action("ADD_TO_FOLDER_BEFORE_CMD"));
+      anActions.append(action("ADD_TO_FOLDER_AFTER_CMD"));
+      anActions.append(action("ADD_OUT_FOLDER_BEFORE_CMD"));
+      anActions.append(action("ADD_OUT_FOLDER_AFTER_CMD"));
+      anActions.append(mySeparator4);
+      anActions.append(action("MOVE_CMD"));
+      anActions.append(action("MOVE_SPLIT_CMD"));
+      anActions.append(action("COLOR_CMD"));
+      anActions.append(action("DEFLECTION_CMD"));
+      anActions.append(action("TRANSPARENCY_CMD"));
+      anActions.append(action("SHOW_ISOLINES_CMD"));
+      anActions.append(action("ISOLINES_CMD"));
+      anActions.append(action("CLEAN_HISTORY_CMD"));
+      anActions.append(action("DELETE_CMD"));
   }
 #ifdef _DEBUG
   if (aSelected == 0) {
     #ifdef TINSPECTOR
-    aActions.append(action("TINSPECTOR_VIEW"));
+    anActions.append(action("TINSPECTOR_VIEW"));
     #endif
   }
 #endif
-  theMenu->addActions(aActions);
+  theMenu->addActions(anActions);
   addFeatures(theMenu);
 
   // It is commented out because Object Browser does not have actions
@@ -832,7 +951,7 @@ void XGUI_ContextMenuMgr::addViewerMenu(QMenu* theMenu) const
   QList<ModuleBase_ViewerPrsPtr> aPrsList =
     aSelMgr->selection()->getSelected(ModuleBase_ISelection::Viewer);
   int aSelected = aPrsList.size();
-  QActionsList aActions;
+  QActionsList anActions;
 
   // Create selection menu
   XGUI_OperationMgr* aOpMgr = myWorkshop->operationMgr();
@@ -853,19 +972,19 @@ void XGUI_ContextMenuMgr::addViewerMenu(QMenu* theMenu) const
     if (aObject.get() != NULL) {
       std::string aName = aObject->groupName();
       if (myViewerMenu.contains(aName))
-        aActions = myViewerMenu[aName];
+        anActions = 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"));
+    anActions.append(action("COLOR_CMD"));
+    anActions.append(action("DEFLECTION_CMD"));
+    anActions.append(action("TRANSPARENCY_CMD"));
+    anActions.append(mySeparator1);
+    anActions.append(action("SHOW_ONLY_CMD"));
+    anActions.append(action("HIDE_CMD"));
   }
   // hide all is shown always even if selection in the viewer is empty
-  aActions.append(action("HIDEALL_CMD"));
-  theMenu->addActions(aActions);
+  anActions.append(action("HIDEALL_CMD"));
+  theMenu->addActions(anActions);
 
   QMap<int, QAction*> aMenuActions;
   ModuleBase_IModule* aModule = myWorkshop->module();
@@ -876,12 +995,12 @@ void XGUI_ContextMenuMgr::addViewerMenu(QMenu* theMenu) const
 
   // insert the module menu items on specific positions in the popup menu: some actions should be
   // in the begin of the list, Delete action should be the last by #1343 issue
-  QList<QAction*> anActions = theMenu->actions();
-  int anActionsSize = anActions.size();
-  QAction* aFirstAction = anActions[0];
+  QList<QAction*> anActionsList = theMenu->actions();
+  int anActionsListSize = anActionsList.size();
+  QAction* aFirstAction = anActionsList[0];
   QMap<int, QAction*>::const_iterator anIt = aMenuActions.begin(), aLast = aMenuActions.end();
   for (; anIt != aLast; anIt++) {
-    if (anIt.key() > anActionsSize)
+    if (anIt.key() > anActionsListSize)
       theMenu->addAction(anIt.value());
     else
       theMenu->insertAction(aFirstAction, *anIt);
@@ -931,10 +1050,10 @@ void XGUI_ContextMenuMgr::onRename()
 void XGUI_ContextMenuMgr::addFeatures(QMenu* theMenu) const
 {
   SessionPtr aMgr = ModelAPI_Session::get();
-  DocumentPtr aActiveDoc = aMgr->activeDocument();
+  DocumentPtr anActiveDoc = aMgr->activeDocument();
 
   XGUI_SelectionMgr* aSelMgr = myWorkshop->selector();
-  XGUI_ActionsMgr* aActionMgr = myWorkshop->actionsMgr();
+  XGUI_ActionsMgr* anActionMgr = myWorkshop->actionsMgr();
   const Config_DataModelReader* aDataModelXML = myWorkshop->dataModelXMLReader();
   QModelIndexList aSelectedIndexes = aSelMgr->selection()->selectedIndexes();
 
@@ -946,7 +1065,7 @@ void XGUI_ContextMenuMgr::addFeatures(QMenu* theMenu) const
     if (aIdx.column() == 1) {
       aIsRoot = !aIdx.parent().isValid();
       // Exit if the selected index belongs to non active document
-      if (aIsRoot && (aActiveDoc != aMgr->moduleDocument()))
+      if (aIsRoot && (anActiveDoc != aMgr->moduleDocument()))
         return;
 
       // Get name of the selected index
@@ -962,9 +1081,9 @@ void XGUI_ContextMenuMgr::addFeatures(QMenu* theMenu) const
           QStringList aFeturesList =
             QString(aFeaturesStr.c_str()).split(",", QString::SkipEmptyParts);
           foreach(QString aFea, aFeturesList) {
-            QAction* aAction = aActionMgr->action(aFea);
-            if (aAction)
-              theMenu->addAction(aAction);
+            QAction* anAction = anActionMgr->action(aFea);
+            if (anAction)
+              theMenu->addAction(anAction);
           }
         }
     }
@@ -972,11 +1091,11 @@ void XGUI_ContextMenuMgr::addFeatures(QMenu* theMenu) const
 }
 
 #define UNCHECK_ACTION(NAME) \
-{ QAction* aAction = action(NAME); \
-bool isBlock = aAction->signalsBlocked(); \
-aAction->blockSignals(true); \
-aAction->setChecked(false); \
-  aAction->blockSignals(isBlock); }
+{ QAction* anAction = action(NAME); \
+bool isBlock = anAction->signalsBlocked(); \
+anAction->blockSignals(true); \
+anAction->setChecked(false); \
+  anAction->blockSignals(isBlock); }
 
 
 void XGUI_ContextMenuMgr::onResultSelection(bool theChecked)