Fix for the issue #593: do not remove naming attribute, but use TNaming_Builder for...

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

diff --git a/src/XGUI/XGUI_ActionsMgr.cpp b/src/XGUI/XGUI_ActionsMgr.cpp
index 9e7ce02ae348cfb50ee3f37950e607beb4bfd377..beb901ee024620513e23f4df25c9aefc733c84c4 100644 (file)
--- a/src/XGUI/XGUI_ActionsMgr.cpp
+++ b/src/XGUI/XGUI_ActionsMgr.cpp
@@ -131,35 +131,45 @@ 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);
-    }
+    // 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)) {
+        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));
 
+        }
       }
     }
   }
@@ -293,6 +303,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));