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 a9618988920f1a3df15eb3303d335e16bed1a827..27e596a487f6551855bf98a72b2d08d03b0416a5 100644 (file)
--- a/src/XGUI/XGUI_ContextMenuMgr.cpp
+++ b/src/XGUI/XGUI_ContextMenuMgr.cpp
@@ -14,6 +14,7 @@
 #include <ModelAPI_Object.h>
 #include <ModelAPI_ResultPart.h>
 #include <ModelAPI_Session.h>
+#include <ModelAPI_ResultGroup.h>
 
 #include <QAction>
 #include <QContextMenuEvent>
@@ -113,7 +114,7 @@ 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();
@@ -122,20 +123,20 @@ QMenu* XGUI_ContextMenuMgr::objectBrowserMenu() const
     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);
+      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 (hasFeature && hasResult)
+      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);
+        ResultPartPtr aPart = std::dynamic_pointer_cast<ModelAPI_ResultPart>(aObject);
         if (aPart) {
           if (aMgr->activeDocument() == aPart->partDoc())
             aMenu->addAction(action("DEACTIVATE_PART_CMD"));
@@ -196,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"));
@@ -204,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);