Restore editing of dimensions by dragging

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

diff --git a/src/XGUI/XGUI_ContextMenuMgr.cpp b/src/XGUI/XGUI_ContextMenuMgr.cpp
index f951d7a279fc590625f6225a739585838f92caf9..27e596a487f6551855bf98a72b2d08d03b0416a5 100644 (file)
--- a/src/XGUI/XGUI_ContextMenuMgr.cpp
+++ b/src/XGUI/XGUI_ContextMenuMgr.cpp
@@ -114,71 +114,65 @@ QMenu* XGUI_ContextMenuMgr::objectBrowserMenu() const
 {
   QMenu* aMenu = new QMenu();
   XGUI_SelectionMgr* aSelMgr = myWorkshop->selector();
-  QList<ObjectPtr> aObjects = aSelMgr->selection()->selectedObjects();
+  QObjectPtrList aObjects = aSelMgr->selection()->selectedObjects();
   int aSelected = aObjects.size();
   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);
+      FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(aObj);
+      ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(aObj);
       if (aResult)
         hasResult = true;
       if (aFeature)
         hasFeature = true;
-      if (aGroupRes)
-        hasGroup = true;
-      if (hasFeature && hasResult && hasGroup)
+      if (hasFeature && hasResult) // && hasGroup)
         break;
     }
     //Process Feature
-    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"));
+    if (aSelected == 1) {
+      ObjectPtr aObject = aObjects.first();
+      if (aObject) {
+        ResultPartPtr aPart = std::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("ACTIVATE_PART_CMD"));
-          } else if (hasFeature) {
-            aMenu->addAction(action("EDIT_CMD"));
+              aMenu->addAction(action("SHADING_CMD"));
+            aMenu->addSeparator();
+            aMenu->addAction(action("HIDE_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"));
+            aMenu->addAction(action("SHOW_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->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"));
       }
-      if (hasFeature)
-        aMenu->addAction(action("DELETE_CMD"));
     }
+    if (hasFeature)
+      aMenu->addAction(action("DELETE_CMD"));
   }
   aMenu->addSeparator();
   aMenu->addActions(myWorkshop->objectBrowser()->actions());
@@ -203,7 +197,7 @@ QMenu* XGUI_ContextMenuMgr::viewerMenu() const
 void XGUI_ContextMenuMgr::addViewerItems(QMenu* theMenu) const
 {
   XGUI_SelectionMgr* aSelMgr = myWorkshop->selector();
-  QList<ObjectPtr> aObjects = aSelMgr->selection()->selectedObjects();
+  QObjectPtrList aObjects = aSelMgr->selection()->selectedObjects();
   if (aObjects.size() > 0) {
     //if (aObjects.size() == 1)
     //  theMenu->addAction(action("EDIT_CMD"));
@@ -211,7 +205,7 @@ void XGUI_ContextMenuMgr::addViewerItems(QMenu* theMenu) const
     bool isShading = false;
     foreach(ObjectPtr aObject, aObjects)
     {
-      ResultPtr aRes = boost::dynamic_pointer_cast<ModelAPI_Result>(aObject);
+      ResultPtr aRes = std::dynamic_pointer_cast<ModelAPI_Result>(aObject);
       if (aRes && myWorkshop->displayer()->isVisible(aRes)) {
         isVisible = true;
         isShading = (myWorkshop->displayer()->displayMode(aObject) == XGUI_Displayer::Shading);