Issue #1062: Parameter value is thrown down in the point selector control

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

diff --git a/src/XGUI/XGUI_ActionsMgr.cpp b/src/XGUI/XGUI_ActionsMgr.cpp
index b1b5f1cf512760d49678b83e0528254f82381170..b25a6fb75ab96ed4e140ea528f1a6bbb6a904a68 100644 (file)
--- a/src/XGUI/XGUI_ActionsMgr.cpp
+++ b/src/XGUI/XGUI_ActionsMgr.cpp
@@ -4,7 +4,9 @@
  * XGUI_ActionsMgr.cpp
  */
 
+#ifndef HAVE_SALOME
 #include <AppElements_Command.h>
+#endif
 
 #include <XGUI_ActionsMgr.h>
 #include <XGUI_Workshop.h>
@@ -61,13 +63,13 @@ void XGUI_ActionsMgr::addCommand(QAction* theCmd)
     return;
   }
   myActions.insert(aId, theCmd);
-  AppElements_Command* aXCmd = dynamic_cast<AppElements_Command*>(theCmd);
-  if (aXCmd) {
-    myNestedActions[aId] = aXCmd->nestedCommands();
-  } else {
+#ifdef HAVE_SALOME
     XGUI_Workshop* aWorkshop = static_cast<XGUI_Workshop*>(parent());
     myNestedActions[aId] = aWorkshop->salomeConnector()->nestedActions(aId);
-  }
+#else
+  AppElements_Command* aXCmd = dynamic_cast<AppElements_Command*>(theCmd);
+  myNestedActions[aId] = aXCmd->nestedCommands();
+#endif
 }
 
 void XGUI_ActionsMgr::addNestedCommands(const QString& theId, const QStringList& theCommands)
@@ -95,25 +97,30 @@ bool XGUI_ActionsMgr::isNested(const QString& theId) const
 
 void XGUI_ActionsMgr::update()
 {
-  FeaturePtr anActiveFeature = FeaturePtr();
-  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(aFOperation);
+  XGUI_Selection* aSelection = myWorkshop->selector()->selection();
+  if (aSelection->getSelected(ModuleBase_ISelection::Viewer).size() > 0) {
+    updateOnViewSelection();
   } else {
-    setAllEnabled(true);
-    setNestedCommandsEnabled(false);
+    FeaturePtr anActiveFeature = FeaturePtr();
+    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(aFOperation);
+    } else {
+      setAllEnabled(true);
+      setNestedCommandsEnabled(false);
+    }
+    // TODO(SBH): Get defaults state of actions from XML and remove the following method
+    updateByDocumentKind();
+    updateByPlugins(anActiveFeature);
   }
-  // TODO(SBH): Get defaults state of actions from XML and remove the following method
-  updateByDocumentKind();
   updateCheckState();
-  updateByPlugins(anActiveFeature);
 }
 
 void XGUI_ActionsMgr::updateCheckState()
@@ -154,9 +161,8 @@ void XGUI_ActionsMgr::updateOnViewSelection()
       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, theOperation));
+        if (aSelValidator)
+          setActionEnabled(aId, aSelValidator->isValid(aSelection, theOperation));
       }
     }
   }
@@ -300,7 +306,7 @@ void XGUI_ActionsMgr::setNestedStackEnabled(ModuleBase_Operation* theOperation)
     return;
   FeaturePtr aFeature = anOperation->feature();
   QString aFeatureId = QString::fromStdString(aFeature->getKind());
-  setActionEnabled(aFeatureId, true);
+  //setActionEnabled(aFeatureId, true);
   setNestedCommandsEnabled(true, aFeatureId);
 
   setNestedStackEnabled(myOperationMgr->previousOperation(theOperation));
@@ -333,16 +339,16 @@ void XGUI_ActionsMgr::updateByDocumentKind()
   QString aDocKind = QString::fromStdString(aStdDocKind);
   XGUI_Workshop* aWorkshop = static_cast<XGUI_Workshop*>(parent());
   foreach(QAction* eachAction, myActions.values()) {
-    AppElements_Command* aCmd = dynamic_cast<AppElements_Command*>(eachAction);
     QString aCmdDocKind;
-    if(aCmd) {
-      aCmdDocKind = aCmd->documentKind();
-    } else {
-      QString aId = eachAction->data().toString();
-      if (!aId.isEmpty()) {
-        aCmdDocKind = aWorkshop->salomeConnector()->documentKind(aId);
-      }
+#ifdef HAVE_SALOME
+    QString aId = eachAction->data().toString();
+    if (!aId.isEmpty()) {
+      aCmdDocKind = aWorkshop->salomeConnector()->documentKind(aId);
     }
+#else
+    AppElements_Command* aCmd = dynamic_cast<AppElements_Command*>(eachAction);
+    aCmdDocKind = aCmd->documentKind();
+#endif
     if(!aCmdDocKind.isEmpty() && aCmdDocKind != aDocKind) {
       eachAction->setEnabled(false);
     }