Issue #1648: Dump Python in the High Level Parameterized Geometry API

[modules/shaper.git] / src / ModuleBase / ModuleBase_OperationFeature.cpp

diff --git a/src/ModuleBase/ModuleBase_OperationFeature.cpp b/src/ModuleBase/ModuleBase_OperationFeature.cpp
index 8194f09bb6d12db9ff14a9f85b9553e970b3f6ee..9745c5fe0c72d6d103027f1d9dc7aaa7f63b501c 100755 (executable)
--- a/src/ModuleBase/ModuleBase_OperationFeature.cpp
+++ b/src/ModuleBase/ModuleBase_OperationFeature.cpp
@@ -42,6 +42,8 @@
 #include <ModelAPI_AttributeRefList.h>
 #endif
 
+//#define DEBUG_OPERATION_START
+
 #ifdef _DEBUG
 #include <QDebug>
 #endif
@@ -100,6 +102,7 @@ bool ModuleBase_OperationFeature::isValid() const
     return true;
 
   std::string anError = ModelAPI_Tools::getFeatureError(myFeature);
+  ModuleBase_Tools::translate(myFeature->getKind(), anError);
   return anError.empty();
 }
 
@@ -114,7 +117,8 @@ void ModuleBase_OperationFeature::startOperation()
 
   myVisualizedObjects.clear();
   // store hidden result features
-  std::list<ResultPtr> aResults = aFeature->results();
+  std::list<ResultPtr> aResults;
+  ModelAPI_Tools::allResults(aFeature, aResults);
   std::list<ResultPtr>::const_iterator aIt;
   for (aIt = aResults.begin(); aIt != aResults.end(); ++aIt) {
     ObjectPtr anObject = *aIt;
@@ -137,7 +141,8 @@ void ModuleBase_OperationFeature::stopOperation()
     return;
 
   // store hidden result features
-  std::list<ResultPtr> aResults = aFeature->results();
+  std::list<ResultPtr> aResults;
+  ModelAPI_Tools::allResults(aFeature, aResults);
   std::list<ResultPtr>::const_iterator aIt;
   for (aIt = aResults.begin(); aIt != aResults.end(); ++aIt) {
     ObjectPtr anObject = *aIt;
@@ -191,11 +196,13 @@ bool ModuleBase_OperationFeature::hasObject(ObjectPtr theObj) const
   if (aFeature) {
     if (aFeature == theObj)
       return true;
-    std::list<ResultPtr> aResults = aFeature->results();
+    std::list<ResultPtr> aResults;
+    ModelAPI_Tools::allResults(aFeature, aResults);
     std::list<ResultPtr>::const_iterator aIt;
     for (aIt = aResults.cbegin(); aIt != aResults.cend(); ++aIt) {
-      if (theObj == (*aIt))
-        return true;
+      ResultPtr aResult = *aIt;
+      if (theObj == aResult)
+         return true;
     }
 #ifdef DEBUG_DO_NOT_ACTIVATE_SUB_FEATURE
     if (aFeature->isMacro()) {
@@ -231,6 +238,9 @@ bool ModuleBase_OperationFeature::isDisplayedOnStart(ObjectPtr theObject)
 
 bool ModuleBase_OperationFeature::start()
 {
+#ifdef DEBUG_OPERATION_START
+  qDebug("ModuleBase_OperationFeature::start -- begin");
+#endif
   setIsModified(false);
   QString anId = getDescription()->operationId();
   if (myIsEditing) {
@@ -249,16 +259,26 @@ bool ModuleBase_OperationFeature::start()
       // in order to update commands status in the workshop, to be exact the feature action
       // to be unchecked
       abort();
+#ifdef DEBUG_OPERATION_START
+  qDebug("ModuleBase_OperationFeature::start -- end : IMPOSSIBLE to start");
+#endif
       return false;
     }
   }
   //Already called startOperation();
   emit started();
+#ifdef DEBUG_OPERATION_START
+  qDebug("ModuleBase_OperationFeature::start -- end");
+#endif
   return true;
 }
 
 void ModuleBase_OperationFeature::abort()
 {
+#ifdef DEBUG_OPERATION_START
+  qDebug("ModuleBase_OperationFeature::abort -- begin");
+#endif
+
   emit beforeAborted();
 
   // the viewer update should be blocked in order to avoid the features blinking before they are
@@ -293,10 +313,16 @@ void ModuleBase_OperationFeature::abort()
   Events_Loop::loop()->send(aMsg);
 
   emit aborted();
+#ifdef DEBUG_OPERATION_START
+  qDebug("ModuleBase_OperationFeature::abort -- end");
+#endif
 }
 
 bool ModuleBase_OperationFeature::commit()
 {
+#ifdef DEBUG_OPERATION_START
+  qDebug("ModuleBase_OperationFeature::commit -- begin");
+#endif
   ModuleBase_IPropertyPanel* aPanel = propertyPanel();
   if (aPanel) {
     ModuleBase_ModelWidget* anActiveWidget = aPanel->activeWidget();
@@ -328,8 +354,14 @@ bool ModuleBase_OperationFeature::commit()
     emit committed();
 
     afterCommitOperation();
+#ifdef DEBUG_OPERATION_START
+  qDebug("ModuleBase_OperationFeature::commit -- end : IMPOSSIBLE to commit");
+#endif
     return true;
   }
+#ifdef DEBUG_OPERATION_START
+  qDebug("ModuleBase_OperationFeature::commit -- end");
+#endif
   return false;
 }
 
@@ -356,10 +388,14 @@ ModuleBase_ModelWidget* ModuleBase_OperationFeature::activateByPreselection(
           aWgt = (*aWIt);
           if (aWgt->attributeID() == theGreedAttributeId) {
             aPropertyPanel->setPreselectionWidget(aWgt);
-            aWgt->setSelection(myPreSelection, true);
-            aPropertyPanel->setPreselectionWidget(NULL);
-            aFilledWgt = aWgt;
-            break;
+            if (aWgt->setSelection(myPreSelection, true)) {
+              aPropertyPanel->setPreselectionWidget(NULL);
+              aFilledWgt = aWgt;
+              break;
+            }
+            else { // do not process invalid for greed widget selection
+              break;
+            }
           }
         }
       }
@@ -421,7 +457,8 @@ void ModuleBase_OperationFeature::initSelection(ModuleBase_ISelection* theSelect
   if (aFeature) {
     QList<ModuleBase_ViewerPrsPtr> aSelected = theSelection->getSelected(ModuleBase_ISelection::AllControls);
 
-    std::list<ResultPtr> aResults = aFeature->results();
+    std::list<ResultPtr> aResults;
+    ModelAPI_Tools::allResults(aFeature, aResults);
     QObjectPtrList aResList;
     std::list<ResultPtr>::const_iterator aIt;
     for (aIt = aResults.begin(); aIt != aResults.end(); ++aIt)
@@ -460,6 +497,7 @@ void ModuleBase_OperationFeature::setPropertyPanel(ModuleBase_IPropertyPanel* th
     for (aWIt = aWidgets.constBegin(); aWIt != aWidgets.constEnd(); ++aWIt) {
       ModuleBase_ModelWidget* aWgt = (*aWIt);
       connect(aWgt, SIGNAL(valuesChanged()), this, SLOT(onValuesChanged()));
+      connect(aWgt, SIGNAL(valueStateChanged(int)), this, SLOT(onValueStateChanged(int)));
     }
   }