Update commands state on any selection (not only in viewer)

diff --git a/src/PartSet/PartSet_Validators.cpp b/src/PartSet/PartSet_Validators.cpp
index da35eb489e393007fd0d3b3a549a2d4a54f2f1d1..e415933371b447a04b8bd58e0ba4fb38cd5b57fd 100755 (executable)
--- a/src/PartSet/PartSet_Validators.cpp
+++ b/src/PartSet/PartSet_Validators.cpp
@@ -202,9 +202,8 @@ bool PartSet_RigidSelection::isValid(const ModuleBase_ISelection* theSelection,
       if (aObj.get()) {
         FeaturePtr aFeature = ModelAPI_Feature::feature(aObj);
         if (aFeature.get()) {
-          std::shared_ptr<SketchPlugin_Feature> aSketch =
-            std::dynamic_pointer_cast<SketchPlugin_Feature>(aFeature);
-          if (aSketch.get())
+          CompositeFeaturePtr aComp = ModelAPI_Tools::compositeOwner(aFeature);
+          if (aComp.get() && (aComp->getKind() == SketchPlugin_Sketch::ID()))
             aCount++;
         }
       }

diff --git a/src/XGUI/XGUI_ActionsMgr.cpp b/src/XGUI/XGUI_ActionsMgr.cpp
index 26e33d3e2cc51f542871b3880c4f26c80aafcf1a..b86390dda0be144e41f554fb743d31eb8d3a36ed 100644 (file)
--- a/src/XGUI/XGUI_ActionsMgr.cpp
+++ b/src/XGUI/XGUI_ActionsMgr.cpp
@@ -101,7 +101,8 @@ void XGUI_ActionsMgr::updateCommandsStatus()
 {
   setAllEnabled();
   XGUI_Selection* aSelection = myWorkshop->selector()->selection();
-  if (aSelection->getSelected(ModuleBase_ISelection::Viewer).size() > 0)
+  //if (aSelection->getSelected(ModuleBase_ISelection::Viewer).size() > 0)
+  if (aSelection->getSelected().size() > 0)
     updateOnViewSelection();
 
   FeaturePtr anActiveFeature = FeaturePtr();

diff --git a/src/XGUI/XGUI_Selection.cpp b/src/XGUI/XGUI_Selection.cpp
index 56019f8aac06b357162b8a007bef65c445402dbc..36849ab9eb47bbb99184d0d0edfc513b1bf78fae 100644 (file)
--- a/src/XGUI/XGUI_Selection.cpp
+++ b/src/XGUI/XGUI_Selection.cpp
@@ -273,7 +273,9 @@ QList<ModuleBase_ViewerPrsPtr> XGUI_Selection::getHighlighted() const
 
 QObjectPtrList XGUI_Selection::selectedObjects() const
 {
-  return myWorkshop->objectBrowser()->selectedObjects();
+  if (myWorkshop->objectBrowser())
+    return myWorkshop->objectBrowser()->selectedObjects();
+  return QObjectPtrList();
 }
 
 void XGUI_Selection::setSelectedObjects( const QObjectPtrList& theObjects ) const