X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_ActionsMgr.cpp;h=8b6fbadd1c685e94305ef78d791405823e73c060;hb=92b6738b4a67f24c626b106e2bcf7651577ff2bc;hp=33f1826a792e99d7bcb183d94f35cddb37e78f2d;hpb=3c0b551f57002a6e5195ef959f8056aa9df72baf;p=modules%2Fshaper.git

diff --git a/src/XGUI/XGUI_ActionsMgr.cpp b/src/XGUI/XGUI_ActionsMgr.cpp
index 33f1826a7..8b6fbadd1 100644
--- a/src/XGUI/XGUI_ActionsMgr.cpp
+++ b/src/XGUI/XGUI_ActionsMgr.cpp
@@ -20,6 +20,7 @@
 #include <ModelAPI_Events.h>
 #include <ModelAPI_Validator.h>
 #include <ModuleBase_Operation.h>
+#include <ModuleBase_OperationFeature.h>
 #include <ModuleBase_SelectionValidator.h>
 
 
@@ -95,15 +96,16 @@ bool XGUI_ActionsMgr::isNested(const QString& theId) const
 void XGUI_ActionsMgr::update()
 {
   FeaturePtr anActiveFeature = FeaturePtr();
-  if (myOperationMgr->hasOperation()) {
-    ModuleBase_Operation* anOperation = myOperationMgr->currentOperation();
-    anActiveFeature = anOperation->feature();
+  ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>
+                                                         (myOperationMgr->currentOperation());
+  if (aFOperation) {
+    anActiveFeature = aFOperation->feature();
     if(anActiveFeature.get()) {
       setAllEnabled(false);
       QString aFeatureId = QString::fromStdString(anActiveFeature->getKind());
       setActionEnabled(aFeatureId, true);
     }
-    setNestedStackEnabled(anOperation);
+    setNestedStackEnabled(aFOperation);
   } else {
     setAllEnabled(true);
     setNestedCommandsEnabled(false);
@@ -128,32 +130,45 @@ void XGUI_ActionsMgr::updateCheckState()
 
 void XGUI_ActionsMgr::updateOnViewSelection()
 {
-  XGUI_Selection* aSelection = myWorkshop->selector()->selection();
-  if (aSelection->getSelected().size() == 0 || !myOperationMgr->hasOperation())
+  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());
-
-  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));
 
+  //QString aFeatureId = QString::fromStdString(anActiveFeature->getKind());
+  XGUI_Selection* aSelection = myWorkshop->selector()->selection();
+  // 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 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));
+        }
+      }
     }
   }
 }
@@ -243,6 +258,15 @@ QAction* XGUI_ActionsMgr::operationStateAction(OperationStateActionId theId, QOb
   return aResult;
 }
 
+QAction* XGUI_ActionsMgr::action(const QString& theId)
+{
+  QAction* anAction = 0;
+  if(myActions.contains(theId)) {
+    anAction = myActions.value(theId);
+  }
+  return anAction;
+}
+
 ActionInfo XGUI_ActionsMgr::actionInfoById(const QString& theId)
 {
   ActionInfo aResult;
@@ -282,10 +306,12 @@ void XGUI_ActionsMgr::setNestedCommandsEnabled(bool theEnabled, const QString& t
 
 void XGUI_ActionsMgr::setNestedStackEnabled(ModuleBase_Operation* theOperation)
 {
-  if(!theOperation || !theOperation->feature())
+  ModuleBase_OperationFeature* anOperation = dynamic_cast<ModuleBase_OperationFeature*>(theOperation);
+  if(!anOperation || !anOperation->feature())
     return;
-  FeaturePtr aFeature = theOperation->feature();
+  FeaturePtr aFeature = anOperation->feature();
   QString aFeatureId = QString::fromStdString(aFeature->getKind());
+  setActionEnabled(aFeatureId, true);
   setNestedCommandsEnabled(true, aFeatureId);
 
   setNestedStackEnabled(myOperationMgr->previousOperation(theOperation));
@@ -338,8 +364,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);
 }