X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_ActionsMgr.cpp;h=8d2eada7c492bd5ae4a04d0a51c8c03182e2d5ce;hb=8ebc9a7d5f87057b61b174e7568e01e44571549d;hp=9e7ce02ae348cfb50ee3f37950e607beb4bfd377;hpb=33b3a43ad2266cb044e4232c902344842adbba7c;p=modules%2Fshaper.git

diff --git a/src/XGUI/XGUI_ActionsMgr.cpp b/src/XGUI/XGUI_ActionsMgr.cpp
index 9e7ce02ae..8d2eada7c 100644
--- a/src/XGUI/XGUI_ActionsMgr.cpp
+++ b/src/XGUI/XGUI_ActionsMgr.cpp
@@ -131,35 +131,41 @@ void XGUI_ActionsMgr::updateOnViewSelection()
   if (!myOperationMgr->hasOperation())
     return;
 
-  ModuleBase_Operation* anOperation = myOperationMgr->currentOperation();
-  FeaturePtr anActiveFeature = anOperation->feature();
-  if(!anActiveFeature.get())
+  QStringList aIdList = myOperationMgr->operationList();
+  //ModuleBase_Operation* anOperation = myOperationMgr->currentOperation();
+  //FeaturePtr anActiveFeature = anOperation->feature();
+  //if(!anActiveFeature.get())
+  if (aIdList.isEmpty())
     return;
 
-  QString aFeatureId = QString::fromStdString(anActiveFeature->getKind());
+  //QString aFeatureId = QString::fromStdString(anActiveFeature->getKind());
   XGUI_Selection* aSelection = myWorkshop->selector()->selection();
-  if (aSelection->getSelected().size() == 0) {
-    foreach(QString aId, nestedCommands(aFeatureId)) {
-      setActionEnabled(aId, true);
-    }
+  // only viewer selection is processed
+  if (aSelection->getSelected(ModuleBase_ISelection::Viewer).size() == 0) {
+    // it seems that this code is not nesessary anymore. It leads to incorrect case:
+    // sketch operation start, click in any place in the viewer. The result is all nested
+    // entities are enabled(but the sketch plane is not selected yet). Any sketch operation
+    // can be started but will be incorrect on preview build before it uses the sketch unset plane.
+    /*foreach(QString aFeatureId, aIdList) {
+      foreach(QString aId, nestedCommands(aFeatureId)) {
+        setActionEnabled(aId, true);
+      }
+    }*/
   } else { 
     SessionPtr aMgr = ModelAPI_Session::get();
     ModelAPI_ValidatorsFactory* aFactory = aMgr->validators();
-    foreach(QString aId, nestedCommands(aFeatureId)) {
-      std::list<ModelAPI_Validator*> aValidators;
-      std::list<std::list<std::string> > anArguments;
-      aFactory->validators(aId.toStdString(), aValidators, anArguments);
-      std::list<ModelAPI_Validator*>::iterator aValidator = aValidators.begin();
-      std::list<std::list<std::string> >::iterator aValidatorArgs = anArguments.begin();
-      for (; aValidator != aValidators.end(); aValidator++, aValidatorArgs++) {
-        if (!(*aValidator))
-          continue;
-        const ModuleBase_SelectionValidator* aSelValidator =
-            dynamic_cast<const ModuleBase_SelectionValidator*>(*aValidator);
-        if (!aSelValidator)
-          continue;
-        setActionEnabled(aId, aSelValidator->isValid(aSelection, *aValidatorArgs));
-
+    foreach(QString aFeatureId, aIdList) {
+      foreach(QString aId, nestedCommands(aFeatureId)) {
+        ModelAPI_ValidatorsFactory::Validators aValidators;
+        aFactory->validators(aId.toStdString(), aValidators);
+        ModelAPI_ValidatorsFactory::Validators::iterator aValidatorIt = aValidators.begin();
+        for (; aValidatorIt != aValidators.end(); ++aValidatorIt) {
+          const ModuleBase_SelectionValidator* aSelValidator =
+              dynamic_cast<const ModuleBase_SelectionValidator*>(aFactory->validator(aValidatorIt->first));
+          if (!aSelValidator)
+            continue;
+          setActionEnabled(aId, aSelValidator->isValid(aSelection, aValidatorIt->second));
+        }
       }
     }
   }
@@ -293,6 +299,7 @@ void XGUI_ActionsMgr::setNestedStackEnabled(ModuleBase_Operation* theOperation)
     return;
   FeaturePtr aFeature = theOperation->feature();
   QString aFeatureId = QString::fromStdString(aFeature->getKind());
+  setActionEnabled(aFeatureId, true);
   setNestedCommandsEnabled(true, aFeatureId);
 
   setNestedStackEnabled(myOperationMgr->previousOperation(theOperation));
@@ -345,8 +352,8 @@ void XGUI_ActionsMgr::updateByPlugins(FeaturePtr anActiveFeature)
 {
   static Events_ID aStateRequestEventId = Events_Loop::loop()->eventByName(
       EVENT_FEATURE_STATE_REQUEST);
-  std::shared_ptr<ModelAPI_FeatureStateMessage> aMsg =
-      std::make_shared<ModelAPI_FeatureStateMessage>(aStateRequestEventId, this);
+  std::shared_ptr<ModelAPI_FeatureStateMessage> aMsg(
+      new ModelAPI_FeatureStateMessage(aStateRequestEventId, this));
   aMsg->setFeature(anActiveFeature);
   Events_Loop::loop()->send(aMsg, false);
 }